Commit a4cea116 authored Nov 07, 2019 by Jaehyun Chung Committed by Alex Deucher Dec 05, 2019

drm/amd/display: Wrong ifdef guards were used around DML validation



[Why]
Wrong guards were causing the debug option not to run.

[How]
Changed the guard to the correct one, matching the rq, ttu, dlg regs struct
members that need to be guarded. Also log a message when validation starts.

Signed-off-by: Jaehyun Chung <jaehyun.chung@amd.com>
Reviewed-by: Alvin Lee <Alvin.Lee2@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 580c8be2

drivers/gpu/drm/amd/display/dc/core/dc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2187,7 +2187,7 @@ static void commit_planes_for_stream(struct dc *dc,
		}
		if (dc->hwss.program_front_end_for_ctx && update_type != UPDATE_TYPE_FAST) {
		dc->hwss.program_front_end_for_ctx(dc, context);
		#ifdef CONFIG_DRM_AMD_DC_DCN1_0
		#ifdef CONFIG_DRM_AMD_DC_DCN
		if (dc->debug.validate_dml_output) {
		for (i = 0; i < dc->res_pool->pipe_count; i++) {
		struct pipe_ctx cur_pipe = context->res_ctx.pipe_ctx[i];

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1257,6 +1257,7 @@ void hubp2_validate_dml_output(struct hubp *hubp,
		struct _vcs_dpi_display_dlg_regs_st dlg_attr = {0};
		struct _vcs_dpi_display_ttu_regs_st ttu_attr = {0};
		DC_LOGGER_INIT(ctx->logger);
		DC_LOG_DEBUG("DML Validation \| Running Validation");

		/* Requestor Regs */
		REG_GET(HUBPRET_CONTROL,

drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -267,6 +267,7 @@ void hubp21_validate_dml_output(struct hubp *hubp,
		struct _vcs_dpi_display_dlg_regs_st dlg_attr = {0};
		struct _vcs_dpi_display_ttu_regs_st ttu_attr = {0};
		DC_LOGGER_INIT(ctx->logger);
		DC_LOG_DEBUG("DML Validation \| Running Validation");

		/* Requester - Per hubp */
		REG_GET(HUBPRET_CONTROL,