[Intel-gfx] [PATCH v7 1/4] drm/i915/bdw+: Move misc display IRQ handling to it own function

[Lucas De Marchi]

On Tue, Jul 30, 2019 at 03:47:50PM -0700, Jose Souza wrote:
>Just moving it to reduce the tabs and avoid break code lines.
>No behavior changes intended here.
>
>v2:
>- Reading misc display IRQ outside of gen8_de_misc_irq_handler() as
>other irq handlers (Dhinakaran)
>
>Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>
>Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>
>Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
>Signed-off-by: José Roberto de Souza <jose.souza at intel.com>

Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

Lucas De Marchi

>---
> drivers/gpu/drm/i915/i915_irq.c | 45 ++++++++++++++++++---------------
> 1 file changed, 25 insertions(+), 20 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index fbe13bacd5b7..f54744644280 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -2982,6 +2982,28 @@ static u32 gen8_de_pipe_fault_mask(struct drm_i915_private *dev_priv)
> 		return GEN8_DE_PIPE_IRQ_FAULT_ERRORS;
> }
>
>+static void
>+gen8_de_misc_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
>+{
>+	bool found = false;
>+
>+	if (iir & GEN8_DE_MISC_GSE) {
>+		intel_opregion_asle_intr(dev_priv);
>+		found = true;
>+	}
>+
>+	if (iir & GEN8_DE_EDP_PSR) {
>+		u32 psr_iir = I915_READ(EDP_PSR_IIR);
>+
>+		intel_psr_irq_handler(dev_priv, psr_iir);
>+		I915_WRITE(EDP_PSR_IIR, psr_iir);
>+		found = true;
>+	}
>+
>+	if (!found)
>+		DRM_ERROR("Unexpected DE Misc interrupt\n");
>+}
>+
> static irqreturn_t
> gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
> {
>@@ -2992,29 +3014,12 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
> 	if (master_ctl & GEN8_DE_MISC_IRQ) {
> 		iir = I915_READ(GEN8_DE_MISC_IIR);
> 		if (iir) {
>-			bool found = false;
>-
> 			I915_WRITE(GEN8_DE_MISC_IIR, iir);
> 			ret = IRQ_HANDLED;
>-
>-			if (iir & GEN8_DE_MISC_GSE) {
>-				intel_opregion_asle_intr(dev_priv);
>-				found = true;
>-			}
>-
>-			if (iir & GEN8_DE_EDP_PSR) {
>-				u32 psr_iir = I915_READ(EDP_PSR_IIR);
>-
>-				intel_psr_irq_handler(dev_priv, psr_iir);
>-				I915_WRITE(EDP_PSR_IIR, psr_iir);
>-				found = true;
>-			}
>-
>-			if (!found)
>-				DRM_ERROR("Unexpected DE Misc interrupt\n");
>-		}
>-		else
>+			gen8_de_misc_irq_handler(dev_priv, iir);
>+		} else {
> 			DRM_ERROR("The master control interrupt lied (DE MISC)!\n");
>+		}
> 	}
>
> 	if (INTEL_GEN(dev_priv) >= 11 && (master_ctl & GEN11_DE_HPD_IRQ)) {
>-- 
>2.22.0
>
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx at lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx