[PATCH] Revert "drm/i915: Distinguish between timeout and error in sideband transactions"

[Martin Peres]

This reverts commit b0734f77b3d1ae00603bf478611662d5bf6c9b54.
---
 drivers/gpu/drm/i915/intel_sideband.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_sideband.c b/drivers/gpu/drm/i915/intel_sideband.c
index 7d971cb56116..9f782b5eb6e6 100644
--- a/drivers/gpu/drm/i915/intel_sideband.c
+++ b/drivers/gpu/drm/i915/intel_sideband.c
@@ -216,7 +216,6 @@ u32 intel_sbi_read(struct drm_i915_private *dev_priv, u16 reg,
 	}
 
 	I915_WRITE(SBI_ADDR, (reg << 16));
-	I915_WRITE(SBI_DATA, 0);
 
 	if (destination == SBI_ICLK)
 		value = SBI_CTL_DEST_ICLK | SBI_CTL_OP_CRRD;
@@ -226,15 +225,10 @@ u32 intel_sbi_read(struct drm_i915_private *dev_priv, u16 reg,
 
 	if (intel_wait_for_register(dev_priv,
 				    SBI_CTL_STAT,
-				    SBI_BUSY,
+				    SBI_BUSY | SBI_RESPONSE_FAIL,
 				    0,
 				    100)) {
-		DRM_ERROR("timeout waiting for SBI to complete read\n");
-		return 0;
-	}
-
-	if (I915_READ(SBI_CTL_STAT) & SBI_RESPONSE_FAIL) {
-		DRM_ERROR("error during SBI read of reg %x\n", reg);
+		DRM_ERROR("timeout waiting for SBI to complete read transaction\n");
 		return 0;
 	}
 
@@ -266,16 +260,10 @@ void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value,
 
 	if (intel_wait_for_register(dev_priv,
 				    SBI_CTL_STAT,
-				    SBI_BUSY,
+				    SBI_BUSY | SBI_RESPONSE_FAIL,
 				    0,
 				    100)) {
-		DRM_ERROR("timeout waiting for SBI to complete write\n");
-		return;
-	}
-
-	if (I915_READ(SBI_CTL_STAT) & SBI_RESPONSE_FAIL) {
-		DRM_ERROR("error during SBI write of %x to reg %x\n",
-			  value, reg);
+		DRM_ERROR("timeout waiting for SBI to complete write transaction\n");
 		return;
 	}
 }
-- 
2.11.1