Skip to contentSkip to conversation

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

PATCH In review Christian Schmidt 2 participants 2 messages Nov 14, 2011

Subsystems (2)
DRM drivers Intel i915
lore
Share & tools
lore

Christian Schmidt

author
#0 lore raw

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

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 <[email protected]>
drivers/gpu/drm/i915/i915_reg.h +1 -0
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
@@ -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)
drivers/gpu/drm/i915/intel_display.c +1 -1
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
@@ -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) |

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Christian Schmidt

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 <[email protected]>
Reviewed-by Chris Wilson <[email protected]>

-Chris

Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre