Attachment 86297 Details for Bug 68235 – patch 2/2

[patch] patch 2/2

0003-drm-radeon-dpm-ni-filter-clocks-based-on-voltage-clk.patch (text/plain), 2.18 KB, created by Alex Deucher on 2013-09-21 19:45:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-09-21 19:45:58 UTC

Size: 2.18 KB

patch

obsolete

>From 4273c5a00aff04343dc1a273cec851113ead4323 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Sat, 21 Sep 2013 14:05:48 -0400
>Subject: [PATCH 3/6] drm/radeon/dpm/ni: filter clocks based on voltage/clk dep
> tables
>
>filter out mclk and sclk levels higher than listed in the clk
>voltage dependency tables.  Supporting these clocks may require
>additional voltage tweaking that isn't supported yet.
>
>See bug:
>https://bugs.freedesktop.org/show_bug.cgi?id=68235
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/radeon/ni_dpm.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
>diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c
>index 6c398a4..f263390 100644
>--- a/drivers/gpu/drm/radeon/ni_dpm.c
>+++ b/drivers/gpu/drm/radeon/ni_dpm.c
>@@ -787,6 +787,7 @@ static void ni_apply_state_adjust_rules(struct radeon_device *rdev,
> 	bool disable_mclk_switching;
> 	u32 mclk, sclk;
> 	u16 vddc, vddci;
>+	u32 max_sclk_vddc, max_mclk_vddci, max_mclk_vddc;
> 	int i;
> 
> 	if ((rdev->pm.dpm.new_active_crtc_count > 1) ||
>@@ -813,6 +814,29 @@ static void ni_apply_state_adjust_rules(struct radeon_device *rdev,
> 		}
> 	}
> 
>+	/* limit clocks to max supported clocks based on voltage dependency tables */
>+	btc_get_max_clock_from_voltage_dependency_table(&rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk,
>+							&max_sclk_vddc);
>+	btc_get_max_clock_from_voltage_dependency_table(&rdev->pm.dpm.dyn_state.vddci_dependency_on_mclk,
>+							&max_mclk_vddci);
>+	btc_get_max_clock_from_voltage_dependency_table(&rdev->pm.dpm.dyn_state.vddc_dependency_on_mclk,
>+							&max_mclk_vddc);
>+
>+	for (i = 0; i < ps->performance_level_count; i++) {
>+		if (max_sclk_vddc) {
>+			if (ps->performance_levels[i].sclk > max_sclk_vddc)
>+				ps->performance_levels[i].sclk = max_sclk_vddc;
>+		}
>+		if (max_mclk_vddci) {
>+			if (ps->performance_levels[i].mclk > max_mclk_vddci)
>+				ps->performance_levels[i].mclk = max_mclk_vddci;
>+		}
>+		if (max_mclk_vddc) {
>+			if (ps->performance_levels[i].mclk > max_mclk_vddc)
>+				ps->performance_levels[i].mclk = max_mclk_vddc;
>+		}
>+	}
>+
> 	/* XXX validate the min clocks required for display */
> 
> 	if (disable_mclk_switching) {
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 68235: 84186 | 85157 | 85578 | 85798 | 85989 | 86111 | 86112 | 86147 | 86168 | 86296 | 86297

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.