diff options
| author | Christian König <christian.koenig@amd.com> | 2015-08-11 16:35:54 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-17 16:51:16 -0400 |
| commit | 4127a59e0b3f914ae8d9843d521a07e117db045a (patch) | |
| tree | c560af98524e4a7436513ba3c1752405337d95ff /drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | |
| parent | 5b232c2a717684d0dffc27e50bf05e1fb72f9d6e (diff) | |
| download | blackbird-obmc-linux-4127a59e0b3f914ae8d9843d521a07e117db045a.tar.gz blackbird-obmc-linux-4127a59e0b3f914ae8d9843d521a07e117db045a.zip | |
drm/amdgpu: fix UVD return code checking
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tested-and-Reviewed-by: Leo Liu <leo.liu@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index b56cace92fc6..e7336a95fe59 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -514,8 +514,8 @@ 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; void *ptr; - - int i, r; + long r; + int i; if (offset & 0x3F) { DRM_ERROR("UVD messages must be 64 byte aligned!\n"); @@ -524,14 +524,14 @@ static int amdgpu_uvd_cs_msg(struct amdgpu_uvd_cs_ctx *ctx, 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); + if (r < 0) { + DRM_ERROR("Failed waiting for UVD message (%ld)!\n", r); return r; } r = amdgpu_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; } |
