Unverified Commit e4a5cbfa authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12888 drm/amd/display: Add NULL check for clk_mgr and clk_mgr->funcs in dcn30_init_hw 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4ELUH4OQCONKGP6MNDBDR3GUXEPJVAM5/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYR9I 
 
Link:https://gitee.com/openeuler/kernel/pulls/12888

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 89f79772 4997592f

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

+4 −3
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ void dcn30_init_hw(struct dc *dc) 
	int edp_num;

	uint32_t backlight = MAX_BACKLIGHT_LEVEL;



	if (dc->clk_mgr && dc->clk_mgr->funcs->init_clocks)

	if (dc->clk_mgr && dc->clk_mgr->funcs && dc->clk_mgr->funcs->init_clocks)

		dc->clk_mgr->funcs->init_clocks(dc->clk_mgr);



	// Initialize the dccg
@@ -599,11 +599,12 @@ void dcn30_init_hw(struct dc *dc) 
	if (!dcb->funcs->is_accelerated_mode(dcb) && dc->res_pool->hubbub->funcs->init_watermarks)

		dc->res_pool->hubbub->funcs->init_watermarks(dc->res_pool->hubbub);



	if (dc->clk_mgr->funcs->notify_wm_ranges)

	if (dc->clk_mgr && dc->clk_mgr->funcs && dc->clk_mgr->funcs->notify_wm_ranges)

		dc->clk_mgr->funcs->notify_wm_ranges(dc->clk_mgr);



	//if softmax is enabled then hardmax will be set by a different call

	if (dc->clk_mgr->funcs->set_hard_max_memclk && !dc->clk_mgr->dc_mode_softmax_enabled)

	if (dc->clk_mgr && dc->clk_mgr->funcs && dc->clk_mgr->funcs->set_hard_max_memclk &&

	   !dc->clk_mgr->dc_mode_softmax_enabled)

		dc->clk_mgr->funcs->set_hard_max_memclk(dc->clk_mgr);



	if (dc->res_pool->hubbub->funcs->force_pstate_change_control)