diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 5c765bb0845d..093e914e8a41 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -1218,6 +1218,7 @@ static void intel_sdvo_dpms(struct drm_encoder *encoder, int mode) | |||
1218 | struct drm_device *dev = encoder->dev; | 1218 | struct drm_device *dev = encoder->dev; |
1219 | struct drm_i915_private *dev_priv = dev->dev_private; | 1219 | struct drm_i915_private *dev_priv = dev->dev_private; |
1220 | struct intel_sdvo *intel_sdvo = enc_to_intel_sdvo(encoder); | 1220 | struct intel_sdvo *intel_sdvo = enc_to_intel_sdvo(encoder); |
1221 | struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); | ||
1221 | u32 temp; | 1222 | u32 temp; |
1222 | 1223 | ||
1223 | if (mode != DRM_MODE_DPMS_ON) { | 1224 | if (mode != DRM_MODE_DPMS_ON) { |
@@ -1240,7 +1241,7 @@ static void intel_sdvo_dpms(struct drm_encoder *encoder, int mode) | |||
1240 | if ((temp & SDVO_ENABLE) == 0) | 1241 | if ((temp & SDVO_ENABLE) == 0) |
1241 | intel_sdvo_write_sdvox(intel_sdvo, temp | SDVO_ENABLE); | 1242 | intel_sdvo_write_sdvox(intel_sdvo, temp | SDVO_ENABLE); |
1242 | for (i = 0; i < 2; i++) | 1243 | for (i = 0; i < 2; i++) |
1243 | intel_wait_for_vblank(dev); | 1244 | intel_wait_for_vblank(dev, intel_crtc->pipe); |
1244 | 1245 | ||
1245 | status = intel_sdvo_get_trained_inputs(intel_sdvo, &input1, &input2); | 1246 | status = intel_sdvo_get_trained_inputs(intel_sdvo, &input1, &input2); |
1246 | /* Warn if the device reported failure to sync. | 1247 | /* Warn if the device reported failure to sync. |