drm/i915: Streamline unclaimed reg debug trace

Remove char* assignments and add branching hint and
also constify the parameters.

This results in a 35 bytes shorter fast path, so author
boldly assumes it helps without doing in-depth assembly
analysis.

v2: use WARN's branching (Chris), commit name (Joonas)

Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1450189512-30360-5-git-send-email-mika.kuoppala@intel.com

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index c7af339a63661524872a2b6bcabddc221401e5af..bd0933cefe5d7a6084f9e8c61dbf2a8f553ad02d 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -604,19 +604,19 @@ ilk_dummy_write(struct drm_i915_private *dev_priv)
 
 static void
 hsw_unclaimed_reg_debug(struct drm_i915_private *dev_priv,
-                       i915_reg_t reg, bool read, bool before)
+                       const i915_reg_t reg,
+                       const bool read,
+                       const bool before)
 {
-       const char *op = read ? "reading" : "writing to";
-       const char *when = before ? "before" : "after";
-
-       if (!i915.mmio_debug)
+       if (likely(!i915.mmio_debug))
                return;
 
-       if (check_for_unclaimed_mmio(dev_priv)) {
-               WARN(1, "Unclaimed register detected %s %s register 0x%x\n",
-                    when, op, i915_mmio_reg_offset(reg));
+       if (WARN(check_for_unclaimed_mmio(dev_priv),
+                "Unclaimed register detected %s %s register 0x%x\n",
+                before ? "before" : "after",
+                read ? "reading" : "writing to",
+                i915_mmio_reg_offset(reg)))
                i915.mmio_debug--; /* Only report the first N failures */
-       }
 }
 
 #define GEN2_READ_HEADER(x) \