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

!7949 drm/amdgpu: handle the case of pci_channel_io_frozen only in amdgpu_pci_resume 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiongfeng Wang <wangxiongfeng2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/32GLZGFXGE76ZUXB4JMYKCBUXZO5PU3P/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9R4NB 
 
Link:https://gitee.com/openeuler/kernel/pulls/7949

 

Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 39d3b213 f3973d8b

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -997,6 +997,7 @@ struct amdgpu_device { 


	bool                            in_pci_err_recovery;

	struct pci_saved_state          *pci_state;

	pci_channel_state_t		pci_channel_state;

};



static inline struct amdgpu_device *drm_to_adev(struct drm_device *ddev)

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+6 −0
Original line number Diff line number Diff line
@@ -4932,6 +4932,8 @@ pci_ers_result_t amdgpu_pci_error_detected(struct pci_dev *pdev, pci_channel_sta 
		return PCI_ERS_RESULT_DISCONNECT;

	}



	adev->pci_channel_state = state;



	switch (state) {

	case pci_channel_io_normal:

		return PCI_ERS_RESULT_CAN_RECOVER;
@@ -5067,6 +5069,10 @@ void amdgpu_pci_resume(struct pci_dev *pdev) 


	DRM_INFO("PCI error: resume callback!!\n");



	/* Only continue execution for the case of pci_channel_io_frozen */

	if (adev->pci_channel_state != pci_channel_io_frozen)

		return;



	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {

		struct amdgpu_ring *ring = adev->rings[i];