From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Schmidt Subject: [PATCH] [i915] Fix another use of the wrong interlace mask to return to progressive mode Date: Fri, 24 Feb 2012 10:51:42 +0100 Message-ID: <1330077102-14146-1-git-send-email-schmidt@digadd.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.digadd.de (mx2.digadd.de [195.47.195.236]) by gabe.freedesktop.org (Postfix) with ESMTP id 27DB39E9AC for ; Fri, 24 Feb 2012 02:22:15 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Dave Airlie Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org 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 --- 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