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

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

drm/amdgpu: stop waiting on UVD messages before mapping them 



amdgpu_bo_kmap() now always waits for moves to finish.

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 587f3c70

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

+0 −7
Original line number Original line Diff line number Diff line
@@ -539,13 +539,6 @@ static int amdgpu_uvd_cs_msg(struct amdgpu_uvd_cs_ctx *ctx, 
		return -EINVAL;

		return -EINVAL;

	}

	}





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

						MAX_SCHEDULE_TIMEOUT);

	if (r < 0) {

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

		return r;

	}



	r = amdgpu_bo_kmap(bo, &ptr);

	r = amdgpu_bo_kmap(bo, &ptr);

	if (r) {

	if (r) {

		DRM_ERROR("Failed mapping the UVD message (%ld)!\n", r);

		DRM_ERROR("Failed mapping the UVD message (%ld)!\n", r);