Attachment 36645 Details for Bug 26874 – FW_BLC_SELF doesn't exist on 965G

[patch] FW_BLC_SELF doesn't exist on 965G

0001-drm-i915-don-t-access-FW_BLC_SELF-on-965G.patch (text/plain), 2.02 KB, created by Jesse Barnes on 2010-06-30 13:16:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2010-06-30 13:16:04 UTC

Size: 2.02 KB

patch

obsolete

>From 35a0d3f4988dd039771de85fbab37c6995ee0d30 Mon Sep 17 00:00:00 2001
>From: Jesse Barnes <jbarnes@jbarnes-acer.localdomain>
>Date: Wed, 30 Jun 2010 01:13:24 -0700
>Subject: [PATCH] drm/i915: don't access FW_BLC_SELF on 965G
>
>The register offset for FW_BLC_SELF is a totally different set of bits
>on Broadwater (it's actually MI_RDRET_STATE), so don't treat it like
>FW_BLC_SELF on 965G chips.
>
>Fixes bug https://bugs.freedesktop.org/show_bug.cgi?id=26874.
>
>Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>---
> drivers/gpu/drm/i915/i915_debugfs.c  |    2 +-
> drivers/gpu/drm/i915/intel_display.c |    8 +++++---
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
>index 52510ad..aee83fa 100644
>--- a/drivers/gpu/drm/i915/i915_debugfs.c
>+++ b/drivers/gpu/drm/i915/i915_debugfs.c
>@@ -620,7 +620,7 @@ static int i915_sr_status(struct seq_file *m, void *unused)
> 	drm_i915_private_t *dev_priv = dev->dev_private;
> 	bool sr_enabled = false;
> 
>-	if (IS_I965G(dev) || IS_I945G(dev) || IS_I945GM(dev))
>+	if (IS_I965GM(dev) || IS_I945G(dev) || IS_I945GM(dev))
> 		sr_enabled = I915_READ(FW_BLC_SELF) & FW_BLC_SELF_EN;
> 	else if (IS_I915GM(dev))
> 		sr_enabled = I915_READ(INSTPM) & INSTPM_SELF_EN;
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index a8d65b7..19d2d3d 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -2970,11 +2970,13 @@ static void i965_update_wm(struct drm_device *dev, int planea_clock,
> 		if (srwm < 0)
> 			srwm = 1;
> 		srwm &= 0x3f;
>-		I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN);
>+		if (IS_I965GM(dev))
>+			I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN);
> 	} else {
> 		/* Turn off self refresh if both pipes are enabled */
>-		I915_WRITE(FW_BLC_SELF, I915_READ(FW_BLC_SELF)
>-					& ~FW_BLC_SELF_EN);
>+		if (IS_I965GM(dev))
>+			I915_WRITE(FW_BLC_SELF, I915_READ(FW_BLC_SELF)
>+				   & ~FW_BLC_SELF_EN);
> 	}
> 
> 	DRM_DEBUG_KMS("Setting FIFO watermarks - A: 8, B: 8, C: 8, SR %d\n",
>-- 
>1.6.1.3
>

Actions: View | Splinter Review

Attachments on bug 26874: 36645

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.