|
@@ -64,7 +64,9 @@ static int vlv_sideband_rw(struct drm_i915_private *dev_priv, u32 devfn,
|
|
I915_WRITE(VLV_IOSF_DATA, *val);
|
|
I915_WRITE(VLV_IOSF_DATA, *val);
|
|
I915_WRITE(VLV_IOSF_DOORBELL_REQ, cmd);
|
|
I915_WRITE(VLV_IOSF_DOORBELL_REQ, cmd);
|
|
|
|
|
|
- if (wait_for((I915_READ(VLV_IOSF_DOORBELL_REQ) & IOSF_SB_BUSY) == 0, 5)) {
|
|
|
|
|
|
+ if (intel_wait_for_register(dev_priv,
|
|
|
|
+ VLV_IOSF_DOORBELL_REQ, IOSF_SB_BUSY, 0,
|
|
|
|
+ 5)) {
|
|
DRM_DEBUG_DRIVER("IOSF sideband finish wait (%s) timed out\n",
|
|
DRM_DEBUG_DRIVER("IOSF sideband finish wait (%s) timed out\n",
|
|
is_read ? "read" : "write");
|
|
is_read ? "read" : "write");
|
|
return -ETIMEDOUT;
|
|
return -ETIMEDOUT;
|