|
@@ -301,8 +301,10 @@ static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector)
|
|
|
|
|
|
I915_WRITE(crt->adpa_reg, adpa);
|
|
I915_WRITE(crt->adpa_reg, adpa);
|
|
|
|
|
|
- if (wait_for((I915_READ(crt->adpa_reg) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) == 0,
|
|
|
|
- 1000))
|
|
|
|
|
|
+ if (intel_wait_for_register(dev_priv,
|
|
|
|
+ crt->adpa_reg,
|
|
|
|
+ ADPA_CRT_HOTPLUG_FORCE_TRIGGER, 0,
|
|
|
|
+ 1000))
|
|
DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER");
|
|
DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER");
|
|
|
|
|
|
if (turn_off_dac) {
|
|
if (turn_off_dac) {
|