Skip to content

Commit 59df7b1

Browse files
chrschmidtairlied
authored andcommitted
drm/intel: 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 all the interlaced bits. 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> Signed-off-by: Dave Airlie <airlied@redhat.com>
1 parent 4966b2a commit 59df7b1

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2312,6 +2312,7 @@
23122312
#define PIPECONF_PROGRESSIVE (0 << 21)
23132313
#define PIPECONF_INTERLACE_W_FIELD_INDICATION (6 << 21)
23142314
#define PIPECONF_INTERLACE_FIELD_0_ONLY (7 << 21)
2315+
#define PIPECONF_INTERLACE_MASK (7 << 21)
23152316
#define PIPECONF_CXSR_DOWNCLOCK (1<<16)
23162317
#define PIPECONF_BPP_MASK (0x000000e0)
23172318
#define PIPECONF_BPP_8 (0<<5)

drivers/gpu/drm/i915/intel_display.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5136,7 +5136,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,
51365136
adjusted_mode->crtc_vsync_end -= 1;
51375137
adjusted_mode->crtc_vsync_start -= 1;
51385138
} else
5139-
pipeconf &= ~PIPECONF_INTERLACE_W_FIELD_INDICATION; /* progressive */
5139+
pipeconf &= ~PIPECONF_INTERLACE_MASK; /* progressive */
51405140

51415141
I915_WRITE(HTOTAL(pipe),
51425142
(adjusted_mode->crtc_hdisplay - 1) |

0 commit comments

Comments
 (0)