浏览代码

drm/amd/display: Keep blank until set visibility to true after mode switch

Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Yongqiang Sun 8 年之前
父节点
当前提交
d70ccd4a65
共有 2 个文件被更改,包括 13 次插入12 次删除
  1. 9 12
      drivers/gpu/drm/amd/display/dc/core/dc.c
  2. 4 0
      drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c

+ 9 - 12
drivers/gpu/drm/amd/display/dc/core/dc.c

@@ -1609,12 +1609,10 @@ void dc_update_surfaces_and_stream(struct dc *dc,
 			if (!pipe_ctx->surface || pipe_ctx->top_pipe)
 			if (!pipe_ctx->surface || pipe_ctx->top_pipe)
 				continue;
 				continue;
 
 
-			if (!pipe_ctx->tg->funcs->is_blanked(pipe_ctx->tg)) {
-				core_dc->hwss.pipe_control_lock(
-						core_dc,
-						pipe_ctx,
-						true);
-			}
+			core_dc->hwss.pipe_control_lock(
+					core_dc,
+					pipe_ctx,
+					true);
 		}
 		}
 		if (update_type == UPDATE_TYPE_FULL)
 		if (update_type == UPDATE_TYPE_FULL)
 			break;
 			break;
@@ -1697,12 +1695,11 @@ void dc_update_surfaces_and_stream(struct dc *dc,
 			if (!pipe_ctx->surface || pipe_ctx->top_pipe)
 			if (!pipe_ctx->surface || pipe_ctx->top_pipe)
 				continue;
 				continue;
 
 
-			if (!pipe_ctx->tg->funcs->is_blanked(pipe_ctx->tg)) {
-				core_dc->hwss.pipe_control_lock(
-						core_dc,
-						pipe_ctx,
-						false);
-			}
+			core_dc->hwss.pipe_control_lock(
+					core_dc,
+					pipe_ctx,
+					false);
+
 			break;
 			break;
 		}
 		}
 	}
 	}

+ 4 - 0
drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c

@@ -52,6 +52,10 @@ void dce_pipe_control_lock(struct core_dc *dc,
 	uint32_t dcp_grph, scl, blnd, update_lock_mode, val;
 	uint32_t dcp_grph, scl, blnd, update_lock_mode, val;
 	struct dce_hwseq *hws = dc->hwseq;
 	struct dce_hwseq *hws = dc->hwseq;
 
 
+	/* Not lock pipe when blank */
+	if (lock && pipe->tg->funcs->is_blanked(pipe->tg))
+		return;
+
 	val = REG_GET_4(BLND_V_UPDATE_LOCK[pipe->pipe_idx],
 	val = REG_GET_4(BLND_V_UPDATE_LOCK[pipe->pipe_idx],
 			BLND_DCP_GRPH_V_UPDATE_LOCK, &dcp_grph,
 			BLND_DCP_GRPH_V_UPDATE_LOCK, &dcp_grph,
 			BLND_SCL_V_UPDATE_LOCK, &scl,
 			BLND_SCL_V_UPDATE_LOCK, &scl,