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>

4 files changed, 12 insertions, 17 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)
                 return connector->status;
 
         /* for pre-945g platforms use load detect */
-        if (intel_get_load_detect_pipe(&crt->base, connector, NULL,
-                                       &tmp)) {
+        if (intel_get_load_detect_pipe(connector, NULL, &tmp)) {
                 if (intel_crt_detect_ddc(connector))
                         status = connector_status_connected;
                 else
                         status = intel_crt_load_detect(crt);
-                intel_release_load_detect_pipe(&crt->base, connector,
-                                               &tmp);
+                intel_release_load_detect_pipe(connector, &tmp);
         } else
                 status = connector_status_unknown;
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f851474fe066..62524b036bd1 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5584,12 +5584,13 @@ mode_fits_in_fbdev(struct drm_device *dev,
         return fb;
 }
 
-bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder,
-                                struct drm_connector *connector,
+bool intel_get_load_detect_pipe(struct drm_connector *connector,
                                 struct drm_display_mode *mode,
                                 struct intel_load_detect_pipe *old)
 {
         struct intel_crtc *intel_crtc;
+        struct intel_encoder *intel_encoder =
+                intel_attached_encoder(connector);
         struct drm_crtc *possible_crtc;
         struct drm_encoder *encoder = &intel_encoder->base;
         struct drm_crtc *crtc = NULL;
@@ -5694,10 +5695,11 @@ fail:
         return false;
 }
 
-void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder,
-                                    struct drm_connector *connector,
+void intel_release_load_detect_pipe(struct drm_connector *connector,
                                     struct intel_load_detect_pipe *old)
 {
+        struct intel_encoder *intel_encoder =
+                intel_attached_encoder(connector);
         struct drm_encoder *encoder = &intel_encoder->base;
         struct drm_device *dev = encoder->dev;
 
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 6920bc26a2e9..95f635b70b5b 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -433,12 +433,10 @@ struct intel_load_detect_pipe {
         bool load_detect_temp;
         int dpms_mode;
 };
-extern bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder,
-                                       struct drm_connector *connector,
+extern bool intel_get_load_detect_pipe(struct drm_connector *connector,
                                        struct drm_display_mode *mode,
                                        struct intel_load_detect_pipe *old);
-extern void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder,
-                                           struct drm_connector *connector,
+extern void intel_release_load_detect_pipe(struct drm_connector *connector,
                                            struct intel_load_detect_pipe *old);
 
 extern void intelfb_restore(void);
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 1a0bab07699e..95653a508987 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1303,12 +1303,9 @@ intel_tv_detect(struct drm_connector *connector, bool force)
         if (force) {
                 struct intel_load_detect_pipe tmp;
 
-                if (intel_get_load_detect_pipe(&intel_tv->base, connector,
-                                               &mode, &tmp)) {
+                if (intel_get_load_detect_pipe(connector, &mode, &tmp)) {
                         type = intel_tv_detect_type(intel_tv, connector);
-                        intel_release_load_detect_pipe(&intel_tv->base,
-                                                       connector,
-                                                       &tmp);
+                        intel_release_load_detect_pipe(connector, &tmp);
                 } else
                         return connector_status_unknown;
         } else