]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915: Clean up some comments in gmch irq code
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 27 Sep 2024 14:35:44 +0000 (17:35 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 1 Oct 2024 15:31:43 +0000 (18:31 +0300)
Clean up some comments in the gmch irq code:
- drop redundant comments
- s/iir/IIR/ to make it clear it's referring to the register

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240927143545.8665-4-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_irq.c

index ee7a2a49f08e58c5e3abab4548ba4e507067063e..fb8dbcfd8e87ae0a278839a8cda8d64d3dc8660a 100644 (file)
@@ -298,7 +298,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
                        hotplug_status = i9xx_hpd_irq_ack(dev_priv);
 
                /* Call regardless, as some status bits might not be
-                * signalled in iir */
+                * signalled in IIR */
                i9xx_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
                if (iir & (I915_LPE_PIPE_A_INTERRUPT |
@@ -380,7 +380,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
                        hotplug_status = i9xx_hpd_irq_ack(dev_priv);
 
                /* Call regardless, as some status bits might not be
-                * signalled in iir */
+                * signalled in IIR */
                i9xx_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
                if (iir & (I915_LPE_PIPE_A_INTERRUPT |
@@ -883,7 +883,6 @@ static void i8xx_irq_postinstall(struct drm_i915_private *dev_priv)
 
        intel_uncore_write16(uncore, EMR, i9xx_error_mask(dev_priv));
 
-       /* Unmask the interrupts that we always want on. */
        dev_priv->irq_mask =
                ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
                  I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
@@ -1009,7 +1008,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg)
                ret = IRQ_HANDLED;
 
                /* Call regardless, as some status bits might not be
-                * signalled in iir */
+                * signalled in IIR */
                i9xx_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
                if (iir & I915_MASTER_ERROR_INTERRUPT)
@@ -1050,7 +1049,6 @@ static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
 
        intel_uncore_write(uncore, EMR, i9xx_error_mask(dev_priv));
 
-       /* Unmask the interrupts that we always want on. */
        dev_priv->irq_mask =
                ~(I915_ASLE_INTERRUPT |
                  I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
@@ -1065,9 +1063,7 @@ static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
                I915_USER_INTERRUPT;
 
        if (I915_HAS_HOTPLUG(dev_priv)) {
-               /* and unmask in IMR */
                dev_priv->irq_mask &= ~I915_DISPLAY_PORT_INTERRUPT;
-               /* Enable in IER... */
                enable_mask |= I915_DISPLAY_PORT_INTERRUPT;
        }
 
@@ -1111,7 +1107,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
                        hotplug_status = i9xx_hpd_irq_ack(dev_priv);
 
                /* Call regardless, as some status bits might not be
-                * signalled in iir */
+                * signalled in IIR */
                i9xx_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
                if (iir & I915_MASTER_ERROR_INTERRUPT)
@@ -1174,7 +1170,6 @@ static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
 
        intel_uncore_write(uncore, EMR, i965_error_mask(dev_priv));
 
-       /* Unmask the interrupts that we always want on. */
        dev_priv->irq_mask =
                ~(I915_ASLE_INTERRUPT |
                  I915_DISPLAY_PORT_INTERRUPT |
@@ -1233,7 +1228,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
                        hotplug_status = i9xx_hpd_irq_ack(dev_priv);
 
                /* Call regardless, as some status bits might not be
-                * signalled in iir */
+                * signalled in IIR */
                i9xx_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
                if (iir & I915_MASTER_ERROR_INTERRUPT)