mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson
synced 2025-09-02 16:44:59 +00:00
drm/i915/display: remove small micro-optimizations in irq handling
The raw register reads/writes are there as micro-optimizations to avoid multiple pointer indirections on uncore->regs. Presumably this is useful when there are plenty of register reads/writes in the same function. However, the display irq handling only has a few raw reads/writes. Remove them for simplification. Reviewed-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240408125445.3227678-1-jani.nikula@intel.com
This commit is contained in:
parent
35dba4834b
commit
8d9908e8fe
@ -1231,15 +1231,14 @@ void gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
|
||||
|
||||
u32 gen11_gu_misc_irq_ack(struct drm_i915_private *i915, const u32 master_ctl)
|
||||
{
|
||||
void __iomem * const regs = intel_uncore_regs(&i915->uncore);
|
||||
u32 iir;
|
||||
|
||||
if (!(master_ctl & GEN11_GU_MISC_IRQ))
|
||||
return 0;
|
||||
|
||||
iir = raw_reg_read(regs, GEN11_GU_MISC_IIR);
|
||||
iir = intel_de_read(i915, GEN11_GU_MISC_IIR);
|
||||
if (likely(iir))
|
||||
raw_reg_write(regs, GEN11_GU_MISC_IIR, iir);
|
||||
intel_de_write(i915, GEN11_GU_MISC_IIR, iir);
|
||||
|
||||
return iir;
|
||||
}
|
||||
@ -1254,18 +1253,18 @@ void gen11_gu_misc_irq_handler(struct drm_i915_private *i915, const u32 iir)
|
||||
|
||||
void gen11_display_irq_handler(struct drm_i915_private *i915)
|
||||
{
|
||||
void __iomem * const regs = intel_uncore_regs(&i915->uncore);
|
||||
const u32 disp_ctl = raw_reg_read(regs, GEN11_DISPLAY_INT_CTL);
|
||||
u32 disp_ctl;
|
||||
|
||||
disable_rpm_wakeref_asserts(&i915->runtime_pm);
|
||||
/*
|
||||
* GEN11_DISPLAY_INT_CTL has same format as GEN8_MASTER_IRQ
|
||||
* for the display related bits.
|
||||
*/
|
||||
raw_reg_write(regs, GEN11_DISPLAY_INT_CTL, 0x0);
|
||||
disp_ctl = intel_de_read(i915, GEN11_DISPLAY_INT_CTL);
|
||||
|
||||
intel_de_write(i915, GEN11_DISPLAY_INT_CTL, 0);
|
||||
gen8_de_irq_handler(i915, disp_ctl);
|
||||
raw_reg_write(regs, GEN11_DISPLAY_INT_CTL,
|
||||
GEN11_DISPLAY_IRQ_ENABLE);
|
||||
intel_de_write(i915, GEN11_DISPLAY_INT_CTL, GEN11_DISPLAY_IRQ_ENABLE);
|
||||
|
||||
enable_rpm_wakeref_asserts(&i915->runtime_pm);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user