Merge "drm/msm/sde: Apply mode on the first frame after boot" (579a72d0) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+13 −1

Original line number	Diff line number	Diff line
		@@ -3562,6 +3562,9 @@ static void sde_crtc_atomic_begin(struct drm_crtc *crtc,
		struct drm_encoder *encoder;
		struct drm_device *dev;
		struct sde_kms *sde_kms;
		struct sde_splash_display *splash_display;
		bool cont_splash_enabled = false;
		size_t i;

		if (!crtc) {
		SDE_ERROR("invalid crtc\n");
		@@ -3626,7 +3629,16 @@ static void sde_crtc_atomic_begin(struct drm_crtc *crtc,
		* apply color processing properties only if
		* smmu state is attached,
		*/
		if (sde_kms_is_cp_operation_allowed(sde_kms) && sde_crtc->enabled)
		for (i = 0; i < MAX_DSI_DISPLAYS; i++) {
		splash_display = &sde_kms->splash_data.splash_display[i];
		if (splash_display->cont_splash_enabled &&
		splash_display->encoder &&
		crtc == splash_display->encoder->crtc)
		cont_splash_enabled = true;
		}

		if (sde_kms_is_cp_operation_allowed(sde_kms) &&
		(cont_splash_enabled \|\| sde_crtc->enabled))
		sde_cp_crtc_apply_properties(crtc);

		/*