Commit 1ff67ce4 authored by Christian König's avatar Christian König

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: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/389456/
parent 25c4bcf9
...@@ -167,6 +167,7 @@ int qxl_bo_kmap(struct qxl_bo *bo, void **ptr) ...@@ -167,6 +167,7 @@ int qxl_bo_kmap(struct qxl_bo *bo, void **ptr)
void *qxl_bo_kmap_atomic_page(struct qxl_device *qdev, void *qxl_bo_kmap_atomic_page(struct qxl_device *qdev,
struct qxl_bo *bo, int page_offset) struct qxl_bo *bo, int page_offset)
{ {
unsigned long offset;
void *rptr; void *rptr;
int ret; int ret;
struct io_mapping *map; struct io_mapping *map;
...@@ -178,9 +179,8 @@ void *qxl_bo_kmap_atomic_page(struct qxl_device *qdev, ...@@ -178,9 +179,8 @@ void *qxl_bo_kmap_atomic_page(struct qxl_device *qdev,
else else
goto fallback; goto fallback;
ret = qxl_ttm_io_mem_reserve(bo->tbo.bdev, &bo->tbo.mem); offset = bo->tbo.mem.start << PAGE_SHIFT;
return io_mapping_map_atomic_wc(map, offset + page_offset);
return io_mapping_map_atomic_wc(map, bo->tbo.mem.bus.offset + page_offset);
fallback: fallback:
if (bo->kptr) { if (bo->kptr) {
rptr = bo->kptr + (page_offset * PAGE_SIZE); rptr = bo->kptr + (page_offset * PAGE_SIZE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment