aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_crt.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-08-12 15:20:10 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-08-17 04:10:02 -0400
commitd2434ab7fb085ac6848acd9d82366f96a642e471 (patch)
treed6a4a733dd1872093f01c4cfceca14ca7162bd3e /drivers/gpu/drm/i915/intel_crt.c
parent24218aacac65f5b731bbff8eeb09ea7847dda2ef (diff)
drm/i915: drop intel_encoder argument to load_detect_pipe functions
Since it's redundant - we can get the attached encoder in the functions themselves. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_crt.c')
-rw-r--r--drivers/gpu/drm/i915/intel_crt.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index bc5e2c97db61..62b6555cfa27 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -517,14 +517,12 @@ intel_crt_detect(struct drm_connector *connector, bool force)
517 return connector->status; 517 return connector->status;
518 518
519 /* for pre-945g platforms use load detect */ 519 /* for pre-945g platforms use load detect */
520 if (intel_get_load_detect_pipe(&crt->base, connector, NULL, 520 if (intel_get_load_detect_pipe(connector, NULL, &tmp)) {
521 &tmp)) {
522 if (intel_crt_detect_ddc(connector)) 521 if (intel_crt_detect_ddc(connector))
523 status = connector_status_connected; 522 status = connector_status_connected;
524 else 523 else
525 status = intel_crt_load_detect(crt); 524 status = intel_crt_load_detect(crt);
526 intel_release_load_detect_pipe(&crt->base, connector, 525 intel_release_load_detect_pipe(connector, &tmp);
527 &tmp);
528 } else 526 } else
529 status = connector_status_unknown; 527 status = connector_status_unknown;
530 528