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

drm/amdgpu: stop waiting in amdgpu_uvd_send_msg 



We have a wait in the amdgpu_bo_kmap() code for quite a while now, so
waiting here isn't needed any more.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f6c0cd55

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

+1 −10
Original line number Diff line number Diff line
@@ -1122,8 +1122,7 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo, 
	struct amdgpu_ib *ib;

	uint32_t data[4];

	uint64_t addr;

	long r;

	int i;

	int i, r;

	unsigned offset_idx = 0;

	unsigned offset[3] = { UVD_BASE_SI, 0, 0 };
@@ -1160,14 +1159,6 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo, 
	ib->length_dw = 16;



	if (direct) {

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

					  DMA_RESV_USAGE_KERNEL, false,

					  msecs_to_jiffies(10));

		if (r == 0)

			r = -ETIMEDOUT;

		if (r < 0)

			goto err_free;



		r = amdgpu_job_submit_direct(job, ring, &f);

		if (r)

			goto err_free;