Commit 25f89954 authored by Ville Syrjälä's avatar Ville Syrjälä

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191029132323.18113-1-ville.syrjala@linux.intel.comReviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent a8ddac7c
...@@ -844,7 +844,7 @@ intel_crt_detect(struct drm_connector *connector, ...@@ -844,7 +844,7 @@ intel_crt_detect(struct drm_connector *connector,
} }
/* for pre-945g platforms use load detect */ /* 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 (ret > 0) {
if (intel_crt_detect_ddc(connector)) if (intel_crt_detect_ddc(connector))
status = connector_status_connected; status = connector_status_connected;
......
...@@ -11328,7 +11328,6 @@ static int intel_modeset_disable_planes(struct drm_atomic_state *state, ...@@ -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, int intel_get_load_detect_pipe(struct drm_connector *connector,
const struct drm_display_mode *mode,
struct intel_load_detect_pipe *old, struct intel_load_detect_pipe *old,
struct drm_modeset_acquire_ctx *ctx) struct drm_modeset_acquire_ctx *ctx)
{ {
...@@ -11435,10 +11434,8 @@ int intel_get_load_detect_pipe(struct drm_connector *connector, ...@@ -11435,10 +11434,8 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
crtc_state->base.active = crtc_state->base.enable = true; crtc_state->base.active = crtc_state->base.enable = true;
if (!mode) ret = drm_atomic_set_mode_for_crtc(&crtc_state->base,
mode = &load_detect_mode; &load_detect_mode);
ret = drm_atomic_set_mode_for_crtc(&crtc_state->base, mode);
if (ret) if (ret)
goto fail; goto fail;
......
...@@ -509,7 +509,6 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, ...@@ -509,7 +509,6 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
struct intel_digital_port *dport, struct intel_digital_port *dport,
unsigned int expected_mask); unsigned int expected_mask);
int intel_get_load_detect_pipe(struct drm_connector *connector, int intel_get_load_detect_pipe(struct drm_connector *connector,
const struct drm_display_mode *mode,
struct intel_load_detect_pipe *old, struct intel_load_detect_pipe *old,
struct drm_modeset_acquire_ctx *ctx); struct drm_modeset_acquire_ctx *ctx);
void intel_release_load_detect_pipe(struct drm_connector *connector, void intel_release_load_detect_pipe(struct drm_connector *connector,
......
...@@ -1701,7 +1701,7 @@ intel_tv_detect(struct drm_connector *connector, ...@@ -1701,7 +1701,7 @@ intel_tv_detect(struct drm_connector *connector,
struct intel_load_detect_pipe tmp; struct intel_load_detect_pipe tmp;
int ret; int ret;
ret = intel_get_load_detect_pipe(connector, NULL, &tmp, ctx); ret = intel_get_load_detect_pipe(connector, &tmp, ctx);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment