[PATCH] [i915] Fix another use of the wrong interlace mask to return to progressive mode

Christian Schmidt schmidt at digadd.de
Fri Feb 24 01:51:42 PST 2012


intel_display.c:            pipeconf |= PIPECONF_INTERLACE_W_FIELD_INDICATION;
intel_display.c:            pipeconf &= ~PIPECONF_INTERLACE_MASK; /* progressive */
intel_display.c:            pipeconf |= PIPECONF_INTERLACE_W_FIELD_INDICATION;
intel_display.c:            pipeconf &= ~PIPECONF_INTERLACE_W_FIELD_INDICATION; /* progressive */

The second setting of progressive mode should use PIPECONF_INTERLACE_MASK, too.

Signed-off-by: Christian Schmidt <schmidt at digadd.de>
---
 drivers/gpu/drm/i915/intel_display.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 56a8554..3a3ca1a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5048,7 +5048,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,
 		adjusted_mode->crtc_vsync_end -= 1;
 		adjusted_mode->crtc_vsync_start -= 1;
 	} else
-		pipeconf &= ~PIPECONF_INTERLACE_W_FIELD_INDICATION; /* progressive */
+		pipeconf &= ~PIPECONF_INTERLACE_MASK; /* progressive */
 
 	I915_WRITE(HTOTAL(pipe),
 		   (adjusted_mode->crtc_hdisplay - 1) |
-- 
1.7.8.3



More information about the dri-devel mailing list