From e982f3a82c08e5102c114295df8e3da4b3bec6a2 Mon Sep 17 00:00:00 2001 From: Mika Kuoppala Date: Mon, 4 Aug 2014 11:45:09 +0300 Subject: [PATCH 1/2] drm/i915: move string assignments out of fast path instead of trusting the compiler. Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/intel_uncore.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index e81bc3b..54ecf1b 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -517,13 +517,13 @@ static void hsw_unclaimed_reg_debug(struct drm_i915_private *dev_priv, u32 reg, bool read, bool before) { - const char *op = read ? "reading" : "writing to"; - const char *when = before ? "before" : "after"; - if (!i915.mmio_debug) return; if (__raw_i915_read32(dev_priv, FPGA_DBG) & FPGA_DBG_RM_NOCLAIM) { + const char *op = read ? "reading" : "writing to"; + const char *when = before ? "before" : "after"; + WARN(1, "Unclaimed register detected %s %s register 0x%x\n", when, op, reg); __raw_i915_write32(dev_priv, FPGA_DBG, FPGA_DBG_RM_NOCLAIM); -- 1.7.9.5