drm/qxl: drop ttm_mem_reg arg from qxl_hw_surface_alloc() (edd38a1e) · Commits · 戴 / test

drivers/gpu/drm/qxl/qxl_cmd.c

+2 −12

Original line number	Diff line number	Diff line
		@@ -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,15 +486,6 @@ 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->surface_id = surf->surface_id;
		qxl_release_unmap(qdev, release, &cmd->release_info);

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}