Attachment 31753 Details for Bug 24314 – Unlock self-refresh bits on 945

[patch] Unlock self-refresh bits on 945

i915-945-self-refresh-fixes.patch (text/plain), 1.30 KB, created by Jesse Barnes on 2009-12-04 12:37:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2009-12-04 12:37:47 UTC

Size: 1.30 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
>index 6b59602..c00d05c 100644
>--- a/drivers/gpu/drm/i915/i915_reg.h
>+++ b/drivers/gpu/drm/i915/i915_reg.h
>@@ -310,7 +310,9 @@
> #define FW_BLC		0x020d8
> #define FW_BLC2	 	0x020dc
> #define FW_BLC_SELF	0x020e0 /* 915+ only */
>-#define   FW_BLC_SELF_EN (1<<15)
>+#define   FW_BLC_SELF_EN_MASK (1<<31)
>+#define   FW_BLC_SELF_WM_MASK (1<<16) /* 945 only */
>+#define   FW_BLC_SELF_EN (1<<15) /* 945 only */
> #define MM_BURST_LENGTH     0x00700000
> #define MM_FIFO_WATERMARK   0x0001F000
> #define LM_BURST_LENGTH     0x00000700
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 65b76ff..a0a5df8 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -2682,7 +2682,11 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
> 		srwm = total_size - sr_entries;
> 		if (srwm < 0)
> 			srwm = 1;
>-		I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN | (srwm & 0x3f));
>+		/* 945 needs register unprotected first */
>+		if (IS_I945G(dev) || IS_I945GM(dev))
>+			I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN_MASK |
>+				   FW_BLC_SELF_WM_MASK);
>+		I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN | (srwm & 0xff));
> 	}
> 
> 	DRM_DEBUG_KMS("Setting FIFO watermarks - A: %d, B: %d, C: %d, SR %d\n",

Actions: View | Splinter Review

Attachments on bug 24314: 30351 | 31362 | 31717 | 31727 | 31729 | 31749 | 31750 | 31751 | 31753 | 31787 | 31788 | 31789 | 31790 | 31803 | 31804 | 31805

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.