diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_crt.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 2eb60cd47b33..e93f93cc7e78 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c | |||
@@ -430,7 +430,6 @@ intel_crt_detect(struct drm_connector *connector, bool force) | |||
430 | struct drm_device *dev = connector->dev; | 430 | struct drm_device *dev = connector->dev; |
431 | struct intel_crt *crt = intel_attached_crt(connector); | 431 | struct intel_crt *crt = intel_attached_crt(connector); |
432 | struct drm_crtc *crtc; | 432 | struct drm_crtc *crtc; |
433 | int dpms_mode; | ||
434 | enum drm_connector_status status; | 433 | enum drm_connector_status status; |
435 | 434 | ||
436 | if (I915_HAS_HOTPLUG(dev)) { | 435 | if (I915_HAS_HOTPLUG(dev)) { |
@@ -454,14 +453,16 @@ intel_crt_detect(struct drm_connector *connector, bool force) | |||
454 | if (crtc && crtc->enabled) { | 453 | if (crtc && crtc->enabled) { |
455 | status = intel_crt_load_detect(crt); | 454 | status = intel_crt_load_detect(crt); |
456 | } else { | 455 | } else { |
457 | if (intel_get_load_detect_pipe(&crt->base, connector, | 456 | struct intel_load_detect_pipe tmp; |
458 | NULL, &dpms_mode)) { | 457 | |
458 | if (intel_get_load_detect_pipe(&crt->base, connector, NULL, | ||
459 | &tmp)) { | ||
459 | if (intel_crt_detect_ddc(connector)) | 460 | if (intel_crt_detect_ddc(connector)) |
460 | status = connector_status_connected; | 461 | status = connector_status_connected; |
461 | else | 462 | else |
462 | status = intel_crt_load_detect(crt); | 463 | status = intel_crt_load_detect(crt); |
463 | intel_release_load_detect_pipe(&crt->base, | 464 | intel_release_load_detect_pipe(&crt->base, connector, |
464 | connector, dpms_mode); | 465 | &tmp); |
465 | } else | 466 | } else |
466 | status = connector_status_unknown; | 467 | status = connector_status_unknown; |
467 | } | 468 | } |