Commit 08d8f430 authored by Jani Nikula's avatar Jani Nikula

drm/i915/irq: convert gen8_de_irq_handler() to void

The return value is not used for anything.
Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230515101738.2399816-1-jani.nikula@intel.com
parent 6b9bd7c3
...@@ -2124,10 +2124,8 @@ static void gen8_read_and_ack_pch_irqs(struct drm_i915_private *i915, u32 *pch_i ...@@ -2124,10 +2124,8 @@ static void gen8_read_and_ack_pch_irqs(struct drm_i915_private *i915, u32 *pch_i
intel_de_write(i915, PICAINTERRUPT_IER, pica_ier); intel_de_write(i915, PICAINTERRUPT_IER, pica_ier);
} }
static irqreturn_t static void gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
{ {
irqreturn_t ret = IRQ_NONE;
u32 iir; u32 iir;
enum pipe pipe; enum pipe pipe;
...@@ -2137,7 +2135,6 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) ...@@ -2137,7 +2135,6 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
iir = intel_uncore_read(&dev_priv->uncore, GEN8_DE_MISC_IIR); iir = intel_uncore_read(&dev_priv->uncore, GEN8_DE_MISC_IIR);
if (iir) { if (iir) {
intel_uncore_write(&dev_priv->uncore, GEN8_DE_MISC_IIR, iir); intel_uncore_write(&dev_priv->uncore, GEN8_DE_MISC_IIR, iir);
ret = IRQ_HANDLED;
gen8_de_misc_irq_handler(dev_priv, iir); gen8_de_misc_irq_handler(dev_priv, iir);
} else { } else {
drm_err_ratelimited(&dev_priv->drm, drm_err_ratelimited(&dev_priv->drm,
...@@ -2149,7 +2146,6 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) ...@@ -2149,7 +2146,6 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
iir = intel_uncore_read(&dev_priv->uncore, GEN11_DE_HPD_IIR); iir = intel_uncore_read(&dev_priv->uncore, GEN11_DE_HPD_IIR);
if (iir) { if (iir) {
intel_uncore_write(&dev_priv->uncore, GEN11_DE_HPD_IIR, iir); intel_uncore_write(&dev_priv->uncore, GEN11_DE_HPD_IIR, iir);
ret = IRQ_HANDLED;
gen11_hpd_irq_handler(dev_priv, iir); gen11_hpd_irq_handler(dev_priv, iir);
} else { } else {
drm_err_ratelimited(&dev_priv->drm, drm_err_ratelimited(&dev_priv->drm,
...@@ -2163,7 +2159,6 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) ...@@ -2163,7 +2159,6 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
bool found = false; bool found = false;
intel_uncore_write(&dev_priv->uncore, GEN8_DE_PORT_IIR, iir); intel_uncore_write(&dev_priv->uncore, GEN8_DE_PORT_IIR, iir);
ret = IRQ_HANDLED;
if (iir & gen8_de_port_aux_mask(dev_priv)) { if (iir & gen8_de_port_aux_mask(dev_priv)) {
intel_dp_aux_irq_handler(dev_priv); intel_dp_aux_irq_handler(dev_priv);
...@@ -2223,7 +2218,6 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) ...@@ -2223,7 +2218,6 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
continue; continue;
} }
ret = IRQ_HANDLED;
intel_uncore_write(&dev_priv->uncore, GEN8_DE_PIPE_IIR(pipe), iir); intel_uncore_write(&dev_priv->uncore, GEN8_DE_PIPE_IIR(pipe), iir);
if (iir & GEN8_PIPE_VBLANK) if (iir & GEN8_PIPE_VBLANK)
...@@ -2257,8 +2251,6 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) ...@@ -2257,8 +2251,6 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
*/ */
gen8_read_and_ack_pch_irqs(dev_priv, &iir, &pica_iir); gen8_read_and_ack_pch_irqs(dev_priv, &iir, &pica_iir);
if (iir) { if (iir) {
ret = IRQ_HANDLED;
if (pica_iir) if (pica_iir)
xelpdp_pica_irq_handler(dev_priv, pica_iir); xelpdp_pica_irq_handler(dev_priv, pica_iir);
...@@ -2277,8 +2269,6 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) ...@@ -2277,8 +2269,6 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
"The master control interrupt lied (SDE)!\n"); "The master control interrupt lied (SDE)!\n");
} }
} }
return ret;
} }
static inline u32 gen8_master_intr_disable(void __iomem * const regs) static inline u32 gen8_master_intr_disable(void __iomem * const regs)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment