| Message ID | 20180522002558.29262-2-paulo.r.zanoni@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>-----Original Message----- >From: Zanoni, Paulo R >Sent: Monday, May 21, 2018 5:26 PM >To: intel-gfx@lists.freedesktop.org >Cc: Pandiyan, Dhinakaran <dhinakaran.pandiyan@intel.com>; Zanoni, Paulo R ><paulo.r.zanoni@intel.com>; Srivatsa, Anusha <anusha.srivatsa@intel.com> >Subject: [PATCH 01/24] drm/i915/icl: Extend AUX F interrupts to ICL > >From: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> > >ICL has AUX F. > >Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> >Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> >Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> >Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Looks good. Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com> >--- > drivers/gpu/drm/i915/i915_irq.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > >diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c >index f9bc3aaa90d0..2fd92a886789 100644 >--- a/drivers/gpu/drm/i915/i915_irq.c >+++ b/drivers/gpu/drm/i915/i915_irq.c >@@ -2640,7 +2640,8 @@ gen8_de_irq_handler(struct drm_i915_private >*dev_priv, u32 master_ctl) > GEN9_AUX_CHANNEL_C | > GEN9_AUX_CHANNEL_D; > >- if (IS_CNL_WITH_PORT_F(dev_priv)) >+ if (IS_CNL_WITH_PORT_F(dev_priv) || >+ INTEL_GEN(dev_priv) >= 11) > tmp_mask |= CNL_AUX_CHANNEL_F; > > if (iir & tmp_mask) { >@@ -3920,7 +3921,7 @@ static void gen8_de_irq_postinstall(struct >drm_i915_private *dev_priv) > de_pipe_masked |= GEN8_DE_PIPE_IRQ_FAULT_ERRORS; > } > >- if (IS_CNL_WITH_PORT_F(dev_priv)) >+ if (IS_CNL_WITH_PORT_F(dev_priv) || INTEL_GEN(dev_priv) >= 11) > de_port_masked |= CNL_AUX_CHANNEL_F; > > de_pipe_enables = de_pipe_masked | GEN8_PIPE_VBLANK | >-- >2.14.3
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index f9bc3aaa90d0..2fd92a886789 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2640,7 +2640,8 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) GEN9_AUX_CHANNEL_C | GEN9_AUX_CHANNEL_D; - if (IS_CNL_WITH_PORT_F(dev_priv)) + if (IS_CNL_WITH_PORT_F(dev_priv) || + INTEL_GEN(dev_priv) >= 11) tmp_mask |= CNL_AUX_CHANNEL_F; if (iir & tmp_mask) { @@ -3920,7 +3921,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) de_pipe_masked |= GEN8_DE_PIPE_IRQ_FAULT_ERRORS; } - if (IS_CNL_WITH_PORT_F(dev_priv)) + if (IS_CNL_WITH_PORT_F(dev_priv) || INTEL_GEN(dev_priv) >= 11) de_port_masked |= CNL_AUX_CHANNEL_F; de_pipe_enables = de_pipe_masked | GEN8_PIPE_VBLANK |