drm/amdgpu: put the audio codec into suspend state before gpu reset V3

At default, the autosuspend delay of audio controller is 3S. If the
gpu reset is triggered within 3S(after audio controller idle),
the audio controller may be unable into suspended state. Then
the sudden gpu reset will cause some audio errors. The change
here is targeted to resolve this.

However if the audio controller is in use when the gpu reset
triggered, this change may be still not enough to put the
audio controller into suspend state. Under this case, the
gpu reset will still proceed but there will be a warning
message printed("failed to suspend display audio").

V2: limit this for BACO and mode1 reset only
V3: try 1st to use pm_runtime_autosuspend_expiration() to
    query how much time is left. Use default setting on
    failure

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index b038ddbb2ece7957f20b2aff0d3a6b68c9e10bb9..6f93af972b0ae1cdcd57a6404bac0ca2b08b156a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -68,6 +68,7 @@
 
 #include <linux/suspend.h>
 #include <drm/task_barrier.h>
+#include <linux/pm_runtime.h>
 
 MODULE_FIRMWARE("amdgpu/vega10_gpu_info.bin");
 MODULE_FIRMWARE("amdgpu/vega12_gpu_info.bin");
@@ -4116,6 +4117,64 @@ static void amdgpu_device_unlock_adev(struct amdgpu_device *adev)
        mutex_unlock(&adev->lock_reset);
 }
 
+static void amdgpu_device_resume_display_audio(struct amdgpu_device *adev)
+{
+       struct pci_dev *p = NULL;
+
+       p = pci_get_domain_bus_and_slot(pci_domain_nr(adev->pdev->bus),
+                       adev->pdev->bus->number, 1);
+       if (p) {
+               pm_runtime_enable(&(p->dev));
+               pm_runtime_resume(&(p->dev));
+       }
+}
+
+static int amdgpu_device_suspend_display_audio(struct amdgpu_device *adev)
+{
+       enum amd_reset_method reset_method;
+       struct pci_dev *p = NULL;
+       u64 expires;
+
+       /*
+        * For now, only BACO and mode1 reset are confirmed
+        * to suffer the audio issue without proper suspended.
+        */
+       reset_method = amdgpu_asic_reset_method(adev);
+       if ((reset_method != AMD_RESET_METHOD_BACO) &&
+            (reset_method != AMD_RESET_METHOD_MODE1))
+               return -EINVAL;
+
+       p = pci_get_domain_bus_and_slot(pci_domain_nr(adev->pdev->bus),
+                       adev->pdev->bus->number, 1);
+       if (!p)
+               return -ENODEV;
+
+       expires = pm_runtime_autosuspend_expiration(&(p->dev));
+       if (!expires)
+               /*
+                * If we cannot get the audio device autosuspend delay,
+                * a fixed 4S interval will be used. Considering 3S is
+                * the audio controller default autosuspend delay setting.
+                * 4S used here is guaranteed to cover that.
+                */
+               expires = ktime_get_mono_fast_ns() + NSEC_PER_SEC * 4L;
+
+       while (!pm_runtime_status_suspended(&(p->dev))) {
+               if (!pm_runtime_suspend(&(p->dev)))
+                       break;
+
+               if (expires < ktime_get_mono_fast_ns()) {
+                       dev_warn(adev->dev, "failed to suspend display audio\n");
+                       /* TODO: abort the succeeding gpu reset? */
+                       return -ETIMEDOUT;
+               }
+       }
+
+       pm_runtime_disable(&(p->dev));
+
+       return 0;
+}
+
 /**
  * amdgpu_device_gpu_recover - reset the asic and recover scheduler
  *
@@ -4140,6 +4199,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
        bool use_baco =
                (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) ?
                true : false;
+       bool audio_suspended = false;
 
        /*
         * Flush RAM to disk so that after reboot
@@ -4197,6 +4257,19 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
                        return 0;
                }
 
+               /*
+                * Try to put the audio codec into suspend state
+                * before gpu reset started.
+                *
+                * Due to the power domain of the graphics device
+                * is shared with AZ power domain. Without this,
+                * we may change the audio hardware from behind
+                * the audio driver's back. That will trigger
+                * some audio codec errors.
+                */
+               if (!amdgpu_device_suspend_display_audio(tmp_adev))
+                       audio_suspended = true;
+
                amdgpu_ras_set_error_query_ready(tmp_adev, false);
 
                cancel_delayed_work_sync(&tmp_adev->delayed_init_work);
@@ -4309,6 +4382,8 @@ skip_sched_resume:
                /*unlock kfd: SRIOV would do it separately */
                if (!(in_ras_intr && !use_baco) && !amdgpu_sriov_vf(tmp_adev))
                        amdgpu_amdkfd_post_reset(tmp_adev);
+               if (audio_suspended)
+                       amdgpu_device_resume_display_audio(tmp_adev);
                amdgpu_device_unlock_adev(tmp_adev);
        }