drm/i915: refactor the IRQ init/reset macros

The whole point of having macros here is for the token pasting
necessary to automatically have IMR, IIR and IER selected. We don't
really need or want all the inlining that happens as a consequence.
The good thing about the current code is that it works regardless of
the relative offsets between these registers (they change after gen4,
with the usual VLV/CHV exceptions).

One thing which we can do is to split the logic of what we do with
imr/ier/iir to functions separate from the macros that pick them.
That's what we do in this commit. This allows us to get rid of the
gen8 duplicates and also all the inlining:

add/remove: 2/0 grow/shrink: 0/21 up/down: 384/-5949 (-5565)
Function                                     old     new   delta
gen3_irq_reset                                 -     233    +233
gen3_irq_init                                  -     151    +151
i8xx_irq_postinstall                         459     442     -17
gen11_irq_postinstall                        804     744     -60
ironlake_irq_postinstall                     450     353     -97
vlv_display_irq_postinstall                  348     245    -103
i965_irq_postinstall                         378     272    -106
i915_irq_postinstall                         333     227    -106
gen8_irq_power_well_post_enable              374     240    -134
ironlake_irq_reset                           397     218    -179
vlv_display_irq_reset                        616     433    -183
i965_irq_reset                               374     180    -194
cherryview_irq_reset                         379     185    -194
i915_irq_reset                               407     209    -198
ibx_irq_reset                                332     133    -199
gen5_gt_irq_postinstall                      533     332    -201
gen8_irq_power_well_pre_disable              434     204    -230
gen8_gt_irq_postinstall                      469     196    -273
gen8_de_irq_postinstall                     1200     836    -364
gen5_gt_irq_reset                            471      76    -395
gen8_gt_irq_reset                            775      99    -676
gen8_irq_reset                              1100     333    -767
gen11_irq_reset                             1959     686   -1273
Total: Before=2259222, After=2253657, chg -0.25%

v2:
 - Make checkpatch happy with a temporary which_ (Checkpatch).
 - Reorder the arguments for the INIT macros (Ville).
 - Correctly explain when the register offsets change in the commit
   message (Ville).
 - Use more line breaks in the macro calls to make the arguments look
   a little more organized/readable.
 - Update the bloat-o-meter output (minor change only).

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> (v1)
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190410235344.31199-2-paulo.r.zanoni@intel.com

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index d934545445e11c02d1d7d6f686036766a026a565..e6bbcaf6e27cdec8e20284b30430611754c6def6 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -136,36 +136,48 @@ static const u32 hpd_icp[HPD_NUM_PINS] = {
        [HPD_PORT_F] = SDE_TC4_HOTPLUG_ICP
 };
 
-/* IIR can theoretically queue up two events. Be paranoid. */
-#define GEN8_IRQ_RESET_NDX(type, which) do { \
-       I915_WRITE(GEN8_##type##_IMR(which), 0xffffffff); \
-       POSTING_READ(GEN8_##type##_IMR(which)); \
-       I915_WRITE(GEN8_##type##_IER(which), 0); \
-       I915_WRITE(GEN8_##type##_IIR(which), 0xffffffff); \
-       POSTING_READ(GEN8_##type##_IIR(which)); \
-       I915_WRITE(GEN8_##type##_IIR(which), 0xffffffff); \
-       POSTING_READ(GEN8_##type##_IIR(which)); \
-} while (0)
-
-#define GEN3_IRQ_RESET(type) do { \
-       I915_WRITE(type##IMR, 0xffffffff); \
-       POSTING_READ(type##IMR); \
-       I915_WRITE(type##IER, 0); \
-       I915_WRITE(type##IIR, 0xffffffff); \
-       POSTING_READ(type##IIR); \
-       I915_WRITE(type##IIR, 0xffffffff); \
-       POSTING_READ(type##IIR); \
-} while (0)
-
-#define GEN2_IRQ_RESET(type) do { \
-       I915_WRITE16(type##IMR, 0xffff); \
-       POSTING_READ16(type##IMR); \
-       I915_WRITE16(type##IER, 0); \
-       I915_WRITE16(type##IIR, 0xffff); \
-       POSTING_READ16(type##IIR); \
-       I915_WRITE16(type##IIR, 0xffff); \
-       POSTING_READ16(type##IIR); \
-} while (0)
+static void gen3_irq_reset(struct drm_i915_private *dev_priv, i915_reg_t imr,
+                          i915_reg_t iir, i915_reg_t ier)
+{
+       I915_WRITE(imr, 0xffffffff);
+       POSTING_READ(imr);
+
+       I915_WRITE(ier, 0);
+
+       /* IIR can theoretically queue up two events. Be paranoid. */
+       I915_WRITE(iir, 0xffffffff);
+       POSTING_READ(iir);
+       I915_WRITE(iir, 0xffffffff);
+       POSTING_READ(iir);
+}
+
+static void gen2_irq_reset(struct drm_i915_private *dev_priv, i915_reg_t imr,
+                          i915_reg_t iir, i915_reg_t ier)
+{
+       I915_WRITE16(imr, 0xffff);
+       POSTING_READ16(imr);
+
+       I915_WRITE16(ier, 0);
+
+       /* IIR can theoretically queue up two events. Be paranoid. */
+       I915_WRITE16(iir, 0xffff);
+       POSTING_READ16(iir);
+       I915_WRITE16(iir, 0xffff);
+       POSTING_READ16(iir);
+}
+
+#define GEN8_IRQ_RESET_NDX(type, which) \
+({ \
+       unsigned int which_ = which; \
+       gen3_irq_reset(dev_priv, GEN8_##type##_IMR(which_), \
+                      GEN8_##type##_IIR(which_), GEN8_##type##_IER(which_)); \
+})
+
+#define GEN3_IRQ_RESET(type) \
+       gen3_irq_reset(dev_priv, type##IMR, type##IIR, type##IER)
+
+#define GEN2_IRQ_RESET(type) \
+       gen2_irq_reset(dev_priv, type##IMR, type##IIR, type##IER)
 
 /*
  * We should clear IMR at preinstall/uninstall, and just check at postinstall.
@@ -202,26 +214,50 @@ static void gen2_assert_iir_is_zero(struct drm_i915_private *dev_priv,
        POSTING_READ16(reg);
 }
 
-#define GEN8_IRQ_INIT_NDX(type, which, imr_val, ier_val) do { \
-       gen3_assert_iir_is_zero(dev_priv, GEN8_##type##_IIR(which)); \
-       I915_WRITE(GEN8_##type##_IER(which), (ier_val)); \
-       I915_WRITE(GEN8_##type##_IMR(which), (imr_val)); \
-       POSTING_READ(GEN8_##type##_IMR(which)); \
-} while (0)
-
-#define GEN3_IRQ_INIT(type, imr_val, ier_val) do { \
-       gen3_assert_iir_is_zero(dev_priv, type##IIR); \
-       I915_WRITE(type##IER, (ier_val)); \
-       I915_WRITE(type##IMR, (imr_val)); \
-       POSTING_READ(type##IMR); \
-} while (0)
-
-#define GEN2_IRQ_INIT(type, imr_val, ier_val) do { \
-       gen2_assert_iir_is_zero(dev_priv, type##IIR); \
-       I915_WRITE16(type##IER, (ier_val)); \
-       I915_WRITE16(type##IMR, (imr_val)); \
-       POSTING_READ16(type##IMR); \
-} while (0)
+static void gen3_irq_init(struct drm_i915_private *dev_priv,
+                         i915_reg_t imr, u32 imr_val,
+                         i915_reg_t ier, u32 ier_val,
+                         i915_reg_t iir)
+{
+       gen3_assert_iir_is_zero(dev_priv, iir);
+
+       I915_WRITE(ier, ier_val);
+       I915_WRITE(imr, imr_val);
+       POSTING_READ(imr);
+}
+
+static void gen2_irq_init(struct drm_i915_private *dev_priv,
+                         i915_reg_t imr, u32 imr_val,
+                         i915_reg_t ier, u32 ier_val,
+                         i915_reg_t iir)
+{
+       gen2_assert_iir_is_zero(dev_priv, iir);
+
+       I915_WRITE16(ier, ier_val);
+       I915_WRITE16(imr, imr_val);
+       POSTING_READ16(imr);
+}
+
+#define GEN8_IRQ_INIT_NDX(type, which, imr_val, ier_val) \
+({ \
+       unsigned int which_ = which; \
+       gen3_irq_init(dev_priv, \
+                     GEN8_##type##_IMR(which_), imr_val, \
+                     GEN8_##type##_IER(which_), ier_val, \
+                     GEN8_##type##_IIR(which_)); \
+})
+
+#define GEN3_IRQ_INIT(type, imr_val, ier_val) \
+       gen3_irq_init(dev_priv, \
+                     type##IMR, imr_val, \
+                     type##IER, ier_val, \
+                     type##IIR)
+
+#define GEN2_IRQ_INIT(type, imr_val, ier_val) \
+       gen2_irq_init(dev_priv, \
+                     type##IMR, imr_val, \
+                     type##IER, ier_val, \
+                     type##IIR)
 
 static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir);
 static void gen9_guc_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir);