From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Turn off hsync and vsync on ADPA when disabling crt Date: Wed, 6 Mar 2013 18:03:51 +0100 Message-ID: <20130306170351.GP9021@phenom.ffwll.local> References: <1362489888-32651-1-git-send-email-patrik.r.jakobsson@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 1052EE6A0A for ; Wed, 6 Mar 2013 09:01:19 -0800 (PST) Received: by mail-wg0-f43.google.com with SMTP id e12so7682280wge.34 for ; Wed, 06 Mar 2013 09:01:19 -0800 (PST) Content-Disposition: inline In-Reply-To: <1362489888-32651-1-git-send-email-patrik.r.jakobsson@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Patrik Jakobsson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, Mar 05, 2013 at 02:24:48PM +0100, Patrik Jakobsson wrote: > According to PRM we need to disable hsync and vsync even though ADPA is > disabled. The previous code did infact do the opposite so we fix it. > > Signed-off-by: Patrik Jakobsson Bugreporter confirmed that it works, so merged to -fixes with cc: stable. Thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/intel_crt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c > index 969d08c..32a3693 100644 > --- a/drivers/gpu/drm/i915/intel_crt.c > +++ b/drivers/gpu/drm/i915/intel_crt.c > @@ -88,7 +88,7 @@ static void intel_disable_crt(struct intel_encoder *encoder) > u32 temp; > > temp = I915_READ(crt->adpa_reg); > - temp &= ~(ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE); > + temp |= ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE; > temp &= ~ADPA_DAC_ENABLE; > I915_WRITE(crt->adpa_reg, temp); > } > -- > 1.7.10.4 > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch