drm/qxl: drop ttm_mem_reg arg from qxl_hw_surface_alloc()

Not used, is always NULL.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Noralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190118122020.27596-2-kraxel@redhat.com

diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
index 2e100f644236b6e4289b026e66428435b2a30b7b..5ba831c78cfee0c18d0b1e8324170df7719ed707 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_cmd.c
+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
@@ -460,8 +460,7 @@ void qxl_surface_id_dealloc(struct qxl_device *qdev,
 }
 
 int qxl_hw_surface_alloc(struct qxl_device *qdev,
-                        struct qxl_bo *surf,
-                        struct ttm_mem_reg *new_mem)
+                        struct qxl_bo *surf)
 {
        struct qxl_surface_cmd *cmd;
        struct qxl_release *release;
@@ -487,16 +486,7 @@ int qxl_hw_surface_alloc(struct qxl_device *qdev,
        cmd->u.surface_create.width = surf->surf.width;
        cmd->u.surface_create.height = surf->surf.height;
        cmd->u.surface_create.stride = surf->surf.stride;
-       if (new_mem) {
-               int slot_id = surf->type == QXL_GEM_DOMAIN_VRAM ? qdev->main_mem_slot : qdev->surfaces_mem_slot;
-               struct qxl_memslot *slot = &(qdev->mem_slots[slot_id]);
-
-               /* TODO - need to hold one of the locks to read tbo.offset */
-               cmd->u.surface_create.data = slot->high_bits;
-
-               cmd->u.surface_create.data |= (new_mem->start << PAGE_SHIFT) + surf->tbo.bdev->man[new_mem->mem_type].gpu_offset;
-       } else
-               cmd->u.surface_create.data = qxl_bo_physical_address(qdev, surf, 0);
+       cmd->u.surface_create.data = qxl_bo_physical_address(qdev, surf, 0);
        cmd->surface_id = surf->surface_id;
        qxl_release_unmap(qdev, release, &cmd->release_info);
 

diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index 13a0254b59a1a55fd09663dd32170b478b9513a3..38c5a8b1dfc1477b3893b871a9941ccb34e5660e 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -497,8 +497,7 @@ int qxl_surface_id_alloc(struct qxl_device *qdev,
 void qxl_surface_id_dealloc(struct qxl_device *qdev,
                            uint32_t surface_id);
 int qxl_hw_surface_alloc(struct qxl_device *qdev,
-                        struct qxl_bo *surf,
-                        struct ttm_mem_reg *mem);
+                        struct qxl_bo *surf);
 int qxl_hw_surface_dealloc(struct qxl_device *qdev,
                           struct qxl_bo *surf);
 

diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c
index 91f3bbc73ecc01fa9d41ba3270b403963d024ac0..34eff8b21e917c04dded831df004dbcf11a703bb 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_object.c
+++ b/drivers/gpu/drm/qxl/qxl_object.c
@@ -332,7 +332,7 @@ int qxl_bo_check_id(struct qxl_device *qdev, struct qxl_bo *bo)
                if (ret)
                        return ret;
 
-               ret = qxl_hw_surface_alloc(qdev, bo, NULL);
+               ret = qxl_hw_surface_alloc(qdev, bo);
                if (ret)
                        return ret;
        }