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

Commit 21aa8ba1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: Add check before applying color-prop properties" into dev/msm-4.14-display

parents e9961ae3 6fd99b3e
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line 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
	 * apply color processing properties only if
	 * smmu state is attached,
	 * 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);
		sde_cp_crtc_apply_properties(crtc);


	/*
	/*