diff options
| author |   Christian König <christian.koenig@amd.com> | 2020-09-07 10:45:52 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2020-09-08 10:42:39 +0200 |
| commit | 1ff67ce49875f289d63e426b63c6561aa63fa888 (patch) | |
| tree | 6a9d284cc8f7d540b94c1ef38324d96838fde836 /drivers/gpu/drm/qxl | |
| parent | drm/bridge: dw-mipi-dsi: fix dw_mipi_dsi_debugfs_show/write warnings (diff) | |
| download | linux-dev-1ff67ce49875f289d63e426b63c6561aa63fa888.tar.xz linux-dev-1ff67ce49875f289d63e426b63c6561aa63fa888.zip | |
drm/qxl: don't touch mem.bus.offset
This is internal to TTM and should not be used by drivers directly.
Drop the call to qxl_ttm_io_mem_reserve() and use mem->start instead.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/389456/
Diffstat (limited to 'drivers/gpu/drm/qxl')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_object.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c index f838b6d689aa..b2a1fa61920b 100644 --- a/drivers/gpu/drm/qxl/qxl_object.c +++ b/drivers/gpu/drm/qxl/qxl_object.c @@ -167,6 +167,7 @@ int qxl_bo_kmap(struct qxl_bo *bo, void **ptr) void *qxl_bo_kmap_atomic_page(struct qxl_device *qdev, struct qxl_bo *bo, int page_offset) { + unsigned long offset; void *rptr; int ret; struct io_mapping *map; @@ -178,9 +179,8 @@ void *qxl_bo_kmap_atomic_page(struct qxl_device *qdev, else goto fallback; - ret = qxl_ttm_io_mem_reserve(bo->tbo.bdev, &bo->tbo.mem); - - return io_mapping_map_atomic_wc(map, bo->tbo.mem.bus.offset + page_offset); + offset = bo->tbo.mem.start << PAGE_SHIFT; + return io_mapping_map_atomic_wc(map, offset + page_offset); fallback: if (bo->kptr) { rptr = bo->kptr + (page_offset * PAGE_SIZE); |