[PATCH v3 01/23] drm/qxl: drop ttm_mem_reg arg from qxl_hw_surface_alloc()

[Gerd Hoffmann]

Not used, is always NULL.

Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
---
 drivers/gpu/drm/qxl/qxl_drv.h    |  3 +--
 drivers/gpu/drm/qxl/qxl_cmd.c    | 14 ++------------
 drivers/gpu/drm/qxl/qxl_object.c |  2 +-
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index 13a0254b59..38c5a8b1df 100644
--- 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_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
index 2e100f6442..5ba831c78c 100644
--- 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_object.c b/drivers/gpu/drm/qxl/qxl_object.c
index 91f3bbc73e..34eff8b21e 100644
--- 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;
        }
-- 
2.9.3

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization