Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0622a53c authored by Chris Wilson's avatar Chris Wilson Committed by Keith Packard
Browse files

drm/i915: Remove dead code from intel_release_load_detect_pipe() 



As we now never attempt to steal a crtc for load detection, we either
set a mode on a new pipe, or change the dpms mode on an existing pipe.
Never both, so we can simplify the code slightly.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 6492711d

drivers/gpu/drm/i915/intel_display.c

+3 −5
Original line number Diff line number Diff line
@@ -5577,15 +5577,13 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, 
	struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;



	if (old->load_detect_temp) {

		encoder->crtc = NULL;

		connector->encoder = NULL;

		crtc->enabled = drm_helper_crtc_in_use(crtc);

		drm_helper_disable_unused_functions(dev);

		return;

	}



	/* Switch crtc and encoder back off if necessary */

	if (crtc->enabled && old->dpms_mode != DRM_MODE_DPMS_ON) {

		if (encoder->crtc == crtc)

	if (old->dpms_mode != DRM_MODE_DPMS_ON) {

		encoder_funcs->dpms(encoder, old->dpms_mode);

		crtc_funcs->dpms(crtc, old->dpms_mode);

	}