Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bd0a25d authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Mika Kuoppala
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1450189512-30360-5-git-send-email-mika.kuoppala@intel.com
parent 75714940

drivers/gpu/drm/i915/intel_uncore.c

+9 −9
Original line number Diff line number Diff line
@@ -604,20 +604,20 @@ 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) \

	u##x val = 0; \