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

Commit 7811b124 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: Do not touch best_encoder for load detect. 



This should only be touched by drm_atomic_helper.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1452160762-30487-4-git-send-email-maarten.lankhorst@linux.intel.com
parent ead8b665

drivers/gpu/drm/i915/intel_display.c

+0 −2
Original line number Diff line number Diff line
@@ -10521,7 +10521,6 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector, 
	}



	connector_state->crtc = crtc;

	connector_state->best_encoder = &intel_encoder->base;



	crtc_state = intel_atomic_get_crtc_state(state, intel_crtc);

	if (IS_ERR(crtc_state)) {
@@ -10617,7 +10616,6 @@ void intel_release_load_detect_pipe(struct drm_connector *connector, 
		if (IS_ERR(crtc_state))

			goto fail;



		connector_state->best_encoder = NULL;

		connector_state->crtc = NULL;



		crtc_state->base.enable = crtc_state->base.active = false;