* [PATCH] [i915] Fix another use of the wrong interlace mask to return to progressive mode
@ 2012-02-24 9:51 Christian Schmidt
2012-02-24 14:24 ` Daniel Vetter
0 siblings, 1 reply; 2+ messages in thread
From: Christian Schmidt @ 2012-02-24 9:51 UTC (permalink / raw)
To: Dave Airlie; +Cc: dri-devel
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@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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [i915] Fix another use of the wrong interlace mask to return to progressive mode
2012-02-24 9:51 [PATCH] [i915] Fix another use of the wrong interlace mask to return to progressive mode Christian Schmidt
@ 2012-02-24 14:24 ` Daniel Vetter
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2012-02-24 14:24 UTC (permalink / raw)
To: Christian Schmidt; +Cc: dri-devel
On Fri, Feb 24, 2012 at 10:51:42AM +0100, Christian Schmidt wrote:
> 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@digadd.de>
Already fixed in -fixes. Furthermore we have (hopefully) fully working
interlaced support merged into -next (already pushed out to Dave's
drm-next tree).
-Daniel
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-24 14:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-24 9:51 [PATCH] [i915] Fix another use of the wrong interlace mask to return to progressive mode Christian Schmidt
2012-02-24 14:24 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox