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

!12890 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/I2ZCHQWYDRZX2LO3JHYWIJBVI6Z4D4MO/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYR9I 
 
Link:https://gitee.com/openeuler/kernel/pulls/12890

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents c744545d 7e4b042b

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

+3 −3
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ void dcn30_init_hw(struct dc *dc) 
	struct resource_pool *res_pool = dc->res_pool;

	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
@@ -633,10 +633,10 @@ void dcn30_init_hw(struct dc *dc) 
	if (hws->funcs.enable_power_gating_plane)

		hws->funcs.enable_power_gating_plane(dc->hwseq, true);



	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 (dc->clk_mgr->funcs->set_hard_max_memclk)

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

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

}