Commit f7d0157b authored by Charlene Liu's avatar Charlene Liu Committed by Alex Deucher
Browse files

drm/amd/display: avoid crash and add z8_marks related in dml 



[why]
add dml1 used calculate_wm_and_dlg function pointer check to prevent crash.
add z8 watermarks to struct for later asic use

Reviewed-by: default avatarAlvin Lee <alvin.lee2@amd.com>
Acked-by: default avatarStylon Wang <stylon.wang@amd.com>
Signed-off-by: default avatarCharlene Liu <charlene.liu@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 53f32880

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c

+2 −1
Original line number Diff line number Diff line
@@ -2063,6 +2063,7 @@ bool dcn30_validate_bandwidth(struct dc *dc, 
	}



	DC_FP_START();

	if (dc->res_pool->funcs->calculate_wm_and_dlg)

		dc->res_pool->funcs->calculate_wm_and_dlg(dc, context, pipes, pipe_cnt, vlevel);

	DC_FP_END();

drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c

+2 −2
Original line number Diff line number Diff line
@@ -1781,7 +1781,7 @@ bool dcn31_validate_bandwidth(struct dc *dc, 
		BW_VAL_TRACE_SKIP(fast);

		goto validate_out;

	}



	if (dc->res_pool->funcs->calculate_wm_and_dlg)

		dc->res_pool->funcs->calculate_wm_and_dlg(dc, context, pipes, pipe_cnt, vlevel);



	BW_VAL_TRACE_END_WATERMARKS();

drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c

+2 −2
Original line number Diff line number Diff line
@@ -1740,7 +1740,7 @@ bool dcn314_validate_bandwidth(struct dc *dc, 
		BW_VAL_TRACE_SKIP(fast);

		goto validate_out;

	}



	if (dc->res_pool->funcs->calculate_wm_and_dlg)

		dc->res_pool->funcs->calculate_wm_and_dlg(dc, context, pipes, pipe_cnt, vlevel);



	BW_VAL_TRACE_END_WATERMARKS();

drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ struct dcn_hubbub_wm_set { 
	uint32_t dram_clk_change;

	uint32_t usr_retrain;

	uint32_t fclk_pstate_change;

	uint32_t sr_enter_exit_Z8;

	uint32_t sr_enter_Z8;

};



struct dcn_hubbub_wm {