hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c
....@@ -37,7 +37,6 @@
3737 #include "gmc/gmc_8_2_sh_mask.h"
3838 #include "oss/oss_3_0_d.h"
3939 #include "oss/oss_3_0_sh_mask.h"
40
-#include "gca/gfx_8_0_sh_mask.h"
4140 #include "dce/dce_10_0_d.h"
4241 #include "dce/dce_10_0_sh_mask.h"
4342 #include "smu/smu_7_1_3_d.h"
....@@ -516,12 +515,13 @@
516515
517516 /* wait until RCV_MSG become 3 */
518517 if (xgpu_vi_poll_msg(adev, IDH_FLR_NOTIFICATION_CMPL)) {
519
- pr_err("failed to recieve FLR_CMPL\n");
518
+ pr_err("failed to receive FLR_CMPL\n");
520519 return;
521520 }
522521
523522 /* Trigger recovery due to world switch failure */
524
- amdgpu_device_gpu_recover(adev, NULL, false);
523
+ if (amdgpu_device_should_recover_gpu(adev))
524
+ amdgpu_device_gpu_recover(adev, NULL);
525525 }
526526
527527 static int xgpu_vi_set_mailbox_rcv_irq(struct amdgpu_device *adev,
....@@ -579,11 +579,11 @@
579579 {
580580 int r;
581581
582
- r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_LEGACY, 135, &adev->virt.rcv_irq);
582
+ r = amdgpu_irq_add_id(adev, AMDGPU_IRQ_CLIENTID_LEGACY, 135, &adev->virt.rcv_irq);
583583 if (r)
584584 return r;
585585
586
- r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_LEGACY, 138, &adev->virt.ack_irq);
586
+ r = amdgpu_irq_add_id(adev, AMDGPU_IRQ_CLIENTID_LEGACY, 138, &adev->virt.ack_irq);
587587 if (r) {
588588 amdgpu_irq_put(adev, &adev->virt.rcv_irq, 0);
589589 return r;