[Intel-gfx] [PATCH 10/10] drm/i915: remove "unclaimed register" checks from I915_WRITE

[Paulo Zanoni]

From: Paulo Zanoni <paulo.r.zanoni at intel.com>

Some developers don't really like this code polluting I915_WRITE, and
we've never really measured its negative impacts. So now that we
properly print ERR_INT interrupts, let's remove the I915_WRITE code
and promote the interrupt error message to DRM_ERROR.

The downside of this change is that we lose the ability to check the
register and print nice backtraces, but at this point most of the
errors have already been fixed and we're investigating the few
remaining cases.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c |    8 --------
 drivers/gpu/drm/i915/i915_irq.c |    2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7935606..0fe9711 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1260,10 +1260,6 @@ void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val) { \
 	} \
 	if (IS_GEN5(dev_priv->dev)) \
 		ilk_dummy_write(dev_priv); \
-	if (IS_HASWELL(dev_priv->dev) && (I915_READ_NOTRACE(GEN7_ERR_INT) & ERR_INT_MMIO_UNCLAIMED)) { \
-		DRM_ERROR("Unknown unclaimed register before writing to %x\n", reg); \
-		I915_WRITE_NOTRACE(GEN7_ERR_INT, ERR_INT_MMIO_UNCLAIMED); \
-	} \
 	if (IS_VALLEYVIEW(dev_priv->dev) && IS_DISPLAYREG(reg)) { \
 		write##y(val, dev_priv->regs + reg + 0x180000);		\
 	} else {							\
@@ -1272,10 +1268,6 @@ void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val) { \
 	if (unlikely(__fifo_ret)) { \
 		gen6_gt_check_fifodbg(dev_priv); \
 	} \
-	if (IS_HASWELL(dev_priv->dev) && (I915_READ_NOTRACE(GEN7_ERR_INT) & ERR_INT_MMIO_UNCLAIMED)) { \
-		DRM_ERROR("Unclaimed write to %x\n", reg); \
-		writel(ERR_INT_MMIO_UNCLAIMED, dev_priv->regs + GEN7_ERR_INT);	\
-	} \
 }
 __i915_write(8, b)
 __i915_write(16, w)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 2f17b54..f0c53d7 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -740,7 +740,7 @@ static void ivb_err_int_handler(struct drm_device *dev)
 		DRM_DEBUG_KMS("Pipe A FIFO underrun\n");
 
 	if (IS_HASWELL(dev) && (err_int & ERR_INT_MMIO_UNCLAIMED))
-		DRM_DEBUG_KMS("MMIO cycle not claimed\n");
+		DRM_ERROR("MMIO cycle not claimed\n");
 
 	I915_WRITE(GEN7_ERR_INT, err_int);
 }
-- 
1.7.10.4