Merge "drm/msm/sde: Add check before applying color-prop properties" into dev/msm-4.14-display (21aa8ba1) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3095,7 +3095,7 @@ 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))
		if (sde_kms_is_cp_operation_allowed(sde_kms) && sde_crtc->enabled)
		sde_cp_crtc_apply_properties(crtc);

		/*