[PATCH v6 5/5] drm/amdgpu: do not resume device in thaw for normal hibernation

[Mario Limonciello]

On 7/10/2025 8:20 AM, Christian König wrote:
> On 10.07.25 14:13, Mario Limonciello wrote:
>> On 7/10/2025 2:23 AM, Samuel Zhang wrote:
>>> For normal hibernation, GPU do not need to be resumed in thaw since it is
>>> not involved in writing the hibernation image. Skip resume in this case
>>> can reduce the hibernation time.
>>>
>>> On VM with 8 * 192GB VRAM dGPUs, 98% VRAM usage and 1.7TB system memory,
>>> this can save 50 minutes.
>>>
>>> Signed-off-by: Samuel Zhang <guoqing.zhang at amd.com>
>>> Tested-by: Mario Limonciello <mario.limonciello at amd.com>
>> Reviewed-by: Mario Limonciello <mario.limonciello at amd.com>
> 
> I think we now have reviews and acks for all patches, don't we?

Yeah we do.

> 
> What was the conclusion on how this should go upstream? Through drm-misc-next?
> 
> I've seen that you asked Mario, but I think I missed the response.
> 

It hasn't been discussed, but we have Acks on all of the non-drm patches 
so it seems most reasonable to me.

I'll give it a few hours today and If there is no opposition I'll commit 
it there later today.

> Regards,
> Christian.
> 
>>
>>> ---
>>>    drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 17 +++++++++++++++++
>>>    1 file changed, 17 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>>> index 1c54b2e5a225..021defca9b61 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>>> @@ -2541,6 +2541,10 @@ amdgpu_pci_shutdown(struct pci_dev *pdev)
>>>        if (amdgpu_ras_intr_triggered())
>>>            return;
>>>    +    /* device maybe not resumed here, return immediately in this case */
>>> +    if (adev->in_s4 && adev->in_suspend)
>>> +        return;
>>> +
>>>        /* if we are running in a VM, make sure the device
>>>         * torn down properly on reboot/shutdown.
>>>         * unfortunately we can't detect certain
>>> @@ -2557,6 +2561,10 @@ static int amdgpu_pmops_prepare(struct device *dev)
>>>        struct drm_device *drm_dev = dev_get_drvdata(dev);
>>>        struct amdgpu_device *adev = drm_to_adev(drm_dev);
>>>    +    /* device maybe not resumed here, return immediately in this case */
>>> +    if (adev->in_s4 && adev->in_suspend)
>>> +        return 0;
>>> +
>>>        /* Return a positive number here so
>>>         * DPM_FLAG_SMART_SUSPEND works properly
>>>         */
>>> @@ -2655,12 +2663,21 @@ static int amdgpu_pmops_thaw(struct device *dev)
>>>    {
>>>        struct drm_device *drm_dev = dev_get_drvdata(dev);
>>>    +    /* do not resume device if it's normal hibernation */
>>> +    if (!pm_hibernate_is_recovering())
>>> +        return 0;
>>> +
>>>        return amdgpu_device_resume(drm_dev, true);
>>>    }
>>>      static int amdgpu_pmops_poweroff(struct device *dev)
>>>    {
>>>        struct drm_device *drm_dev = dev_get_drvdata(dev);
>>> +    struct amdgpu_device *adev = drm_to_adev(drm_dev);
>>> +
>>> +    /* device maybe not resumed here, return immediately in this case */
>>> +    if (adev->in_s4 && adev->in_suspend)
>>> +        return 0;
>>>          return amdgpu_device_suspend(drm_dev, true);
>>>    }
>>
>