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

drm/radeon: fix variable type 



When we switch to dma_resv_wait_timeout() the returned type changes as
well.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Fixes: 89aae41d ("drm/radeon: use dma_resv_wait_timeout() instead of manually waiting")
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=215600


Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220221110503.2803-1-christian.koenig@amd.com
parent 1aae0575

drivers/gpu/drm/radeon/radeon_uvd.c

+4 −4
Original line number Diff line number Diff line
@@ -470,8 +470,8 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo, 
	int32_t *msg, msg_type, handle;

	unsigned img_size = 0;

	void *ptr;



	int i, r;

	long r;

	int i;



	if (offset & 0x3F) {

		DRM_ERROR("UVD messages must be 64 byte aligned!\n");
@@ -481,13 +481,13 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo, 
	r = dma_resv_wait_timeout(bo->tbo.base.resv, false, false,

				  MAX_SCHEDULE_TIMEOUT);

	if (r <= 0) {

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

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

		return r ? r : -ETIME;

	}



	r = radeon_bo_kmap(bo, &ptr);

	if (r) {

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

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

		return r;

	}