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

!11396 [sync] PR-11324: drm/amd/display: Add null checker before passing variables 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/11324 
 
PR sync from: Tong Tiangen <tongtiangen@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LAUGV5QIHRSIWEJHB4OKBEESMGMXBBRF/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAMMTJ 
 
Link:https://gitee.com/openeuler/kernel/pulls/11396

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 29f0a005 cd97e5c9

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

+6 −3
Original line number Diff line number Diff line
@@ -1778,6 +1778,7 @@ static int dm_suspend(void *handle) 
		mutex_lock(&dm->dc_lock);

		dm->cached_dc_state = dc_copy_state(dm->dc->current_state);



		if (dm->cached_dc_state)

			dm_gpureset_toggle_interrupts(adev, dm->cached_dc_state, false);



		amdgpu_dm_commit_zero_streams(dm->dc);
@@ -5343,6 +5344,7 @@ static void create_eml_sink(struct amdgpu_dm_connector *aconnector) 
		aconnector->dc_sink = aconnector->dc_link->local_sink ?

		aconnector->dc_link->local_sink :

		aconnector->dc_em_sink;

		if (aconnector->dc_sink)

			dc_sink_retain(aconnector->dc_sink);

	}

}
@@ -6483,6 +6485,7 @@ static int amdgpu_dm_connector_get_modes(struct drm_connector *connector) 
				drm_add_modes_noedid(connector, 640, 480);

	} else {

		amdgpu_dm_connector_ddc_get_modes(connector, edid);

		if (encoder)

			amdgpu_dm_connector_add_common_modes(encoder, connector);

	}

	amdgpu_dm_fbc_init(connector);