Attachment 37733 Details for Bug 27744 – possible fix

[patch] possible fix

0001-drm-radeon-kms-use-tracked-values-for-sclk-and-mclk.patch (text/plain), 3.49 KB, created by Alex Deucher on 2010-08-09 09:39:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2010-08-09 09:39:30 UTC

Size: 3.49 KB

patch

obsolete

>From 4ed06bf710a657900fec71503362aee61e304200 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Mon, 9 Aug 2010 12:37:22 -0400
>Subject: [PATCH] drm/radeon/kms: use tracked values for sclk and mclk
>
>Rather than calling get_memory_clock and get_engine_clock,
>used the tracked values from the pm code.  Calling the tables
>adds additional latency in the modesetting and pm paths and
>seems to cause instability in some cases.
>
>May fix:
>https://bugs.freedesktop.org/show_bug.cgi?id=27744
>https://bugs.freedesktop.org/show_bug.cgi?id=29384
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>---
> drivers/gpu/drm/radeon/radeon_clocks.c |    8 ++++++++
> drivers/gpu/drm/radeon/radeon_device.c |   28 +++++++++-------------------
> drivers/gpu/drm/radeon/radeon_i2c.c    |    2 +-
> 3 files changed, 18 insertions(+), 20 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_clocks.c b/drivers/gpu/drm/radeon/radeon_clocks.c
>index f64936c..5e916df 100644
>--- a/drivers/gpu/drm/radeon/radeon_clocks.c
>+++ b/drivers/gpu/drm/radeon/radeon_clocks.c
>@@ -246,6 +246,14 @@ void radeon_get_clock_info(struct drm_device *dev)
> 	mpll->max_feedback_div = 0xff;
> 	mpll->best_vco = 0;
> 
>+	if (!rdev->clock.default_sclk)
>+		rdev->clock.default_sclk = radeon_get_engine_clock(rdev);
>+	if ((!rdev->clock.default_mclk) && rdev->asic->get_memory_clock)
>+		rdev->clock.default_mclk = radeon_get_memory_clock(rdev);
>+
>+	rdev->pm.current_sclk = rdev->clock.default_sclk;
>+	rdev->pm.current_mclk = rdev->clock.default_mclk;
>+
> }
> 
> /* 10 khz */
>diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
>index 39a2b97..a1f3361 100644
>--- a/drivers/gpu/drm/radeon/radeon_device.c
>+++ b/drivers/gpu/drm/radeon/radeon_device.c
>@@ -363,30 +363,20 @@ bool radeon_card_posted(struct radeon_device *rdev)
> void radeon_update_bandwidth_info(struct radeon_device *rdev)
> {
> 	fixed20_12 a;
>-	u32 sclk, mclk;
>+	u32 sclk = rdev->pm.current_sclk;
>+	u32 mclk = rdev->pm.current_mclk;
> 
>-	if (rdev->flags & RADEON_IS_IGP) {
>-		sclk = radeon_get_engine_clock(rdev);
>-		mclk = rdev->clock.default_mclk;
>-
>-		a.full = dfixed_const(100);
>-		rdev->pm.sclk.full = dfixed_const(sclk);
>-		rdev->pm.sclk.full = dfixed_div(rdev->pm.sclk, a);
>-		rdev->pm.mclk.full = dfixed_const(mclk);
>-		rdev->pm.mclk.full = dfixed_div(rdev->pm.mclk, a);
>+	/* sclk/mclk in Mhz */
>+	a.full = dfixed_const(100);
>+	rdev->pm.sclk.full = dfixed_const(sclk);
>+	rdev->pm.sclk.full = dfixed_div(rdev->pm.sclk, a);
>+	rdev->pm.mclk.full = dfixed_const(mclk);
>+	rdev->pm.mclk.full = dfixed_div(rdev->pm.mclk, a);
> 
>+	if (rdev->flags & RADEON_IS_IGP) {
> 		a.full = dfixed_const(16);
> 		/* core_bandwidth = sclk(Mhz) * 16 */
> 		rdev->pm.core_bandwidth.full = dfixed_div(rdev->pm.sclk, a);
>-	} else {
>-		sclk = radeon_get_engine_clock(rdev);
>-		mclk = radeon_get_memory_clock(rdev);
>-
>-		a.full = dfixed_const(100);
>-		rdev->pm.sclk.full = dfixed_const(sclk);
>-		rdev->pm.sclk.full = dfixed_div(rdev->pm.sclk, a);
>-		rdev->pm.mclk.full = dfixed_const(mclk);
>-		rdev->pm.mclk.full = dfixed_div(rdev->pm.mclk, a);
> 	}
> }
> 
>diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
>index bfd2ce5..ea15e62 100644
>--- a/drivers/gpu/drm/radeon/radeon_i2c.c
>+++ b/drivers/gpu/drm/radeon/radeon_i2c.c
>@@ -206,7 +206,7 @@ static void post_xfer(struct i2c_adapter *i2c_adap)
> 
> static u32 radeon_get_i2c_prescale(struct radeon_device *rdev)
> {
>-	u32 sclk = radeon_get_engine_clock(rdev);
>+	u32 sclk = rdev->pm.current_sclk;
> 	u32 prescale = 0;
> 	u32 nm;
> 	u8 n, m, loop;
>-- 
>1.7.1.1
>

Actions: View | Splinter Review

Attachments on bug 27744: 35172 | 36644 | 37542 | 37733 | 37901 | 38300 | 38394 | 39741 | 39742

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.