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

!13794 drm/amd/display: Add NULL check for clk_mgr in dcn32_init_hw 

Merge Pull Request from: @ci-robot 
 
PR sync from: dinglongwei <dinglongwei1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/N55RFZPF6PR7KEBHZPCX6MGVA4DNRSHT/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYR9K 
 
Link:https://gitee.com/openeuler/kernel/pulls/13794
parents 0bca42b1 f6e28614

drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c

+4 −3
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ void dcn32_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
@@ -950,10 +950,11 @@ void dcn32_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 (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)