From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH 9/9] drm/i915: kill ivybridge_irq_postinstall Date: Fri, 19 Jul 2013 16:44:18 +0300 Message-ID: <87ip068y19.fsf@gaia.fi.intel.com> References: <20130712195234.GE23323@cantiga.alporthouse.com> <1373670116-3626-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F5F6E6A37 for ; Fri, 19 Jul 2013 06:44:23 -0700 (PDT) In-Reply-To: <1373670116-3626-1-git-send-email-przanoni@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: Paulo Zanoni , intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org Paulo Zanoni writes: > From: Paulo Zanoni > > It was very similar to ironlake_irq_postinstall, so IMHO merging both > functions results in a code that is easier to maintain. > > With this change, all the irq handler vfuncs between ironlake and > ivybridge are now unified. > > v2: Add "(" and ")" to make at least one vim user much happier (Chris) > > Signed-off-by: Paulo Zanoni Reviewed-by: Mika Kuoppala > --- > drivers/gpu/drm/i915/i915_irq.c | 69 ++++++++++++----------------------------- > 1 file changed, 20 insertions(+), 49 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index d084057..8b48a32 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -2161,21 +2161,33 @@ static void gen5_gt_irq_postinstall(struct drm_device *dev) > static int ironlake_irq_postinstall(struct drm_device *dev) > { > unsigned long irqflags; > - > drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; > - /* enable kind of interrupts always enabled */ > - u32 display_mask = DE_MASTER_IRQ_CONTROL | DE_GSE | DE_PCH_EVENT | > - DE_PLANEA_FLIP_DONE | DE_PLANEB_FLIP_DONE | > - DE_AUX_CHANNEL_A | DE_PIPEB_FIFO_UNDERRUN | > - DE_PIPEA_FIFO_UNDERRUN | DE_POISON; > + u32 display_mask, extra_mask; > + > + if (INTEL_INFO(dev)->gen >= 7) { > + display_mask = (DE_MASTER_IRQ_CONTROL | DE_GSE_IVB | > + DE_PCH_EVENT_IVB | DE_PLANEC_FLIP_DONE_IVB | > + DE_PLANEB_FLIP_DONE_IVB | > + DE_PLANEA_FLIP_DONE_IVB | DE_AUX_CHANNEL_A_IVB | > + DE_ERR_INT_IVB); > + extra_mask = (DE_PIPEC_VBLANK_IVB | DE_PIPEB_VBLANK_IVB | > + DE_PIPEA_VBLANK_IVB); > + > + I915_WRITE(GEN7_ERR_INT, I915_READ(GEN7_ERR_INT)); > + } else { > + display_mask = (DE_MASTER_IRQ_CONTROL | DE_GSE | DE_PCH_EVENT | > + DE_PLANEA_FLIP_DONE | DE_PLANEB_FLIP_DONE | > + DE_AUX_CHANNEL_A | DE_PIPEB_FIFO_UNDERRUN | > + DE_PIPEA_FIFO_UNDERRUN | DE_POISON); > + extra_mask = DE_PIPEA_VBLANK | DE_PIPEB_VBLANK | DE_PCU_EVENT; > + } > > dev_priv->irq_mask = ~display_mask; > > /* should always can generate irq */ > I915_WRITE(DEIIR, I915_READ(DEIIR)); > I915_WRITE(DEIMR, dev_priv->irq_mask); > - I915_WRITE(DEIER, display_mask | > - DE_PIPEA_VBLANK | DE_PIPEB_VBLANK | DE_PCU_EVENT); > + I915_WRITE(DEIER, display_mask | extra_mask); > POSTING_READ(DEIER); > > gen5_gt_irq_postinstall(dev); > @@ -2196,38 +2208,6 @@ static int ironlake_irq_postinstall(struct drm_device *dev) > return 0; > } > > -static int ivybridge_irq_postinstall(struct drm_device *dev) > -{ > - drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; > - /* enable kind of interrupts always enabled */ > - u32 display_mask = > - DE_MASTER_IRQ_CONTROL | DE_GSE_IVB | DE_PCH_EVENT_IVB | > - DE_PLANEC_FLIP_DONE_IVB | > - DE_PLANEB_FLIP_DONE_IVB | > - DE_PLANEA_FLIP_DONE_IVB | > - DE_AUX_CHANNEL_A_IVB | > - DE_ERR_INT_IVB; > - > - dev_priv->irq_mask = ~display_mask; > - > - /* should always can generate irq */ > - I915_WRITE(GEN7_ERR_INT, I915_READ(GEN7_ERR_INT)); > - I915_WRITE(DEIIR, I915_READ(DEIIR)); > - I915_WRITE(DEIMR, dev_priv->irq_mask); > - I915_WRITE(DEIER, > - display_mask | > - DE_PIPEC_VBLANK_IVB | > - DE_PIPEB_VBLANK_IVB | > - DE_PIPEA_VBLANK_IVB); > - POSTING_READ(DEIER); > - > - gen5_gt_irq_postinstall(dev); > - > - ibx_irq_postinstall(dev); > - > - return 0; > -} > - > static int valleyview_irq_postinstall(struct drm_device *dev) > { > drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; > @@ -3036,15 +3016,6 @@ void intel_irq_init(struct drm_device *dev) > dev->driver->enable_vblank = valleyview_enable_vblank; > dev->driver->disable_vblank = valleyview_disable_vblank; > dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup; > - } else if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) { > - /* Share uninstall handlers with ILK/SNB */ > - dev->driver->irq_handler = ironlake_irq_handler; > - dev->driver->irq_preinstall = ironlake_irq_preinstall; > - dev->driver->irq_postinstall = ivybridge_irq_postinstall; > - dev->driver->irq_uninstall = ironlake_irq_uninstall; > - dev->driver->enable_vblank = ironlake_enable_vblank; > - dev->driver->disable_vblank = ironlake_disable_vblank; > - dev_priv->display.hpd_irq_setup = ibx_hpd_irq_setup; > } else if (HAS_PCH_SPLIT(dev)) { > dev->driver->irq_handler = ironlake_irq_handler; > dev->driver->irq_preinstall = ironlake_irq_preinstall; > -- > 1.8.1.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx