drm/amdgpu: put the audio codec into suspend state before gpu reset
Subsystems (2)
PATCH 1/1 drm/amdgpu: put the audio codec into suspend state before gpu reset
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").
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +60 -0
@@ -69,6 +69,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" );
@@ -4146,6 +4147,49 @@ 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) +{ +struct pci_dev *p =NULL ; +unsigned long end_jiffies; + + p =pci_get_domain_bus_and_slot (pci_domain_nr (adev->pdev->bus), + adev->pdev->bus->number,1 ); +if (!p) +return -ENODEV ; + +/* +* 3S is the audio controller default autosuspend delay setting. +* 4S used here is guaranteed to cover that. +*/ + end_jiffies =msecs_to_jiffies (4000 ) + jiffies; +while (!pm_runtime_status_suspended (&(p->dev))) { +if (!pm_runtime_suspend (&(p->dev))) +break ; + +if (time_after (jiffies, end_jiffies)) { +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 *
@@ -4170,6 +4214,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
@@ -4227,6 +4272,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);
@@ -4339,6 +4397,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,/*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); }
Signature · 6 lines
2.26.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 47 lines · Evan Quan
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").Change-Id I33d85e6fcad1882eb33f9cde8916d57be8d5a87aSigned-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +13
-0@@ -69,6 +69,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" );@@ -4146,6 +4147,49 @@ 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)); + } +} +
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static void amdgpu_device_unlock_adev(struct amdgpu_device *adev) · line 4171
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +10
-0+static int amdgpu_device_suspend_display_audio (struct amdgpu_device *adev) +{ +struct pci_dev *p =NULL ; +unsigned long end_jiffies; + + p =pci_get_domain_bus_and_slot (pci_domain_nr (adev->pdev->bus), + adev->pdev->bus->number,1 ); +if (!p) +return -ENODEV ; +
With mode1 reset affect this or just BACO? If it's just BACO, we should check the reset method here and return an error if not using BACO.
Alex
Quoted 64 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +37
-1+/* +* 3S is the audio controller default autosuspend delay setting. +* 4S used here is guaranteed to cover that. +*/ + end_jiffies =msecs_to_jiffies (4000 ) + jiffies; +while (!pm_runtime_status_suspended (&(p->dev))) { +if (!pm_runtime_suspend (&(p->dev))) +break ; + +if (time_after (jiffies, end_jiffies)) { +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 * @@ -4170,6 +4214,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 @@ -4227,6 +4272,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);@@ -4339,6 +4397,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,/*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); } --2.26.2
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Mode1 reset is also affected as I confirmed on navi10 unfortunately.
That is why the original design(switch to mode1 reset on audio suspended failure) over our previous discussions was not taken. Anyway, I sent out a V2 patch to limit this for baco and mode1 reset only.
Regards,
Evan
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Wednesday, April 22, 2020 4:18 AM
To: Quan, Evan <[email protected]>
Cc: amd-gfx list <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: put the audio codec into suspend state before gpu reset
Quoted 48 lines · Evan Quan
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").Change-Id I33d85e6fcad1882eb33f9cde8916d57be8d5a87aSigned-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +13
-0@@ -69,6 +69,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" );@@ -4146,6 +4147,49 @@ 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)); + } +} +
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static void amdgpu_device_unlock_adev(struct amdgpu_device *adev) · line 4170
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +10
-0+static int amdgpu_device_suspend_display_audio (struct amdgpu_device +*adev) { +struct pci_dev *p =NULL ; +unsigned long end_jiffies; + + p =pci_get_domain_bus_and_slot (pci_domain_nr (adev->pdev->bus), + adev->pdev->bus->number,1 ); +if (!p) +return -ENODEV ; +
With mode1 reset affect this or just BACO? If it's just BACO, we should check the reset method here and return an error if not using BACO.
Alex
Quoted 65 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +22
-0+/* +* 3S is the audio controller default autosuspend delay setting. +* 4S used here is guaranteed to cover that. +*/ + end_jiffies =msecs_to_jiffies (4000 ) + jiffies; +while (!pm_runtime_status_suspended (&(p->dev))) { +if (!pm_runtime_suspend (&(p->dev))) +break ; + +if (time_after (jiffies, end_jiffies)) { +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 * @@ -4170,6 +4214,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 @@ -4227,6 +4272,19 @@ int amdgpu_device_gpu_recover(struct
amdgpu_device*adev,return 0; }drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +13
-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);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-1@@ -4339,6 +4397,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,/*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); } --2.26.2
Quoted 8 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cev an.quan%40amd.com%7C80f38047896c44b7762308d7e63120f2%7C3dd8961fe4884e6 08e11a82d994e183d%7C0%7C0%7C637230971017390822&sdata=K9FOP93vhfOmw ZnXIo%2FMiKEWPlvtnV5csCwiZZYmF5M%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx