diff options
| author |   Christian König <christian.koenig@amd.com> | 2020-09-07 13:44:36 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2020-09-08 10:43:30 +0200 |
| commit | 54d04ea8cdbd143496e4f5cc9c0a9f86c0e55a2e (patch) | |
| tree | 189c73b8584412722829922f5e963ca514887e65 /drivers/gpu/drm/drm_gem_vram_helper.c | |
| parent | drm/qxl: don't touch mem.bus.offset (diff) | |
| download | wireguard-linux-54d04ea8cdbd143496e4f5cc9c0a9f86c0e55a2e.tar.xz wireguard-linux-54d04ea8cdbd143496e4f5cc9c0a9f86c0e55a2e.zip | |
drm/ttm: merge offset and base in ttm_bus_placement
This is used by TTM to communicate the physical address
which should be used with ioremap(), ioremap_wc(). We don't
need to separate the base and offset in any way here.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/389457/
Diffstat (limited to 'drivers/gpu/drm/drm_gem_vram_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_gem_vram_helper.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c index 788557bc5c01..6a7e0788d8f0 100644 --- a/drivers/gpu/drm/drm_gem_vram_helper.c +++ b/drivers/gpu/drm/drm_gem_vram_helper.c @@ -1042,8 +1042,7 @@ static int bo_driver_io_mem_reserve(struct ttm_bo_device *bdev, case TTM_PL_SYSTEM: /* nothing to do */ break; case TTM_PL_VRAM: - mem->bus.offset = mem->start << PAGE_SHIFT; - mem->bus.base = vmm->vram_base; + mem->bus.offset = (mem->start << PAGE_SHIFT) + vmm->vram_base; mem->bus.is_iomem = true; break; default: |