Skip to content

Commit 1007337

Browse files
committed
drm/i915/irq: add dg1_de_irq_postinstall()
Add a dedicated de postinstall function. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/cb6bb860fb7596d6b37c3e1e4c7657064d2d747a.1691509966.git.jani.nikula@intel.com
1 parent 1486d04 commit 1007337

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

drivers/gpu/drm/i915/display/intel_display_irq.c

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1666,7 +1666,7 @@ void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
16661666
}
16671667
}
16681668

1669-
void mtp_irq_postinstall(struct drm_i915_private *i915)
1669+
static void mtp_irq_postinstall(struct drm_i915_private *i915)
16701670
{
16711671
struct intel_uncore *uncore = &i915->uncore;
16721672
u32 sde_mask = SDE_GMBUS_ICP | SDE_PICAINTERRUPT;
@@ -1699,6 +1699,21 @@ void gen11_de_irq_postinstall(struct drm_i915_private *dev_priv)
16991699
GEN11_DISPLAY_IRQ_ENABLE);
17001700
}
17011701

1702+
void dg1_de_irq_postinstall(struct drm_i915_private *i915)
1703+
{
1704+
if (!HAS_DISPLAY(i915))
1705+
return;
1706+
1707+
if (DISPLAY_VER(i915) >= 14)
1708+
mtp_irq_postinstall(i915);
1709+
else
1710+
icp_irq_postinstall(i915);
1711+
1712+
gen8_de_irq_postinstall(i915);
1713+
intel_uncore_write(&i915->uncore, GEN11_DISPLAY_INT_CTL,
1714+
GEN11_DISPLAY_IRQ_ENABLE);
1715+
}
1716+
17021717
void intel_display_irq_init(struct drm_i915_private *i915)
17031718
{
17041719
i915->drm.vblank_disable_immediate = true;

drivers/gpu/drm/i915/display/intel_display_irq.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ void ibx_irq_postinstall(struct drm_i915_private *i915);
6262
void vlv_display_irq_postinstall(struct drm_i915_private *i915);
6363
void icp_irq_postinstall(struct drm_i915_private *i915);
6464
void gen8_de_irq_postinstall(struct drm_i915_private *i915);
65-
void mtp_irq_postinstall(struct drm_i915_private *i915);
6665
void gen11_de_irq_postinstall(struct drm_i915_private *i915);
66+
void dg1_de_irq_postinstall(struct drm_i915_private *i915);
6767

6868
u32 i915_pipestat_enable_mask(struct drm_i915_private *i915, enum pipe pipe);
6969
void i915_enable_pipestat(struct drm_i915_private *i915, enum pipe pipe, u32 status_mask);

drivers/gpu/drm/i915/i915_irq.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -869,16 +869,7 @@ static void dg1_irq_postinstall(struct drm_i915_private *dev_priv)
869869

870870
GEN3_IRQ_INIT(uncore, GEN11_GU_MISC_, ~gu_misc_masked, gu_misc_masked);
871871

872-
if (HAS_DISPLAY(dev_priv)) {
873-
if (DISPLAY_VER(dev_priv) >= 14)
874-
mtp_irq_postinstall(dev_priv);
875-
else
876-
icp_irq_postinstall(dev_priv);
877-
878-
gen8_de_irq_postinstall(dev_priv);
879-
intel_uncore_write(&dev_priv->uncore, GEN11_DISPLAY_INT_CTL,
880-
GEN11_DISPLAY_IRQ_ENABLE);
881-
}
872+
dg1_de_irq_postinstall(dev_priv);
882873

883874
dg1_master_intr_enable(intel_uncore_regs(uncore));
884875
intel_uncore_posting_read(uncore, DG1_MSTR_TILE_INTR);

0 commit comments

Comments
 (0)