Skip to content

Commit f762ce7

Browse files
drm/radeon: fix variable type
When we switch to dma_resv_wait_timeout() the returned type changes as well. Signed-off-by: Christian König <christian.koenig@amd.com> Fixes: 89aae41 ("drm/radeon: use dma_resv_wait_timeout() instead of manually waiting") Bug: https://bugzilla.kernel.org/show_bug.cgi?id=215600 Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220221110503.2803-1-christian.koenig@amd.com
1 parent 1aae057 commit f762ce7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/gpu/drm/radeon/radeon_uvd.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,8 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo,
470470
int32_t *msg, msg_type, handle;
471471
unsigned img_size = 0;
472472
void *ptr;
473-
474-
int i, r;
473+
long r;
474+
int i;
475475

476476
if (offset & 0x3F) {
477477
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,
481481
r = dma_resv_wait_timeout(bo->tbo.base.resv, false, false,
482482
MAX_SCHEDULE_TIMEOUT);
483483
if (r <= 0) {
484-
DRM_ERROR("Failed waiting for UVD message (%d)!\n", r);
484+
DRM_ERROR("Failed waiting for UVD message (%ld)!\n", r);
485485
return r ? r : -ETIME;
486486
}
487487

488488
r = radeon_bo_kmap(bo, &ptr);
489489
if (r) {
490-
DRM_ERROR("Failed mapping the UVD message (%d)!\n", r);
490+
DRM_ERROR("Failed mapping the UVD message (%ld)!\n", r);
491491
return r;
492492
}
493493

0 commit comments

Comments
 (0)