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

Commit cfecde43 authored by Carl Worth's avatar Carl Worth Committed by Eric Anholt
Browse files

drm/i915: Don't enable pipe/plane/VCO early (wait for DPMS on). 



The existing code handling the DPMS ON event is much more careful to
ensure that these registers are enabled according to strict sequencing
requirements. Enabling these early in mode_set simply defeats that.

Signed-off-by: default avatarCarl Worth <cworth@cworth.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent ea059a1e

drivers/gpu/drm/i915/intel_display.c

+0 −5
Original line number Diff line number Diff line
@@ -3463,11 +3463,6 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, 
			pipeconf &= ~PIPEACONF_DOUBLE_WIDE;

	}



	dspcntr |= DISPLAY_PLANE_ENABLE;

	pipeconf |= PIPEACONF_ENABLE;

	dpll |= DPLL_VCO_ENABLE;





	/* Disable the panel fitter if it was on our pipe */

	if (!HAS_PCH_SPLIT(dev) && intel_panel_fitter_pipe(dev) == pipe)

		I915_WRITE(PFIT_CONTROL, 0);