Commit c35fcfa3 authored by Christian König's avatar Christian König
Browse files

drm/amdgpu: use DMA_RESV_USAGE_KERNEL 



Wait only for kernel fences before kmap or UVD direct submission.

This also makes sure that we always wait in amdgpu_bo_kmap() even when
returning a cached pointer.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220407085946.744568-6-christian.koenig@amd.com
parent b29895e1

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

+5 −5
Original line number Diff line number Diff line
@@ -761,6 +761,11 @@ int amdgpu_bo_kmap(struct amdgpu_bo *bo, void **ptr) 
	if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)

		return -EPERM;



	r = dma_resv_wait_timeout(bo->tbo.base.resv, DMA_RESV_USAGE_KERNEL,

				  false, MAX_SCHEDULE_TIMEOUT);

	if (r < 0)

		return r;



	kptr = amdgpu_bo_kptr(bo);

	if (kptr) {

		if (ptr)
@@ -768,11 +773,6 @@ int amdgpu_bo_kmap(struct amdgpu_bo *bo, void **ptr) 
		return 0;

	}



	r = dma_resv_wait_timeout(bo->tbo.base.resv, DMA_RESV_USAGE_WRITE,

				  false, MAX_SCHEDULE_TIMEOUT);

	if (r < 0)

		return r;



	r = ttm_bo_kmap(&bo->tbo, 0, bo->tbo.resource->num_pages, &bo->kmap);

	if (r)

		return r;

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

+1 −1
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo, 


	if (direct) {

		r = dma_resv_wait_timeout(bo->tbo.base.resv,

					  DMA_RESV_USAGE_WRITE, false,

					  DMA_RESV_USAGE_KERNEL, false,

					  msecs_to_jiffies(10));

		if (r == 0)

			r = -ETIMEDOUT;