summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2013-10-30 12:56:04 +0100
committerAlex Deucher <alexander.deucher@amd.com>2013-11-01 20:25:50 +0100
commitc154a76311293f9671439286834aa325b7ef59fe (patch)
tree7e947609de911e469ffc04888dd4046976f42a0f /drivers
parentdrm/radeon/si: fix define for MC_SEQ_TRAIN_WAKEUP_CNTL (diff)
downloadlinux-c154a76311293f9671439286834aa325b7ef59fe.tar.xz
linux-c154a76311293f9671439286834aa325b7ef59fe.zip
drm/radeon: activate UVD clocks before sending the destroy msg
Make sure the UVD clocks are still active before sending the destroy message, otherwise the hw might hang. Signed-off-by: Christian König <christian.koenig@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/radeon_uvd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
index a0f11856ddde..9e4b19c94c3f 100644
--- a/drivers/gpu/drm/radeon/radeon_uvd.c
+++ b/drivers/gpu/drm/radeon/radeon_uvd.c
@@ -240,6 +240,8 @@ void radeon_uvd_free_handles(struct radeon_device *rdev, struct drm_file *filp)
if (handle != 0 && rdev->uvd.filp[i] == filp) {
struct radeon_fence *fence;
+ radeon_uvd_note_usage(rdev);
+
r = radeon_uvd_get_destroy_msg(rdev,
R600_RING_TYPE_UVD_INDEX, handle, &fence);
if (r) {