[PATCH 1/2] drm/amdgpu: enhance amdgpu_vcn_suspend

[James Zhu]

On 2021-05-17 3:43 p.m., Christian König wrote:
> Am 17.05.21 um 16:57 schrieb James Zhu:
>> During vcn suspends, stop ring continue to receive new requests,
>> and try to wait for all vcn jobs to finish gracefully.
>>
>> Signed-off-by: James Zhu <James.Zhu at amd.com>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 20 +++++++++++++++++++-
>>   1 file changed, 19 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c 
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>> index 2016459..7e9f5cb 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>> @@ -275,9 +275,27 @@ int amdgpu_vcn_suspend(struct amdgpu_device *adev)
>>   {
>>       unsigned size;
>>       void *ptr;
>> +    int retry_max = 6;
>>       int i;
>>   -    cancel_delayed_work_sync(&adev->vcn.idle_work);
>> +    for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
>> +        if (adev->vcn.harvest_config & (1 << i))
>> +            continue;
>> +        ring = &adev->vcn.inst[i].ring_dec;
>> +        ring->sched.ready = false;
>> +
>> +        for (j = 0; j < adev->vcn.num_enc_rings; ++j) {
>> +            ring = &adev->vcn.inst[i].ring_enc[j];
>> +            ring->sched.ready = false;
>> +        }
>> +    }
>> +
>> +    while (retry_max--) {
>> +        if (cancel_delayed_work_sync(&adev->vcn.idle_work)) {
>> +            dev_warn(adev->dev, "Waiting for left VCN job(s) to 
>> finish gracefully ...");
>> +            mdelay(5);
>> +        }
>> +    }
>
> Ok that just makes no sense at all.
>
> A cancel_delayed_work_sync() call is final, you never need to call it 
> more than once.
>
yeah, I am preparing a new patch. Thanks! James
> Christian.
>
>>         for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
>>           if (adev->vcn.harvest_config & (1 << i))
>