Commit a3cb1c1c authored by Nikola Cornij's avatar Nikola Cornij Committed by Alex Deucher
Browse files

drm/amd/display: Log DTN only after the atomic commit in Diag 



Also print HUBP info only if pipe enabled. This fixes having different
DTN logs for different test sequences.

Signed-off-by: default avatarNikola Cornij <nikola.cornij@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 07049507

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+62 −57
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ static void dcn10_log_hubp_states(struct dc *dc) 


		hubp->funcs->hubp_read_state(hubp);



		if (!s->blank_en) {

			DTN_INFO("[%2d]:  %5xh  %6xh  %5d  %6d  %2xh  %2xh  %6xh"

					"  %6d  %8d  %7d  %8xh",

					hubp->inst,
@@ -146,6 +147,7 @@ static void dcn10_log_hubp_states(struct dc *dc) 
			DTN_INFO_MICRO_SEC(s->qos_level_high_wm);

			DTN_INFO("\n");

		}

	}



	DTN_INFO("\n=========RQ========\n");

	DTN_INFO("HUBP:  drq_exp_m  prq_exp_m  mrq_exp_m  crq_exp_m  plane1_ba  L:chunk_s  min_chu_s  meta_ch_s"
@@ -155,8 +157,9 @@ static void dcn10_log_hubp_states(struct dc *dc) 
		struct dcn_hubp_state *s = &(TO_DCN10_HUBP(pool->hubps[i])->state);

		struct _vcs_dpi_display_rq_regs_st *rq_regs = &s->rq_regs;



		if (!s->blank_en)

			DTN_INFO("[%2d]:  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh\n",

			i, rq_regs->drq_expansion_mode, rq_regs->prq_expansion_mode, rq_regs->mrq_expansion_mode,

				pool->hubps[i]->inst, rq_regs->drq_expansion_mode, rq_regs->prq_expansion_mode, rq_regs->mrq_expansion_mode,

				rq_regs->crq_expansion_mode, rq_regs->plane1_base_address, rq_regs->rq_regs_l.chunk_size,

				rq_regs->rq_regs_l.min_chunk_size, rq_regs->rq_regs_l.meta_chunk_size,

				rq_regs->rq_regs_l.min_meta_chunk_size, rq_regs->rq_regs_l.dpte_group_size,
@@ -179,10 +182,11 @@ static void dcn10_log_hubp_states(struct dc *dc) 
		struct dcn_hubp_state *s = &(TO_DCN10_HUBP(pool->hubps[i])->state);

		struct _vcs_dpi_display_dlg_regs_st *dlg_regs = &s->dlg_attr;



		if (!s->blank_en)

			DTN_INFO("[%2d]:  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh"

				"%  8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh"

				"  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh\n",

			i, dlg_regs->refcyc_h_blank_end, dlg_regs->dlg_vblank_end, dlg_regs->min_dst_y_next_start,

				pool->hubps[i]->inst, dlg_regs->refcyc_h_blank_end, dlg_regs->dlg_vblank_end, dlg_regs->min_dst_y_next_start,

				dlg_regs->refcyc_per_htotal, dlg_regs->refcyc_x_after_scaler, dlg_regs->dst_y_after_scaler,

				dlg_regs->dst_y_prefetch, dlg_regs->dst_y_per_vm_vblank, dlg_regs->dst_y_per_row_vblank,

				dlg_regs->dst_y_per_vm_flip, dlg_regs->dst_y_per_row_flip, dlg_regs->ref_freq_to_pix_freq,
@@ -210,8 +214,9 @@ static void dcn10_log_hubp_states(struct dc *dc) 
		struct dcn_hubp_state *s = &(TO_DCN10_HUBP(pool->hubps[i])->state);

		struct _vcs_dpi_display_ttu_regs_st *ttu_regs = &s->ttu_attr;



		if (!s->blank_en)

			DTN_INFO("[%2d]:  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh  %8xh\n",

			i, ttu_regs->qos_level_low_wm, ttu_regs->qos_level_high_wm, ttu_regs->min_ttu_vblank,

				pool->hubps[i]->inst, ttu_regs->qos_level_low_wm, ttu_regs->qos_level_high_wm, ttu_regs->min_ttu_vblank,

				ttu_regs->qos_level_flip, ttu_regs->refcyc_per_req_delivery_pre_l, ttu_regs->refcyc_per_req_delivery_l,

				ttu_regs->refcyc_per_req_delivery_pre_c, ttu_regs->refcyc_per_req_delivery_c, ttu_regs->refcyc_per_req_delivery_cur0,

				ttu_regs->refcyc_per_req_delivery_pre_cur0, ttu_regs->refcyc_per_req_delivery_cur1,

CRA Git | Maintained and supported by SUSTech CRA and CCSE