Skip to content

Commit

Permalink
drm/i915/irq: s/gen3/gen2/
Browse files Browse the repository at this point in the history 
Now that we use the gen3 codepaths also for gen2
rename everything to gen2_ to match.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241008214349.23331-4-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
  • Loading branch information
Ville Syrjälä committed Oct 15, 2024
1 parent 9038011 commit 750a954
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 62 deletions.
50 changes: 25 additions & 25 deletions drivers/gpu/drm/i915/display/intel_display_irq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1496,7 +1496,7 @@ void vlv_display_irq_reset(struct drm_i915_private *dev_priv)

i9xx_pipestat_irq_reset(dev_priv);

gen3_irq_reset(uncore, VLV_IRQ_REGS);
gen2_irq_reset(uncore, VLV_IRQ_REGS);
dev_priv->irq_mask = ~0u;
}

Expand Down Expand Up @@ -1539,7 +1539,7 @@ void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)

dev_priv->irq_mask = ~enable_mask;

gen3_irq_init(uncore, VLV_IRQ_REGS, dev_priv->irq_mask, enable_mask);
gen2_irq_init(uncore, VLV_IRQ_REGS, dev_priv->irq_mask, enable_mask);
}

void gen8_display_irq_reset(struct drm_i915_private *dev_priv)
Expand All @@ -1556,10 +1556,10 @@ void gen8_display_irq_reset(struct drm_i915_private *dev_priv)
for_each_pipe(dev_priv, pipe)
if (intel_display_power_is_enabled(dev_priv,
POWER_DOMAIN_PIPE(pipe)))
gen3_irq_reset(uncore, GEN8_DE_PIPE_IRQ_REGS(pipe));
gen2_irq_reset(uncore, GEN8_DE_PIPE_IRQ_REGS(pipe));

gen3_irq_reset(uncore, GEN8_DE_PORT_IRQ_REGS);
gen3_irq_reset(uncore, GEN8_DE_MISC_IRQ_REGS);
gen2_irq_reset(uncore, GEN8_DE_PORT_IRQ_REGS);
gen2_irq_reset(uncore, GEN8_DE_MISC_IRQ_REGS);
}

void gen11_display_irq_reset(struct drm_i915_private *dev_priv)
Expand Down Expand Up @@ -1599,18 +1599,18 @@ void gen11_display_irq_reset(struct drm_i915_private *dev_priv)
for_each_pipe(dev_priv, pipe)
if (intel_display_power_is_enabled(dev_priv,
POWER_DOMAIN_PIPE(pipe)))
gen3_irq_reset(uncore, GEN8_DE_PIPE_IRQ_REGS(pipe));
gen2_irq_reset(uncore, GEN8_DE_PIPE_IRQ_REGS(pipe));

gen3_irq_reset(uncore, GEN8_DE_PORT_IRQ_REGS);
gen3_irq_reset(uncore, GEN8_DE_MISC_IRQ_REGS);
gen2_irq_reset(uncore, GEN8_DE_PORT_IRQ_REGS);
gen2_irq_reset(uncore, GEN8_DE_MISC_IRQ_REGS);

if (DISPLAY_VER(dev_priv) >= 14)
gen3_irq_reset(uncore, PICAINTERRUPT_IRQ_REGS);
gen2_irq_reset(uncore, PICAINTERRUPT_IRQ_REGS);
else
gen3_irq_reset(uncore, GEN11_DE_HPD_IRQ_REGS);
gen2_irq_reset(uncore, GEN11_DE_HPD_IRQ_REGS);

if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
gen3_irq_reset(uncore, SDE_IRQ_REGS);
gen2_irq_reset(uncore, SDE_IRQ_REGS);
}

void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv,
Expand All @@ -1630,7 +1630,7 @@ void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv,
}

for_each_pipe_masked(dev_priv, pipe, pipe_mask)
gen3_irq_init(uncore, GEN8_DE_PIPE_IRQ_REGS(pipe),
gen2_irq_init(uncore, GEN8_DE_PIPE_IRQ_REGS(pipe),
dev_priv->display.irq.de_irq_mask[pipe],
~dev_priv->display.irq.de_irq_mask[pipe] | extra_ier);

Expand All @@ -1651,7 +1651,7 @@ void gen8_irq_power_well_pre_disable(struct drm_i915_private *dev_priv,
}

for_each_pipe_masked(dev_priv, pipe, pipe_mask)
gen3_irq_reset(uncore, GEN8_DE_PIPE_IRQ_REGS(pipe));
gen2_irq_reset(uncore, GEN8_DE_PIPE_IRQ_REGS(pipe));

spin_unlock_irq(&dev_priv->irq_lock);

Expand Down Expand Up @@ -1685,7 +1685,7 @@ static void ibx_irq_postinstall(struct drm_i915_private *dev_priv)
else
mask = SDE_GMBUS_CPT;

gen3_irq_init(uncore, SDE_IRQ_REGS, ~mask, 0xffffffff);
gen2_irq_init(uncore, SDE_IRQ_REGS, ~mask, 0xffffffff);
}

void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv)
Expand Down Expand Up @@ -1742,7 +1742,7 @@ void ilk_de_irq_postinstall(struct drm_i915_private *i915)
}

if (IS_HASWELL(i915)) {
gen3_assert_iir_is_zero(uncore, EDP_PSR_IIR);
gen2_assert_iir_is_zero(uncore, EDP_PSR_IIR);
display_mask |= DE_EDP_PSR_INT_HSW;
}

Expand All @@ -1753,7 +1753,7 @@ void ilk_de_irq_postinstall(struct drm_i915_private *i915)

ibx_irq_postinstall(i915);

gen3_irq_init(uncore, DE_IRQ_REGS, i915->irq_mask,
gen2_irq_init(uncore, DE_IRQ_REGS, i915->irq_mask,
display_mask | extra_mask);
}

Expand Down Expand Up @@ -1827,32 +1827,32 @@ void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
if (!intel_display_power_is_enabled(dev_priv, domain))
continue;

gen3_assert_iir_is_zero(uncore,
gen2_assert_iir_is_zero(uncore,
TRANS_PSR_IIR(dev_priv, trans));
}
} else {
gen3_assert_iir_is_zero(uncore, EDP_PSR_IIR);
gen2_assert_iir_is_zero(uncore, EDP_PSR_IIR);
}

for_each_pipe(dev_priv, pipe) {
dev_priv->display.irq.de_irq_mask[pipe] = ~de_pipe_masked;

if (intel_display_power_is_enabled(dev_priv,
POWER_DOMAIN_PIPE(pipe)))
gen3_irq_init(uncore, GEN8_DE_PIPE_IRQ_REGS(pipe),
gen2_irq_init(uncore, GEN8_DE_PIPE_IRQ_REGS(pipe),
dev_priv->display.irq.de_irq_mask[pipe],
de_pipe_enables);
}

gen3_irq_init(uncore, GEN8_DE_PORT_IRQ_REGS, ~de_port_masked, de_port_enables);
gen3_irq_init(uncore, GEN8_DE_MISC_IRQ_REGS, ~de_misc_masked, de_misc_masked);
gen2_irq_init(uncore, GEN8_DE_PORT_IRQ_REGS, ~de_port_masked, de_port_enables);
gen2_irq_init(uncore, GEN8_DE_MISC_IRQ_REGS, ~de_misc_masked, de_misc_masked);

if (IS_DISPLAY_VER(dev_priv, 11, 13)) {
u32 de_hpd_masked = 0;
u32 de_hpd_enables = GEN11_DE_TC_HOTPLUG_MASK |
GEN11_DE_TBT_HOTPLUG_MASK;

gen3_irq_init(uncore, GEN11_DE_HPD_IRQ_REGS, ~de_hpd_masked,
gen2_irq_init(uncore, GEN11_DE_HPD_IRQ_REGS, ~de_hpd_masked,
de_hpd_enables);
}
}
Expand All @@ -1865,18 +1865,18 @@ static void mtp_irq_postinstall(struct drm_i915_private *i915)
u32 de_hpd_enables = de_hpd_mask | XELPDP_DP_ALT_HOTPLUG_MASK |
XELPDP_TBT_HOTPLUG_MASK;

gen3_irq_init(uncore, PICAINTERRUPT_IRQ_REGS, ~de_hpd_mask,
gen2_irq_init(uncore, PICAINTERRUPT_IRQ_REGS, ~de_hpd_mask,
de_hpd_enables);

gen3_irq_init(uncore, SDE_IRQ_REGS, ~sde_mask, 0xffffffff);
gen2_irq_init(uncore, SDE_IRQ_REGS, ~sde_mask, 0xffffffff);
}

static void icp_irq_postinstall(struct drm_i915_private *dev_priv)
{
struct intel_uncore *uncore = &dev_priv->uncore;
u32 mask = SDE_GMBUS_ICP;

gen3_irq_init(uncore, SDE_IRQ_REGS, ~mask, 0xffffffff);
gen2_irq_init(uncore, SDE_IRQ_REGS, ~mask, 0xffffffff);
}

void gen11_de_irq_postinstall(struct drm_i915_private *dev_priv)
Expand Down
24 changes: 12 additions & 12 deletions drivers/gpu/drm/i915/gt/intel_gt_irq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,10 +452,10 @@ void gen8_gt_irq_reset(struct intel_gt *gt)
{
struct intel_uncore *uncore = gt->uncore;

gen3_irq_reset(uncore, GEN8_GT_IRQ_REGS(0));
gen3_irq_reset(uncore, GEN8_GT_IRQ_REGS(1));
gen3_irq_reset(uncore, GEN8_GT_IRQ_REGS(2));
gen3_irq_reset(uncore, GEN8_GT_IRQ_REGS(3));
gen2_irq_reset(uncore, GEN8_GT_IRQ_REGS(0));
gen2_irq_reset(uncore, GEN8_GT_IRQ_REGS(1));
gen2_irq_reset(uncore, GEN8_GT_IRQ_REGS(2));
gen2_irq_reset(uncore, GEN8_GT_IRQ_REGS(3));
}

void gen8_gt_irq_postinstall(struct intel_gt *gt)
Expand All @@ -476,14 +476,14 @@ void gen8_gt_irq_postinstall(struct intel_gt *gt)

gt->pm_ier = 0x0;
gt->pm_imr = ~gt->pm_ier;
gen3_irq_init(uncore, GEN8_GT_IRQ_REGS(0), ~gt_interrupts[0], gt_interrupts[0]);
gen3_irq_init(uncore, GEN8_GT_IRQ_REGS(1), ~gt_interrupts[1], gt_interrupts[1]);
gen2_irq_init(uncore, GEN8_GT_IRQ_REGS(0), ~gt_interrupts[0], gt_interrupts[0]);
gen2_irq_init(uncore, GEN8_GT_IRQ_REGS(1), ~gt_interrupts[1], gt_interrupts[1]);
/*
* RPS interrupts will get enabled/disabled on demand when RPS itself
* is enabled/disabled. Same wil be the case for GuC interrupts.
*/
gen3_irq_init(uncore, GEN8_GT_IRQ_REGS(2), gt->pm_imr, gt->pm_ier);
gen3_irq_init(uncore, GEN8_GT_IRQ_REGS(3), ~gt_interrupts[3], gt_interrupts[3]);
gen2_irq_init(uncore, GEN8_GT_IRQ_REGS(2), gt->pm_imr, gt->pm_ier);
gen2_irq_init(uncore, GEN8_GT_IRQ_REGS(3), ~gt_interrupts[3], gt_interrupts[3]);
}

static void gen5_gt_update_irq(struct intel_gt *gt,
Expand Down Expand Up @@ -514,9 +514,9 @@ void gen5_gt_irq_reset(struct intel_gt *gt)
{
struct intel_uncore *uncore = gt->uncore;

gen3_irq_reset(uncore, GT_IRQ_REGS);
gen2_irq_reset(uncore, GT_IRQ_REGS);
if (GRAPHICS_VER(gt->i915) >= 6)
gen3_irq_reset(uncore, GEN6_PM_IRQ_REGS);
gen2_irq_reset(uncore, GEN6_PM_IRQ_REGS);
}

void gen5_gt_irq_postinstall(struct intel_gt *gt)
Expand All @@ -538,7 +538,7 @@ void gen5_gt_irq_postinstall(struct intel_gt *gt)
else
gt_irqs |= GT_BLT_USER_INTERRUPT | GT_BSD_USER_INTERRUPT;

gen3_irq_init(uncore, GT_IRQ_REGS, gt->gt_imr, gt_irqs);
gen2_irq_init(uncore, GT_IRQ_REGS, gt->gt_imr, gt_irqs);

if (GRAPHICS_VER(gt->i915) >= 6) {
/*
Expand All @@ -551,6 +551,6 @@ void gen5_gt_irq_postinstall(struct intel_gt *gt)
}

gt->pm_imr = 0xffffffff;
gen3_irq_init(uncore, GEN6_PM_IRQ_REGS, gt->pm_imr, pm_irqs);
gen2_irq_init(uncore, GEN6_PM_IRQ_REGS, gt->pm_imr, pm_irqs);
}
}
36 changes: 18 additions & 18 deletions drivers/gpu/drm/i915/i915_irq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ static inline void pmu_irq_stats(struct drm_i915_private *i915,
WRITE_ONCE(i915->pmu.irq_count, i915->pmu.irq_count + 1);
}

void gen3_irq_reset(struct intel_uncore *uncore, struct i915_irq_regs regs)
void gen2_irq_reset(struct intel_uncore *uncore, struct i915_irq_regs regs)
{
intel_uncore_write(uncore, regs.imr, 0xffffffff);
intel_uncore_posting_read(uncore, regs.imr);
Expand All @@ -94,7 +94,7 @@ void gen3_irq_reset(struct intel_uncore *uncore, struct i915_irq_regs regs)
/*
* We should clear IMR at preinstall/uninstall, and just check at postinstall.
*/
void gen3_assert_iir_is_zero(struct intel_uncore *uncore, i915_reg_t reg)
void gen2_assert_iir_is_zero(struct intel_uncore *uncore, i915_reg_t reg)
{
u32 val = intel_uncore_read(uncore, reg);

Expand All @@ -110,10 +110,10 @@ void gen3_assert_iir_is_zero(struct intel_uncore *uncore, i915_reg_t reg)
intel_uncore_posting_read(uncore, reg);
}

void gen3_irq_init(struct intel_uncore *uncore, struct i915_irq_regs regs,
void gen2_irq_init(struct intel_uncore *uncore, struct i915_irq_regs regs,
u32 imr_val, u32 ier_val)
{
gen3_assert_iir_is_zero(uncore, regs.iir);
gen2_assert_iir_is_zero(uncore, regs.iir);

intel_uncore_write(uncore, regs.ier, ier_val);
intel_uncore_write(uncore, regs.imr, imr_val);
Expand Down Expand Up @@ -622,7 +622,7 @@ static void ibx_irq_reset(struct drm_i915_private *dev_priv)
if (HAS_PCH_NOP(dev_priv))
return;

gen3_irq_reset(uncore, SDE_IRQ_REGS);
gen2_irq_reset(uncore, SDE_IRQ_REGS);

if (HAS_PCH_CPT(dev_priv) || HAS_PCH_LPT(dev_priv))
intel_uncore_write(&dev_priv->uncore, SERR_INT, 0xffffffff);
Expand All @@ -634,7 +634,7 @@ static void ilk_irq_reset(struct drm_i915_private *dev_priv)
{
struct intel_uncore *uncore = &dev_priv->uncore;

gen3_irq_reset(uncore, DE_IRQ_REGS);
gen2_irq_reset(uncore, DE_IRQ_REGS);
dev_priv->irq_mask = ~0u;

if (GRAPHICS_VER(dev_priv) == 7)
Expand Down Expand Up @@ -671,7 +671,7 @@ static void gen8_irq_reset(struct drm_i915_private *dev_priv)

gen8_gt_irq_reset(to_gt(dev_priv));
gen8_display_irq_reset(dev_priv);
gen3_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);

if (HAS_PCH_SPLIT(dev_priv))
ibx_irq_reset(dev_priv);
Expand All @@ -688,8 +688,8 @@ static void gen11_irq_reset(struct drm_i915_private *dev_priv)
gen11_gt_irq_reset(gt);
gen11_display_irq_reset(dev_priv);

gen3_irq_reset(uncore, GEN11_GU_MISC_IRQ_REGS);
gen3_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
gen2_irq_reset(uncore, GEN11_GU_MISC_IRQ_REGS);
gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
}

static void dg1_irq_reset(struct drm_i915_private *dev_priv)
Expand All @@ -705,8 +705,8 @@ static void dg1_irq_reset(struct drm_i915_private *dev_priv)

gen11_display_irq_reset(dev_priv);

gen3_irq_reset(uncore, GEN11_GU_MISC_IRQ_REGS);
gen3_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
gen2_irq_reset(uncore, GEN11_GU_MISC_IRQ_REGS);
gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);

intel_uncore_write(uncore, GEN11_GFX_MSTR_IRQ, ~0);
}
Expand All @@ -720,7 +720,7 @@ static void cherryview_irq_reset(struct drm_i915_private *dev_priv)

gen8_gt_irq_reset(to_gt(dev_priv));

gen3_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);

spin_lock_irq(&dev_priv->irq_lock);
if (dev_priv->display.irq.display_irqs_enabled)
Expand Down Expand Up @@ -765,7 +765,7 @@ static void gen11_irq_postinstall(struct drm_i915_private *dev_priv)
gen11_gt_irq_postinstall(gt);
gen11_de_irq_postinstall(dev_priv);

gen3_irq_init(uncore, GEN11_GU_MISC_IRQ_REGS, ~gu_misc_masked, gu_misc_masked);
gen2_irq_init(uncore, GEN11_GU_MISC_IRQ_REGS, ~gu_misc_masked, gu_misc_masked);

gen11_master_intr_enable(intel_uncore_regs(uncore));
intel_uncore_posting_read(&dev_priv->uncore, GEN11_GFX_MSTR_IRQ);
Expand All @@ -781,7 +781,7 @@ static void dg1_irq_postinstall(struct drm_i915_private *dev_priv)
for_each_gt(gt, dev_priv, i)
gen11_gt_irq_postinstall(gt);

gen3_irq_init(uncore, GEN11_GU_MISC_IRQ_REGS, ~gu_misc_masked, gu_misc_masked);
gen2_irq_init(uncore, GEN11_GU_MISC_IRQ_REGS, ~gu_misc_masked, gu_misc_masked);

dg1_de_irq_postinstall(dev_priv);

Expand Down Expand Up @@ -869,7 +869,7 @@ static void i915_irq_reset(struct drm_i915_private *dev_priv)

i9xx_display_irq_reset(dev_priv);

gen3_irq_reset(uncore, GEN2_IRQ_REGS);
gen2_irq_reset(uncore, GEN2_IRQ_REGS);
dev_priv->irq_mask = ~0u;
}

Expand Down Expand Up @@ -901,7 +901,7 @@ static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
enable_mask |= I915_DISPLAY_PORT_INTERRUPT;
}

gen3_irq_init(uncore, GEN2_IRQ_REGS, dev_priv->irq_mask, enable_mask);
gen2_irq_init(uncore, GEN2_IRQ_REGS, dev_priv->irq_mask, enable_mask);

/* Interrupt setup is already guaranteed to be single-threaded, this is
* just to make the assert_spin_locked check happy. */
Expand Down Expand Up @@ -974,7 +974,7 @@ static void i965_irq_reset(struct drm_i915_private *dev_priv)

i9xx_display_irq_reset(dev_priv);

gen3_irq_reset(uncore, GEN2_IRQ_REGS);
gen2_irq_reset(uncore, GEN2_IRQ_REGS);
dev_priv->irq_mask = ~0u;
}

Expand Down Expand Up @@ -1022,7 +1022,7 @@ static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
if (IS_G4X(dev_priv))
enable_mask |= I915_BSD_USER_INTERRUPT;

gen3_irq_init(uncore, GEN2_IRQ_REGS, dev_priv->irq_mask, enable_mask);
gen2_irq_init(uncore, GEN2_IRQ_REGS, dev_priv->irq_mask, enable_mask);

/* Interrupt setup is already guaranteed to be single-threaded, this is
* just to make the assert_spin_locked check happy. */
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/i915/i915_irq.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ bool intel_irqs_enabled(struct drm_i915_private *dev_priv);
void intel_synchronize_irq(struct drm_i915_private *i915);
void intel_synchronize_hardirq(struct drm_i915_private *i915);

void gen3_assert_iir_is_zero(struct intel_uncore *uncore, i915_reg_t reg);
void gen2_assert_iir_is_zero(struct intel_uncore *uncore, i915_reg_t reg);

void gen3_irq_reset(struct intel_uncore *uncore, struct i915_irq_regs regs);
void gen2_irq_reset(struct intel_uncore *uncore, struct i915_irq_regs regs);

void gen3_irq_init(struct intel_uncore *uncore, struct i915_irq_regs regs,
void gen2_irq_init(struct intel_uncore *uncore, struct i915_irq_regs regs,
u32 imr_val, u32 ier_val);

#endif /* __I915_IRQ_H__ */
Loading

0 comments on commit 750a954

Please sign in to comment.