Attachment 84933 Details for Bug 68708 – possible fix

[patch] possible fix

0001-drm-radeon-dpm-make-sure-dc-performance-level-limits.patch (text/plain), 2.63 KB, created by Alex Deucher on 2013-08-30 20:22:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-08-30 20:22:33 UTC

Size: 2.63 KB

patch

obsolete

>From b9df76d12bcef53352baa03f1f59834204a6f970 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Fri, 30 Aug 2013 16:18:35 -0400
>Subject: [PATCH] drm/radeon/dpm: make sure dc performance level limits are
> valid (BTC-SI) (v2)
>
>Check to make sure the dc limits are valid before using them.
>Some systems may not have a dc limits table.  In that case just
>use the ac limits.  This fixes hangs on systems when the power
>state is changed when on battery (dc) due to invalid performance
>state parameters.
>
>Should fix:
>https://bugs.freedesktop.org/show_bug.cgi?id=68708
>
>v2: fix up limits in dpm_init()
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/btc_dpm.c | 6 ++++++
> drivers/gpu/drm/radeon/ni_dpm.c  | 6 ++++++
> drivers/gpu/drm/radeon/si_dpm.c  | 6 ++++++
> 3 files changed, 18 insertions(+)
>
>diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c
>index 9953e1f..084e694 100644
>--- a/drivers/gpu/drm/radeon/btc_dpm.c
>+++ b/drivers/gpu/drm/radeon/btc_dpm.c
>@@ -2699,6 +2699,12 @@ int btc_dpm_init(struct radeon_device *rdev)
> 	else
> 		rdev->pm.dpm.dyn_state.sclk_mclk_delta = 10000;
> 
>+	/* make sure dc limits are valid */
>+	if ((rdev->pm.dpm.dyn_state.max_clock_voltage_on_dc.sclk == 0) ||
>+	    (rdev->pm.dpm.dyn_state.max_clock_voltage_on_dc.mclk == 0))
>+		rdev->pm.dpm.dyn_state.max_clock_voltage_on_dc =
>+			rdev->pm.dpm.dyn_state.max_clock_voltage_on_ac;
>+
> 	return 0;
> }
> 
>diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c
>index 88aa41e..f7b625c 100644
>--- a/drivers/gpu/drm/radeon/ni_dpm.c
>+++ b/drivers/gpu/drm/radeon/ni_dpm.c
>@@ -4272,6 +4272,12 @@ int ni_dpm_init(struct radeon_device *rdev)
> 
> 	ni_pi->use_power_boost_limit = true;
> 
>+	/* make sure dc limits are valid */
>+	if ((rdev->pm.dpm.dyn_state.max_clock_voltage_on_dc.sclk == 0) ||
>+	    (rdev->pm.dpm.dyn_state.max_clock_voltage_on_dc.mclk == 0))
>+		rdev->pm.dpm.dyn_state.max_clock_voltage_on_dc =
>+			rdev->pm.dpm.dyn_state.max_clock_voltage_on_ac;
>+
> 	return 0;
> }
> 
>diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
>index 51966f4..5be9b4e 100644
>--- a/drivers/gpu/drm/radeon/si_dpm.c
>+++ b/drivers/gpu/drm/radeon/si_dpm.c
>@@ -6449,6 +6449,12 @@ int si_dpm_init(struct radeon_device *rdev)
> 
> 	si_initialize_powertune_defaults(rdev);
> 
>+	/* make sure dc limits are valid */
>+	if ((rdev->pm.dpm.dyn_state.max_clock_voltage_on_dc.sclk == 0) ||
>+	    (rdev->pm.dpm.dyn_state.max_clock_voltage_on_dc.mclk == 0))
>+		rdev->pm.dpm.dyn_state.max_clock_voltage_on_dc =
>+			rdev->pm.dpm.dyn_state.max_clock_voltage_on_ac;
>+
> 	return 0;
> }
> 
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 68708: 84847 | 84931 | 84933

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.