Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/amdgpu: use the reservation obj wait for the UVD msg 



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

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

+5 −8
Original line number Diff line number Diff line
@@ -513,7 +513,6 @@ static int amdgpu_uvd_cs_msg(struct amdgpu_uvd_cs_ctx *ctx, 
{

	struct amdgpu_device *adev = ctx->parser->adev;

	int32_t *msg, msg_type, handle;

	struct fence *f;

	void *ptr;



	int i, r;
@@ -523,14 +522,12 @@ static int amdgpu_uvd_cs_msg(struct amdgpu_uvd_cs_ctx *ctx, 
		return -EINVAL;

	}



	f = reservation_object_get_excl(bo->tbo.resv);

	if (f) {

		r = amdgpu_fence_wait((struct amdgpu_fence *)f, false);

	r = reservation_object_wait_timeout_rcu(bo->tbo.resv, true, false,

						MAX_SCHEDULE_TIMEOUT);

	if (r) {

		DRM_ERROR("Failed waiting for UVD message (%d)!\n", r);

		return r;

	}

	}



	r = amdgpu_bo_kmap(bo, &ptr);

	if (r) {