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

!12827 drm/amd/display: Check null pointers before using them 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Zucheng <zhengzucheng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/GFFWKYANJPFA6ZO4B3JUI2762ONEP6GR/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRD7 
 
Link:https://gitee.com/openeuler/kernel/pulls/12827

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 7c32c286 afd9b9f4

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+7 −3
Original line number Diff line number Diff line
@@ -6606,6 +6606,9 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector, 
	int requested_bpc = drm_state ? drm_state->max_requested_bpc : 8;

	enum dc_status dc_result = DC_OK;



	if (!dm_state)

		return NULL;



	do {

		stream = create_stream_for_sink(aconnector, drm_mode,

						dm_state, old_stream,
@@ -8832,6 +8835,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 


			DRM_INFO("[HDCP_DM] hdcp_update_display enable_encryption = %x\n", enable_encryption);



			if (aconnector->dc_link)

				hdcp_update_display(

					adev->dm.hdcp_workqueue, aconnector->dc_link->link_index, aconnector,

					new_con_state->hdcp_content_type, enable_encryption);