Merge "disp: msm: sde: fix imbalance power vote during cwb and dms concurrency" (e8b704e0) · Commits · e / devices / android_kernel_fairphone_FP5

msm/sde/sde_encoder.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -2272,9 +2272,9 @@ static int sde_encoder_virt_modeset_rc(struct drm_encoder *drm_enc,

		if (pre_modeset) {
		intf_mode = sde_encoder_get_intf_mode(drm_enc);
		if (msm_is_mode_seamless_dms(adj_mode) \|\|
		(msm_is_mode_seamless_dyn_clk(adj_mode) &&
		is_cmd_mode)) {
		if ((msm_is_mode_seamless_dms(adj_mode) \|\|
		msm_is_mode_seamless_dyn_clk(adj_mode)) &&
		is_cmd_mode) {
		/* restore resource state before releasing them */
		ret = sde_encoder_resource_control(drm_enc,
		SDE_ENC_RC_EVENT_PRE_MODESET);
		@@ -2298,9 +2298,9 @@ static int sde_encoder_virt_modeset_rc(struct drm_encoder *drm_enc,
		adj_mode);
		}
		} else {
		if (msm_is_mode_seamless_dms(adj_mode) \|\|
		(msm_is_mode_seamless_dyn_clk(adj_mode) &&
		is_cmd_mode))
		if ((msm_is_mode_seamless_dms(adj_mode) \|\|
		msm_is_mode_seamless_dyn_clk(adj_mode)) &&
		is_cmd_mode)
		sde_encoder_resource_control(&sde_enc->base,
		SDE_ENC_RC_EVENT_POST_MODESET);
		else if (msm_is_mode_seamless_poms(adj_mode))