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

!8755 drm/amd/display: Avoid NULL dereference of timing generator 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wenyu Huang <huangwenyu5@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YJ6JUELWWXEFNTZ6ZNWIMMAVMZPMFLC7/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9R4M5 
 
Link:https://gitee.com/openeuler/kernel/pulls/8755

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 69d688c9 07773e5a

drivers/gpu/drm/amd/display/dc/core/dc_stream.c

+2 −2
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ uint32_t dc_stream_get_vblank_counter(const struct dc_stream_state *stream) 
	for (i = 0; i < MAX_PIPES; i++) {

		struct timing_generator *tg = res_ctx->pipe_ctx[i].stream_res.tg;



		if (res_ctx->pipe_ctx[i].stream != stream)

		if (res_ctx->pipe_ctx[i].stream != stream || !tg)

			continue;



		return tg->funcs->get_frame_count(tg);
@@ -593,7 +593,7 @@ bool dc_stream_get_scanoutpos(const struct dc_stream_state *stream, 
	for (i = 0; i < MAX_PIPES; i++) {

		struct timing_generator *tg = res_ctx->pipe_ctx[i].stream_res.tg;



		if (res_ctx->pipe_ctx[i].stream != stream)

		if (res_ctx->pipe_ctx[i].stream != stream || !tg)

			continue;



		tg->funcs->get_scanoutpos(tg,