From: Christian König <christian.koenig@amd.com>
Date: Wed, 30 Oct 2013 11:56:04 +0000 (+0100)
Subject: drm/radeon: activate UVD clocks before sending the destroy msg
X-Git-Tag: v3.12.3~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce5b8c459fdbfc02889985b788a2124d2ed3afaf;p=thirdparty%2Fkernel%2Fstable.git

drm/radeon: activate UVD clocks before sending the destroy msg

commit c154a76311293f9671439286834aa325b7ef59fe upstream.

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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
index 308eff5be1b42..a56dfe4af0f60 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) {