From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 11/19] drm/i915: vlv: keep first level vblank IRQs masked Date: Tue, 18 Feb 2014 18:54:54 +0200 Message-ID: <20140218165454.GV3852@intel.com> References: <1392674540-10915-1-git-send-email-imre.deak@intel.com> <1392674540-10915-12-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 46133FA17C for ; Tue, 18 Feb 2014 08:54:58 -0800 (PST) Content-Disposition: inline In-Reply-To: <1392674540-10915-12-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Imre Deak Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, Feb 18, 2014 at 12:02:12AM +0200, Imre Deak wrote: > This is a left-over from > = > commit b7e634cc8dcd320123199a18bae0937b40dc28b8 > Author: Imre Deak > Date: Tue Feb 4 21:35:45 2014 +0200 > = > drm/i915: vlv: don't unmask IIR[DISPLAY_PIPE_A/B_VBLANK] interrupt > = > where we stopped unmasking the vblank IRQs, but left them enabled in the > IER register. Disable them in IER too. > = > Signed-off-by: Imre Deak > --- > drivers/gpu/drm/i915/i915_irq.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_= irq.c > index f68aee3..75dd0a8 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -3026,17 +3026,13 @@ static int valleyview_irq_postinstall(struct drm_= device *dev) > = > enable_mask =3D I915_DISPLAY_PORT_INTERRUPT; > enable_mask |=3D I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | > - I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT | > - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | > - I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT; > + I915_DISPLAY_PIPE_B_EVENT_INTERRUPT; > = > /* > *Leave vblank interrupts masked initially. enable/disable will > * toggle them based on usage. > */ This comment is now stale. > - dev_priv->irq_mask =3D (~enable_mask) | > - I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT | > - I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT; > + dev_priv->irq_mask =3D ~enable_mask; > = > I915_WRITE(PORT_HOTPLUG_EN, 0); > POSTING_READ(PORT_HOTPLUG_EN); > -- = > 1.8.4 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC