Attachment 3638 Details for Bug 8077 – Patch to fix how the clock speed is reported for APUs

[patch] Patch to fix how the clock speed is reported for APUs

0001-drm-radeon-don-t-use-get_engine_clock-on-APUs.patch (text/plain), 1.55 KB, created by Philippe Leblanc on 2013-03-19 23:16:40 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Leblanc

Created: 2013-03-19 23:16:40 CET

Size: 1.55 KB

patch

obsolete

>From a2edaadfd701d4022f34c9d76ee08ed778b582d0 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Mon, 18 Mar 2013 17:12:50 -0400
>Subject: [PATCH] drm/radeon: don't use get_engine_clock() on APUs
>
>It doesn't work reliably.  Just report back the currently
>selected engine clock.
>
>Partially fixes:
>https://bugs.freedesktop.org/show_bug.cgi?id=62493
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/radeon_pm.c |    6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
>index 338fd6a..788c64c 100644
>--- a/drivers/gpu/drm/radeon/radeon_pm.c
>+++ b/drivers/gpu/drm/radeon/radeon_pm.c
>@@ -843,7 +843,11 @@ static int radeon_debugfs_pm_info(struct seq_file *m, void *data)
> 	struct radeon_device *rdev = dev->dev_private;
> 
> 	seq_printf(m, "default engine clock: %u0 kHz\n", rdev->pm.default_sclk);
>-	seq_printf(m, "current engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev));
>+	/* radeon_get_engine_clock is not reliable on APUs so just print the current clock */
>+	if ((rdev->family >= CHIP_PALM) && (rdev->flags & RADEON_IS_IGP))
>+		seq_printf(m, "current engine clock: %u0 kHz\n", rdev->pm.current_sclk);
>+	else
>+		seq_printf(m, "current engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev));
> 	seq_printf(m, "default memory clock: %u0 kHz\n", rdev->pm.default_mclk);
> 	if (rdev->asic->pm.get_memory_clock)
> 		seq_printf(m, "current memory clock: %u0 kHz\n", radeon_get_memory_clock(rdev));
>-- 
>1.7.7.5
>

From a2edaadfd701d4022f34c9d76ee08ed778b582d0 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Mon, 18 Mar 2013 17:12:50 -0400
Subject: [PATCH] drm/radeon: don't use get_engine_clock() on APUs

It doesn't work reliably.  Just report back the currently
selected engine clock.

Partially fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=62493

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
---
 drivers/gpu/drm/radeon/radeon_pm.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 338fd6a..788c64c 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -843,7 +843,11 @@ static int radeon_debugfs_pm_info(struct seq_file *m, void *data)
 	struct radeon_device *rdev = dev->dev_private;
 
 	seq_printf(m, "default engine clock: %u0 kHz\n", rdev->pm.default_sclk);
-	seq_printf(m, "current engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev));
+	/* radeon_get_engine_clock is not reliable on APUs so just print the current clock */
+	if ((rdev->family >= CHIP_PALM) && (rdev->flags & RADEON_IS_IGP))
+		seq_printf(m, "current engine clock: %u0 kHz\n", rdev->pm.current_sclk);
+	else
+		seq_printf(m, "current engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev));
 	seq_printf(m, "default memory clock: %u0 kHz\n", rdev->pm.default_mclk);
 	if (rdev->asic->pm.get_memory_clock)
 		seq_printf(m, "current memory clock: %u0 kHz\n", radeon_get_memory_clock(rdev));
-- 
1.7.7.5

Actions: View | Diff

Attachments on bug 8077: 3128 | 3638