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

Commit 6492711d authored by Chris Wilson's avatar Chris Wilson Committed by Keith Packard
Browse files

drm/i915: Remove dead code from intel_get_load_detect_pipe() 



As we only allow the use of a disabled CRTC, we don't need to handle the
case where we are reusing an already enabled pipe.

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

drivers/gpu/drm/i915/intel_display.c

+10 −18
Original line number Diff line number Diff line
@@ -5491,8 +5491,6 @@ bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, 
	struct drm_encoder *encoder = &intel_encoder->base;

	struct drm_crtc *crtc = NULL;

	struct drm_device *dev = encoder->dev;

	struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;

	struct drm_crtc_helper_funcs *crtc_funcs;

	int i = -1;



	/*
@@ -5515,8 +5513,13 @@ bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, 


		/* Make sure the crtc and connector are running */

		if (intel_crtc->dpms_mode != DRM_MODE_DPMS_ON) {

			struct drm_encoder_helper_funcs *encoder_funcs;

			struct drm_crtc_helper_funcs *crtc_funcs;



			crtc_funcs = crtc->helper_private;

			crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);



			encoder_funcs = encoder->helper_private;

			encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);

		}
@@ -5549,7 +5552,6 @@ bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, 
	old->dpms_mode = intel_crtc->dpms_mode;

	old->load_detect_temp = true;



	if (!crtc->enabled) {

	if (!mode)

		mode = &load_detect_mode;
@@ -5557,16 +5559,6 @@ bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, 
		DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n");

		return false;

	}

	} else {

		if (intel_crtc->dpms_mode != DRM_MODE_DPMS_ON) {

			crtc_funcs = crtc->helper_private;

			crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);

		}



		/* Add this connector to the crtc */

		encoder_funcs->mode_set(encoder, &crtc->mode, &crtc->hwmode);

		encoder_funcs->commit(encoder);

	}



	/* let the connector get through one full cycle before testing */

	intel_wait_for_vblank(dev, intel_crtc->pipe);