admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915/irq: rename irq_mask to gen2_imr_mask

Browse Source 
Rename the struct drm_i915_private irq_mask member to gen2_imr_mask to
reflect its usage more accurately.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/2c193663cd3ae524d8159b4216e45462017042fa.1758198300.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula
2025-09-18 15:25:46 +03:00
parent f2c6777dd9
commit cb4242e34f
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/gt/gen2_engine_cs.c
View File

@@ -292,15 +292,15 @@ int gen4_emit_bb_start(struct i915_request *rq,
void gen2_irq_enable(struct intel_engine_cs *engine) void gen2_irq_enable(struct intel_engine_cs *engine)
{ {
engine->i915->irq_mask &= ~engine->irq_enable_mask; engine->i915->gen2_imr_mask &= ~engine->irq_enable_mask;
intel_uncore_write(engine->uncore, GEN2_IMR, engine->i915->irq_mask); intel_uncore_write(engine->uncore, GEN2_IMR, engine->i915->gen2_imr_mask);
intel_uncore_posting_read_fw(engine->uncore, GEN2_IMR); intel_uncore_posting_read_fw(engine->uncore, GEN2_IMR);
} }
void gen2_irq_disable(struct intel_engine_cs *engine) void gen2_irq_disable(struct intel_engine_cs *engine)
{ {
engine->i915->irq_mask |= engine->irq_enable_mask; engine->i915->gen2_imr_mask |= engine->irq_enable_mask;
intel_uncore_write(engine->uncore, GEN2_IMR, engine->i915->irq_mask); intel_uncore_write(engine->uncore, GEN2_IMR, engine->i915->gen2_imr_mask);
} }
void gen5_irq_enable(struct intel_engine_cs *engine) void gen5_irq_enable(struct intel_engine_cs *engine)

4
drivers/gpu/drm/i915/i915_drv.h
View File

@@ -234,8 +234,8 @@ struct drm_i915_private {
/* Sideband mailbox protection */ /* Sideband mailbox protection */
struct mutex sb_lock; struct mutex sb_lock;
/** Cached value of IMR to avoid reads in updating the bitfield */ /* Cached value of gen 2-4 IMR to avoid reads in updating the bitfield */
u32 irq_mask; u32 gen2_imr_mask;
bool preserve_bios_swizzle; bool preserve_bios_swizzle;

16
drivers/gpu/drm/i915/i915_irq.c
View File

@@ -897,7 +897,7 @@ static void i915_irq_reset(struct drm_i915_private *dev_priv)
gen2_error_reset(uncore, GEN2_ERROR_REGS); gen2_error_reset(uncore, GEN2_ERROR_REGS);
gen2_irq_reset(uncore, GEN2_IRQ_REGS); gen2_irq_reset(uncore, GEN2_IRQ_REGS);
dev_priv->irq_mask = ~0u; dev_priv->gen2_imr_mask = ~0u;
} }
static void i915_irq_postinstall(struct drm_i915_private *dev_priv) static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
@@ -908,7 +908,7 @@ static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
gen2_error_init(uncore, GEN2_ERROR_REGS, ~i9xx_error_mask(dev_priv)); gen2_error_init(uncore, GEN2_ERROR_REGS, ~i9xx_error_mask(dev_priv));
dev_priv->irq_mask = dev_priv->gen2_imr_mask =
~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
I915_MASTER_ERROR_INTERRUPT); I915_MASTER_ERROR_INTERRUPT);
@@ -920,16 +920,16 @@ static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
I915_USER_INTERRUPT; I915_USER_INTERRUPT;
if (DISPLAY_VER(display) >= 3) { if (DISPLAY_VER(display) >= 3) {
dev_priv->irq_mask &= ~I915_ASLE_INTERRUPT; dev_priv->gen2_imr_mask &= ~I915_ASLE_INTERRUPT;
enable_mask |= I915_ASLE_INTERRUPT; enable_mask |= I915_ASLE_INTERRUPT;
} }
if (HAS_HOTPLUG(display)) { if (HAS_HOTPLUG(display)) {
dev_priv->irq_mask &= ~I915_DISPLAY_PORT_INTERRUPT; dev_priv->gen2_imr_mask &= ~I915_DISPLAY_PORT_INTERRUPT;
enable_mask |= I915_DISPLAY_PORT_INTERRUPT; enable_mask |= I915_DISPLAY_PORT_INTERRUPT;
} }
gen2_irq_init(uncore, GEN2_IRQ_REGS, dev_priv->irq_mask, enable_mask); gen2_irq_init(uncore, GEN2_IRQ_REGS, dev_priv->gen2_imr_mask, enable_mask);
i915_display_irq_postinstall(display); i915_display_irq_postinstall(display);
} }
@@ -999,7 +999,7 @@ static void i965_irq_reset(struct drm_i915_private *dev_priv)
gen2_error_reset(uncore, GEN2_ERROR_REGS); gen2_error_reset(uncore, GEN2_ERROR_REGS);
gen2_irq_reset(uncore, GEN2_IRQ_REGS); gen2_irq_reset(uncore, GEN2_IRQ_REGS);
dev_priv->irq_mask = ~0u; dev_priv->gen2_imr_mask = ~0u;
} }
static u32 i965_error_mask(struct drm_i915_private *i915) static u32 i965_error_mask(struct drm_i915_private *i915)
@@ -1029,7 +1029,7 @@ static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
gen2_error_init(uncore, GEN2_ERROR_REGS, ~i965_error_mask(dev_priv)); gen2_error_init(uncore, GEN2_ERROR_REGS, ~i965_error_mask(dev_priv));
dev_priv->irq_mask = dev_priv->gen2_imr_mask =
~(I915_ASLE_INTERRUPT | ~(I915_ASLE_INTERRUPT |
I915_DISPLAY_PORT_INTERRUPT | I915_DISPLAY_PORT_INTERRUPT |
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
@@ -1047,7 +1047,7 @@ static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
if (IS_G4X(dev_priv)) if (IS_G4X(dev_priv))
enable_mask |= I915_BSD_USER_INTERRUPT; enable_mask |= I915_BSD_USER_INTERRUPT;
gen2_irq_init(uncore, GEN2_IRQ_REGS, dev_priv->irq_mask, enable_mask); gen2_irq_init(uncore, GEN2_IRQ_REGS, dev_priv->gen2_imr_mask, enable_mask);
i965_display_irq_postinstall(display); i965_display_irq_postinstall(display);
} }