Commit 9deb0b3d authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: use the preferred pin domain after the check 



For some reason we run into an use case where a BO is already pinned
into GTT, but should be pinned into VRAM|GTT again.

Handle that case gracefully as well.

Reviewed-by: default avatarShashank Sharma <Shashank.sharma@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 8ac1696b

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+5 −5
Original line number Diff line number Diff line
@@ -920,11 +920,6 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
			return -EINVAL;

	}



	/* This assumes only APU display buffers are pinned with (VRAM|GTT).

	 * See function amdgpu_display_supported_domains()

	 */

	domain = amdgpu_bo_get_preferred_pin_domain(adev, domain);



	if (bo->tbo.pin_count) {

		uint32_t mem_type = bo->tbo.resource->mem_type;

		uint32_t mem_flags = bo->tbo.resource->placement;
@@ -949,6 +944,11 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
		return 0;

	}



	/* This assumes only APU display buffers are pinned with (VRAM|GTT).

	 * See function amdgpu_display_supported_domains()

	 */

	domain = amdgpu_bo_get_preferred_pin_domain(adev, domain);



	if (bo->tbo.base.import_attach)

		dma_buf_pin(bo->tbo.base.import_attach);