Attachment 37621 Details for Bug 29173 – Update SR after dpms changes.

[patch] Update SR after dpms changes.

0001-drm-i915-Update-watermarks-for-Ironlake-after-dpms-c.patch (text/plain), 3.47 KB, created by Chris Wilson on 2010-08-06 00:51:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2010-08-06 00:51:50 UTC

Size: 3.47 KB

patch

obsolete

>From 4ad9ba71658106094a2bfac5b469994eb4b265d3 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Fri, 6 Aug 2010 08:40:30 +0100
>Subject: [PATCH] drm/i915: Update watermarks for Ironlake after dpms changes
>
>Previously, we only remembered to update the watermarks for i9xx, and
>incorrectly assumed that the crtc->enabled flag was valid at that point
>in the dpms cycle.
>
>Note that on my x201s this makes a SR bug on pipe 1 much easier to hit.
>(Since before this patch when disabling pipe 0, we either didn't update
>the watermarks at all, or when we did we still thought we had two pipes
>enabled and so disabled SR.)
>
>References:
>
>  Bug 28969 - [Arrandale] Screen flickers, suspect Self-Refresh
>  https://bugs.freedesktop.org/show_bug.cgi?id=28969
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/intel_display.c |   19 +++++++------------
> 1 files changed, 7 insertions(+), 12 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index b9aa3a0..9fd3e33 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -2249,8 +2249,6 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode)
> 	case DRM_MODE_DPMS_ON:
> 	case DRM_MODE_DPMS_STANDBY:
> 	case DRM_MODE_DPMS_SUSPEND:
>-		intel_update_watermarks(dev);
>-
> 		/* Enable the DPLL */
> 		temp = I915_READ(dpll_reg);
> 		if ((temp & DPLL_VCO_ENABLE) == 0) {
>@@ -2290,8 +2288,6 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode)
> 		intel_crtc_dpms_overlay(intel_crtc, true);
> 	break;
> 	case DRM_MODE_DPMS_OFF:
>-		intel_update_watermarks(dev);
>-
> 		/* Give the overlay scaler a chance to disable if it's on this pipe */
> 		intel_crtc_dpms_overlay(intel_crtc, false);
> 		drm_vblank_off(dev, pipe);
>@@ -2359,10 +2355,11 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
> 	if (intel_crtc->dpms_mode == mode)
> 		return;
> 
>-	dev_priv->display.dpms(crtc, mode);
>-
> 	intel_crtc->dpms_mode = mode;
> 
>+	dev_priv->display.dpms(crtc, mode);
>+	intel_update_watermarks(dev);
>+
> 	intel_crtc->cursor_on = mode == DRM_MODE_DPMS_ON;
> 	intel_crtc_update_cursor(crtc);
> 
>@@ -3245,12 +3242,11 @@ static void ironlake_update_wm(struct drm_device *dev,  int planea_clock,
> 	int line_count;
> 	int planea_htotal = 0, planeb_htotal = 0;
> 	struct drm_crtc *crtc;
>-	struct intel_crtc *intel_crtc;
> 
> 	/* Need htotal for all active display plane */
> 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
>-		intel_crtc = to_intel_crtc(crtc);
>-		if (crtc->enabled) {
>+		struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>+		if (intel_crtc->dpms_mode == DRM_MODE_DPMS_ON) {
> 			if (intel_crtc->plane == 0)
> 				planea_htotal = crtc->mode.htotal;
> 			else
>@@ -3410,7 +3406,6 @@ static void intel_update_watermarks(struct drm_device *dev)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
> 	struct drm_crtc *crtc;
>-	struct intel_crtc *intel_crtc;
> 	int sr_hdisplay = 0;
> 	unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0;
> 	int enabled = 0, pixel_size = 0;
>@@ -3421,8 +3416,8 @@ static void intel_update_watermarks(struct drm_device *dev)
> 
> 	/* Get the clock config from both planes */
> 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
>-		intel_crtc = to_intel_crtc(crtc);
>-		if (crtc->enabled) {
>+		struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>+		if (intel_crtc->dpms_mode == DRM_MODE_DPMS_ON) {
> 			enabled++;
> 			if (intel_crtc->plane == 0) {
> 				DRM_DEBUG_KMS("plane A (pipe %d) clock: %d\n",
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 29173: 37241 | 37244 | 37621

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.