Commit 0b17fc08 authored by Nirmoy Das's avatar Nirmoy Das Committed by Christian König
Browse files

drm/vmwgfx: don't use ttm bo->offset 



Calculate GPU offset within vmwgfx driver itself without depending on
bo->offset.

Signed-off-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/372933/


Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
parent fbd12537

drivers/gpu/drm/vmwgfx/vmwgfx_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ int vmw_bo_pin_in_start_of_vram(struct vmw_private *dev_priv, 
		ret = ttm_bo_validate(bo, &placement, &ctx);



	/* For some reason we didn't end up at the start of vram */

	WARN_ON(ret == 0 && bo->offset != 0);

	WARN_ON(ret == 0 && bo->mem.start != 0);

	if (!ret)

		vmw_bo_pin_reserved(buf, true);
@@ -317,7 +317,7 @@ void vmw_bo_get_guest_ptr(const struct ttm_buffer_object *bo, 
{

	if (bo->mem.mem_type == TTM_PL_VRAM) {

		ptr->gmrId = SVGA_GMR_FRAMEBUFFER;

		ptr->offset = bo->offset;

		ptr->offset = bo->mem.start << PAGE_SHIFT;

	} else {

		ptr->gmrId = bo->mem.start;

		ptr->offset = 0;

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

+1 −1
Original line number Diff line number Diff line
@@ -3696,7 +3696,7 @@ static void vmw_apply_relocations(struct vmw_sw_context *sw_context) 
		bo = &reloc->vbo->base;

		switch (bo->mem.mem_type) {

		case TTM_PL_VRAM:

			reloc->location->offset += bo->offset;

			reloc->location->offset += bo->mem.start << PAGE_SHIFT;

			reloc->location->gmrId = SVGA_GMR_FRAMEBUFFER;

			break;

		case VMW_PL_GMR:

drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int vmw_fifo_emit_dummy_legacy_query(struct vmw_private *dev_priv, 


	if (bo->mem.mem_type == TTM_PL_VRAM) {

		cmd->body.guestResult.gmrId = SVGA_GMR_FRAMEBUFFER;

		cmd->body.guestResult.offset = bo->offset;

		cmd->body.guestResult.offset = bo->mem.start << PAGE_SHIFT;

	} else {

		cmd->body.guestResult.gmrId = bo->mem.start;

		cmd->body.guestResult.offset = 0;

drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c

+0 −2
Original line number Diff line number Diff line
@@ -750,7 +750,6 @@ static int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
	case TTM_PL_VRAM:

		/* "On-card" video ram */

		man->func = &vmw_thp_func;

		man->gpu_offset = 0;

		man->flags = TTM_MEMTYPE_FLAG_FIXED | TTM_MEMTYPE_FLAG_MAPPABLE;

		man->available_caching = TTM_PL_FLAG_CACHED;

		man->default_caching = TTM_PL_FLAG_CACHED;
@@ -763,7 +762,6 @@ static int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
		 *  slots as well as the bo size.

		 */

		man->func = &vmw_gmrid_manager_func;

		man->gpu_offset = 0;

		man->flags = TTM_MEMTYPE_FLAG_CMA | TTM_MEMTYPE_FLAG_MAPPABLE;

		man->available_caching = TTM_PL_FLAG_CACHED;

		man->default_caching = TTM_PL_FLAG_CACHED;