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

!8465 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/Z27JIOPVSOLDD452G5MPIFARYMG7ZTCJ/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9R4M5 
 
Link:https://gitee.com/openeuler/kernel/pulls/8465

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 70052300 55116d5a

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

+2 −2
Original line number Diff line number Diff line
@@ -281,7 +281,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);
@@ -305,7 +305,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,