drm/i915: Convert the register access tracepoint to be conditional

[~andy/linux] / drivers / gpu / drm / i915 / intel_uncore.c

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 89bb9da377fc24ab788a190d97aa89b08f677379..8f5bc869c02373402ce5c3d03197137adaee75e8 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -359,7 +359,7 @@ u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg, bool trace) { \
                val = __raw_i915_read##x(dev_priv, reg); \
        } \
        spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); \
-       if (trace) trace_i915_reg_rw(false, reg, val, sizeof(val)); \
+       trace_i915_reg_rw(false, reg, val, sizeof(val), trace); \
        return val; \
 }
 
@@ -373,7 +373,7 @@ __i915_read(64)
 void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val, bool trace) { \
        unsigned long irqflags; \
        u32 __fifo_ret = 0; \
-       if (trace) trace_i915_reg_rw(true, reg, val, sizeof(val)); \
+       trace_i915_reg_rw(true, reg, val, sizeof(val), trace); \
        spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); \
        if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \
                __fifo_ret = __gen6_gt_wait_for_fifo(dev_priv); \