Attachment 78377 Details for Bug 63730 – Possible fix

[patch] Possible fix

0001-drm-radeon-raise-UVD-clocks-on-init-v2.patch (text/plain), 2.50 KB, created by Christian König on 2013-04-23 15:39:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian König

Created: 2013-04-23 15:39:53 UTC

Size: 2.50 KB

patch

obsolete

>From 97ea751c8b0ecd4704c0e1c12e3c5371c52ab54b Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
>Date: Fri, 19 Apr 2013 16:14:19 +0200
>Subject: [PATCH] drm/radeon: raise UVD clocks on init v2
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>v2: not only raise the clocks on VCPU boot, but also on IB test.
>
>Signed-off-by: Christian KÃ¶nig <christian.koenig@amd.com>
>---
> drivers/gpu/drm/radeon/r600.c |   30 +++++++++++++++++++++++-------
> 1 file changed, 23 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
>index 5fe9e74..ca41bbf 100644
>--- a/drivers/gpu/drm/radeon/r600.c
>+++ b/drivers/gpu/drm/radeon/r600.c
>@@ -2645,6 +2645,9 @@ int r600_uvd_init(struct radeon_device *rdev)
> {
> 	int i, j, r;
> 
>+	/* raise clocks while booting up the VCPU */
>+	radeon_set_uvd_clocks(rdev, 53300, 40000);
>+
> 	/* disable clock gating */
> 	WREG32(UVD_CGC_GATE, 0);
> 
>@@ -2715,18 +2718,23 @@ int r600_uvd_init(struct radeon_device *rdev)
> 		mdelay(10);
> 		r = -1;
> 	}
>+
> 	if (r) {
> 		DRM_ERROR("UVD not responding, giving up!!!\n");
>+		radeon_set_uvd_clocks(rdev, 0, 0);
> 		return r;
> 	}
>+
> 	/* enable interupt */
> 	WREG32_P(UVD_MASTINT_EN, 3<<1, ~(3 << 1));
> 
> 	r = r600_uvd_rbc_start(rdev);
>-	if (r)
>-		return r;
>+	if (!r)
>+		DRM_INFO("UVD initialized successfully.\n");
>+
>+	/* lower clocks again */
>+	radeon_set_uvd_clocks(rdev, 0, 0);
> 
>-	DRM_INFO("UVD initialized successfully.\n");
> 	return 0;
> }
> 
>@@ -3566,28 +3574,36 @@ int r600_dma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
> 
> int r600_uvd_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
> {
>-	struct radeon_fence *fence;
>+	struct radeon_fence *fence = NULL;
> 	int r;
> 
>+	r = radeon_set_uvd_clocks(rdev, 53300, 40000);
>+	if (r) {
>+		DRM_ERROR("radeon: failed to raise UVD clocks (%d).\n", r);
>+		return r;
>+	}
>+
> 	r = radeon_uvd_get_create_msg(rdev, ring->idx, 1, NULL);
> 	if (r) {
> 		DRM_ERROR("radeon: failed to get create msg (%d).\n", r);
>-		return r;
>+		goto error;
> 	}
> 
> 	r = radeon_uvd_get_destroy_msg(rdev, ring->idx, 1, &fence);
> 	if (r) {
> 		DRM_ERROR("radeon: failed to get destroy ib (%d).\n", r);
>-		return r;
>+		goto error;
> 	}
> 
> 	r = radeon_fence_wait(fence, false);
> 	if (r) {
> 		DRM_ERROR("radeon: fence wait failed (%d).\n", r);
>-		return r;
>+		goto error;
> 	}
> 	DRM_INFO("ib test on ring %d succeeded\n",  ring->idx);
>+error:
> 	radeon_fence_unref(&fence);
>+	radeon_set_uvd_clocks(rdev, 0, 0);
> 	return r;
> }
> 
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 63730: 78243 | 78270 | 78323 | 78357 | 78377

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.