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

!9049 [sync] PR-8774: CVE-2024-36914 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/8774 
 
PR sync from: Yongqiang Liu <liuyongqiang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/N2D666EBLSCRL4ZATEMGLNPVWZNF4O76/ 
Alex Hung (1):
  drm/amd/display: Skip on writeback when it's not applicable


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I9U8NY 
 
Link:https://gitee.com/openeuler/kernel/pulls/9049

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents cd27f7ad 0d090315

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

+6 −0
Original line number Diff line number Diff line
@@ -2050,6 +2050,9 @@ static int dm_resume(void *handle) 
	/* Do detection*/

	drm_connector_list_iter_begin(ddev, &iter);

	drm_for_each_connector_iter(connector, &iter) {

		if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)

			continue;



		aconnector = to_amdgpu_dm_connector(connector);



		/*
@@ -7527,6 +7530,9 @@ static void amdgpu_dm_commit_audio(struct drm_device *dev, 
			continue;



	notify:

		if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)

			continue;



		aconnector = to_amdgpu_dm_connector(connector);



		mutex_lock(&adev->dm.audio_lock);