diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_crt.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 80bf3112dc1f..236191377b0f 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c | |||
@@ -547,14 +547,12 @@ intel_crt_detect(struct drm_connector *connector, bool force) | |||
547 | return connector->status; | 547 | return connector->status; |
548 | 548 | ||
549 | /* for pre-945g platforms use load detect */ | 549 | /* for pre-945g platforms use load detect */ |
550 | if (intel_get_load_detect_pipe(&crt->base, connector, NULL, | 550 | if (intel_get_load_detect_pipe(connector, NULL, &tmp)) { |
551 | &tmp)) { | ||
552 | if (intel_crt_detect_ddc(connector)) | 551 | if (intel_crt_detect_ddc(connector)) |
553 | status = connector_status_connected; | 552 | status = connector_status_connected; |
554 | else | 553 | else |
555 | status = intel_crt_load_detect(crt); | 554 | status = intel_crt_load_detect(crt); |
556 | intel_release_load_detect_pipe(&crt->base, connector, | 555 | intel_release_load_detect_pipe(connector, &tmp); |
557 | &tmp); | ||
558 | } else | 556 | } else |
559 | status = connector_status_unknown; | 557 | status = connector_status_unknown; |
560 | 558 | ||
@@ -694,7 +692,7 @@ void intel_crt_init(struct drm_device *dev) | |||
694 | if (IS_HASWELL(dev)) | 692 | if (IS_HASWELL(dev)) |
695 | crt->base.crtc_mask = (1 << 0); | 693 | crt->base.crtc_mask = (1 << 0); |
696 | else | 694 | else |
697 | crt->base.crtc_mask = (1 << 0) | (1 << 1); | 695 | crt->base.crtc_mask = (1 << 0) | (1 << 1) | (1 << 2); |
698 | 696 | ||
699 | if (IS_GEN2(dev)) | 697 | if (IS_GEN2(dev)) |
700 | connector->interlace_allowed = 0; | 698 | connector->interlace_allowed = 0; |