浏览代码

disp: msm: sde: remove check to commit RM resourses

Commit bd234c18852a ("disp: msm: sde: avoid irq enable/disable
during modeset") adds a check before reserving RM resources as
part of modeset. Without this reserve, the resources are not
always allocated during modeset. This change removes the check
around the rm reserve to ensure resources are committed.

Change-Id: Icbb47ad781a04a0cd39c0190e9653eff470af7a0
Signed-off-by: Nilaan Gunabalachandran <[email protected]>
Nilaan Gunabalachandran 4 年之前
父节点
当前提交
c233dee598
共有 1 个文件被更改,包括 5 次插入13 次删除
  1. 5 13
      msm/sde/sde_encoder.c

+ 5 - 13
msm/sde/sde_encoder.c

@@ -2499,19 +2499,11 @@ static void sde_encoder_virt_mode_set(struct drm_encoder *drm_enc,
 	if (ret)
 		return;
 
-	if (drm_enc->crtc->state->active_changed ||
-		!(msm_is_mode_seamless_dms(msm_mode) ||
-		(msm_is_mode_seamless_dyn_clk(msm_mode) &&
-		sde_encoder_check_curr_mode(drm_enc, MSM_DISPLAY_CMD_MODE)))) {
-
-		/* reserve dynamic resources now, indicating non test-only */
-		ret = sde_rm_reserve(&sde_kms->rm, drm_enc, drm_enc->crtc->state,
-				conn->state, false);
-		if (ret) {
-			SDE_ERROR_ENC(sde_enc,
-				"failed to reserve hw resources, %d\n", ret);
-			return;
-		}
+	/* reserve dynamic resources now, indicating non test-only */
+	ret = sde_rm_reserve(&sde_kms->rm, drm_enc, drm_enc->crtc->state, conn->state, false);
+	if (ret) {
+		SDE_ERROR_ENC(sde_enc, "failed to reserve hw resources, %d\n", ret);
+		return;
 	}
 
 	/* assign the reserved HW blocks to this encoder */