summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJames Zhu <James.Zhu@amd.com>2018-03-06 14:43:50 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-15 10:56:48 +0100
commitb6ce72324e1493389ebc14ce9fb34ac63dc7fa92 (patch)
tree489ba5f756edcb9b1294b139d2d6f1ef0bee9efc /drivers
parent83756e0941081ec4d95352eb55c52fb427c6f562 (diff)
downloadlinux-b6ce72324e1493389ebc14ce9fb34ac63dc7fa92.tar.gz
linux-b6ce72324e1493389ebc14ce9fb34ac63dc7fa92.tar.bz2
linux-b6ce72324e1493389ebc14ce9fb34ac63dc7fa92.zip
drm/amdgpu:Correct max uvd handles
commit 0e5ee33d2a54e4c55fe92857f23e1cbb0440d6de upstream. Max uvd handles should use adev->uvd.max_handles instead of AMDGPU_MAX_UVD_HANDLES here. Signed-off-by: James Zhu <James.Zhu@amd.com> Reviewed-by: Leo Liu <leo.liu@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index e8bd50cf9785..cd57d53266f6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -301,7 +301,7 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev)
if (atomic_read(&adev->uvd.handles[i]))
break;
- if (i == AMDGPU_MAX_UVD_HANDLES)
+ if (i == adev->uvd.max_handles)
return 0;
cancel_delayed_work_sync(&adev->uvd.idle_work);