Attachment 85563 Details for Bug 69120 – possible fix

[patch] possible fix

0001-drm-radeon-dpm-fix-fallback-for-empty-UVD-clocks.patch (text/plain), 2.61 KB, created by Alex Deucher on 2013-09-10 13:44:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-09-10 13:44:34 UTC

Size: 2.61 KB

patch

obsolete

>From 98afcbbd8b407934127e8ce63ccad8a6067366d6 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Tue, 10 Sep 2013 09:40:37 -0400
>Subject: [PATCH] drm/radeon/dpm: fix fallback for empty UVD clocks
>
>Some older 6xx-7xx boards didn't always fill in the
>UVD clocks properly in the UVD power states.  This
>leads to the driver trying to set a 0 clock which
>results in slow or broken UVD playback.
>
>Fixes:
>https://bugs.freedesktop.org/show_bug.cgi?id=69120
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/rs780_dpm.c | 10 +++++++---
> drivers/gpu/drm/radeon/rv770_dpm.c | 10 +++++++---
> 2 files changed, 14 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/rs780_dpm.c b/drivers/gpu/drm/radeon/rs780_dpm.c
>index 625d6ea..828a776 100644
>--- a/drivers/gpu/drm/radeon/rs780_dpm.c
>+++ b/drivers/gpu/drm/radeon/rs780_dpm.c
>@@ -726,14 +726,18 @@ static void rs780_parse_pplib_non_clock_info(struct radeon_device *rdev,
> 	if (ATOM_PPLIB_NONCLOCKINFO_VER1 < table_rev) {
> 		rps->vclk = le32_to_cpu(non_clock_info->ulVCLK);
> 		rps->dclk = le32_to_cpu(non_clock_info->ulDCLK);
>-	} else if (r600_is_uvd_state(rps->class, rps->class2)) {
>-		rps->vclk = RS780_DEFAULT_VCLK_FREQ;
>-		rps->dclk = RS780_DEFAULT_DCLK_FREQ;
> 	} else {
> 		rps->vclk = 0;
> 		rps->dclk = 0;
> 	}
> 
>+	if (r600_is_uvd_state(rps->class, rps->class2)) {
>+		if ((rps->vclk == 0) || (rps->dclk == 0)) {
>+			rps->vclk = RS780_DEFAULT_VCLK_FREQ;
>+			rps->dclk = RS780_DEFAULT_DCLK_FREQ;
>+		}
>+	}
>+
> 	if (rps->class & ATOM_PPLIB_CLASSIFICATION_BOOT)
> 		rdev->pm.dpm.boot_ps = rps;
> 	if (rps->class & ATOM_PPLIB_CLASSIFICATION_UVDSTATE)
>diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c
>index 8cbb85d..7282ce7 100644
>--- a/drivers/gpu/drm/radeon/rv770_dpm.c
>+++ b/drivers/gpu/drm/radeon/rv770_dpm.c
>@@ -2147,14 +2147,18 @@ static void rv7xx_parse_pplib_non_clock_info(struct radeon_device *rdev,
> 	if (ATOM_PPLIB_NONCLOCKINFO_VER1 < table_rev) {
> 		rps->vclk = le32_to_cpu(non_clock_info->ulVCLK);
> 		rps->dclk = le32_to_cpu(non_clock_info->ulDCLK);
>-	} else if (r600_is_uvd_state(rps->class, rps->class2)) {
>-		rps->vclk = RV770_DEFAULT_VCLK_FREQ;
>-		rps->dclk = RV770_DEFAULT_DCLK_FREQ;
> 	} else {
> 		rps->vclk = 0;
> 		rps->dclk = 0;
> 	}
> 
>+	if (r600_is_uvd_state(rps->class, rps->class2)) {
>+		if ((rps->vclk == 0) || (rps->dclk == 0)) {
>+			rps->vclk = RV770_DEFAULT_VCLK_FREQ;
>+			rps->dclk = RV770_DEFAULT_DCLK_FREQ;
>+		}
>+	}
>+
> 	if (rps->class & ATOM_PPLIB_CLASSIFICATION_BOOT)
> 		rdev->pm.dpm.boot_ps = rps;
> 	if (rps->class & ATOM_PPLIB_CLASSIFICATION_UVDSTATE)
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 69120: 85467 | 85468 | 85469 | 85476 | 85496 | 85563 | 85591 | 85592 | 85593 | 85594 | 87301 | 87302 | 93075 | 93076

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.