drm/i915: Nuke 'mode' argument to intel_get_load_detect_pipe()

We always pass mode==NULL to intel_get_load_detect_pipe(). Remove
the pointless function argument.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191029132323.18113-1-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index 834bf1d43bb8dba5e02dd1907a91045b231835c6..bf576b1e56ae6a4d313740fcddda948e93a74682 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -844,7 +844,7 @@ intel_crt_detect(struct drm_connector *connector,
        }
 
        /* for pre-945g platforms use load detect */
-       ret = intel_get_load_detect_pipe(connector, NULL, &tmp, ctx);
+       ret = intel_get_load_detect_pipe(connector, &tmp, ctx);
        if (ret > 0) {
                if (intel_crt_detect_ddc(connector))
                        status = connector_status_connected;

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index e56a75c070437d8f84f18620de65fe1b76581b14..1862546356fd2fba3999efe94b6fd520d0a974fd 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -11328,7 +11328,6 @@ static int intel_modeset_disable_planes(struct drm_atomic_state *state,
 }
 
 int intel_get_load_detect_pipe(struct drm_connector *connector,
-                              const struct drm_display_mode *mode,
                               struct intel_load_detect_pipe *old,
                               struct drm_modeset_acquire_ctx *ctx)
 {
@@ -11435,10 +11434,8 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
 
        crtc_state->base.active = crtc_state->base.enable = true;
 
-       if (!mode)
-               mode = &load_detect_mode;
-
-       ret = drm_atomic_set_mode_for_crtc(&crtc_state->base, mode);
+       ret = drm_atomic_set_mode_for_crtc(&crtc_state->base,
+                                          &load_detect_mode);
        if (ret)
                goto fail;
 

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index ca7ca2804d8b729399459926fe0561bb769ae47c..355c50088589bf35775d8e87550ebb812711224d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -509,7 +509,6 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
                         struct intel_digital_port *dport,
                         unsigned int expected_mask);
 int intel_get_load_detect_pipe(struct drm_connector *connector,
-                              const struct drm_display_mode *mode,
                               struct intel_load_detect_pipe *old,
                               struct drm_modeset_acquire_ctx *ctx);
 void intel_release_load_detect_pipe(struct drm_connector *connector,

diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c
index 70726b4812444ffdc2a41a67a8ba3276abbe3557..5556d8300a888205dd70d0bbe41d3aec4dcc7b56 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_tv.c
+++ b/drivers/gpu/drm/i915/display/intel_tv.c
@@ -1701,7 +1701,7 @@ intel_tv_detect(struct drm_connector *connector,
                struct intel_load_detect_pipe tmp;
                int ret;
 
-               ret = intel_get_load_detect_pipe(connector, NULL, &tmp, ctx);
+               ret = intel_get_load_detect_pipe(connector, &tmp, ctx);
                if (ret < 0)
                        return ret;