[PATCH] intel-dri: Fix initialization if startup happens in interlaced mode [v2]

[PATCH] intel-dri: Fix initialization if startup happens in interlaced mode [v2]

[Christian Schmidt]

[-- Attachment #1: Type: text/plain, Size: 463 bytes --]

My EFI BIOS starts the graphics card up in my projector's preferred EDID
mode, 1080@60i. The Intel driver does not clear the interlaced bit:

#define   PIPECONF_PROGRESSIVE  (0 << 21)
#define   PIPECONF_INTERLACE_W_FIELD_INDICATION (6 << 21)
#define   PIPECONF_INTERLACE_FIELD_0_ONLY               (7 << 21)

This patch introduces a new PIPECONF_INTERLACE_MASK define and uses it
to restore progressive mode.

Signed-of-by: Christian Schmidt <schmidt@digadd.de>


[-- Attachment #2: fix_startup_in_interlaced_mode.patch --]
[-- Type: text/x-patch, Size: 1241 bytes --]

diff -ur linux-3.2-rc1.orig/drivers/gpu/drm/i915/i915_reg.h linux-3.2-rc1/drivers/gpu/drm/i915/i915_reg.h
--- linux-3.2-rc1.orig/drivers/gpu/drm/i915/i915_reg.h	2011-11-14 12:16:42.811994538 +0100
+++ linux-3.2-rc1/drivers/gpu/drm/i915/i915_reg.h	2011-11-14 12:17:05.124715590 +0100
@@ -2312,6 +2312,7 @@
 #define   PIPECONF_PROGRESSIVE	(0 << 21)
 #define   PIPECONF_INTERLACE_W_FIELD_INDICATION	(6 << 21)
 #define   PIPECONF_INTERLACE_FIELD_0_ONLY		(7 << 21)
+#define   PIPECONF_INTERLACE_MASK	(7 << 21)
 #define   PIPECONF_CXSR_DOWNCLOCK	(1<<16)
 #define   PIPECONF_BPP_MASK	(0x000000e0)
 #define   PIPECONF_BPP_8	(0<<5)
diff -ur linux-3.2-rc1.orig/drivers/gpu/drm/i915/intel_display.c linux-3.2-rc1/drivers/gpu/drm/i915/intel_display.c
--- linux-3.2-rc1.orig/drivers/gpu/drm/i915/intel_display.c	2011-11-08 01:16:02.000000000 +0100
+++ linux-3.2-rc1/drivers/gpu/drm/i915/intel_display.c	2011-11-14 12:15:59.373537593 +0100
@@ -5136,7 +5136,7 @@
 		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) |

[-- Attachment #3: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] intel-dri: Fix initialization if startup happens in interlaced mode [v2]

[Chris Wilson]

On Mon, 14 Nov 2011 12:21:35 +0100, Christian Schmidt <schmidt@digadd.de> wrote:
> My EFI BIOS starts the graphics card up in my projector's preferred EDID
> mode, 1080@60i. The Intel driver does not clear the interlaced bit:
> 
> #define   PIPECONF_PROGRESSIVE  (0 << 21)
> #define   PIPECONF_INTERLACE_W_FIELD_INDICATION (6 << 21)
> #define   PIPECONF_INTERLACE_FIELD_0_ONLY               (7 << 21)
> 
> This patch introduces a new PIPECONF_INTERLACE_MASK define and uses it
> to restore progressive mode.
> 
> Signed-of-by: Christian Schmidt <schmidt@digadd.de>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre