Merge "drm/msm/sde: reset mixers swapped state on acquiring mixers" (1c8405ae) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/msm/sde/sde_crtc.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -2951,6 +2951,7 @@ static void _sde_crtc_setup_mixers(struct drm_crtc *crtc)
		struct drm_encoder *enc;

		sde_crtc->num_mixers = 0;
		sde_crtc->mixers_swapped = false;
		memset(sde_crtc->mixers, 0, sizeof(sde_crtc->mixers));

		mutex_lock(&sde_crtc->crtc_lock);
		@@ -3829,6 +3830,7 @@ static void sde_crtc_disable(struct drm_crtc *crtc)

		memset(sde_crtc->mixers, 0, sizeof(sde_crtc->mixers));
		sde_crtc->num_mixers = 0;
		sde_crtc->mixers_swapped = false;

		/* disable clk & bw control until clk & bw properties are set */
		cstate->bw_control = false;