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

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.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent a8ddac7c

drivers/gpu/drm/i915/display/intel_crt.c

+1 −1
Original line number Diff line number Diff line
@@ -844,7 +844,7 @@ 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 (intel_crt_detect_ddc(connector))

			status = connector_status_connected;

drivers/gpu/drm/i915/display/intel_display.c

+2 −5
Original line number Diff line number Diff line
@@ -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 @@ found: 


	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;

drivers/gpu/drm/i915/display/intel_display.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/i915/display/intel_tv.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE