[PATCH v2] drm/amdgpu: Decrease compute timeout to 10 s for sriov multiple VF

[PATCH v2] drm/amdgpu: Decrease compute timeout to 10 s for sriov multiple VF

[Emily Deng]

From: "Emily.Deng" <Emily.Deng@amd.com>

For multiple VF, after engine hang,as host driver will first
encounter FLR, so has no meanning to set compute to 60s.

v2:
   Refine the patch and comment

Signed-off-by: Emily.Deng <Emily.Deng@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 5527c549db82..35edf58c825d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3133,7 +3133,10 @@ static int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev)
 	 */
 	adev->gfx_timeout = msecs_to_jiffies(10000);
 	adev->sdma_timeout = adev->video_timeout = adev->gfx_timeout;
-	if (amdgpu_sriov_vf(adev) || amdgpu_passthrough(adev))
+	if (amdgpu_sriov_vf(adev))
+		adev->compute_timeout = amdgpu_sriov_is_pp_one_vf(adev) ?
+					msecs_to_jiffies(60000) : msecs_to_jiffies(10000);
+	else if (amdgpu_passthrough(adev))
 		adev->compute_timeout =  msecs_to_jiffies(60000);
 	else
 		adev->compute_timeout = MAX_SCHEDULE_TIMEOUT;
-- 
2.25.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH v2] drm/amdgpu: Decrease compute timeout to 10 s for sriov multiple VF

[Deng, Emily]

[AMD Official Use Only - Internal Distribution Only]

Ping .....

>-----Original Message-----
>From: Emily Deng <Emily.Deng@amd.com>
>Sent: Thursday, January 7, 2021 10:51 AM
>To: amd-gfx@lists.freedesktop.org
>Cc: Deng, Emily <Emily.Deng@amd.com>
>Subject: [PATCH v2] drm/amdgpu: Decrease compute timeout to 10 s for sriov
>multiple VF
>
>From: "Emily.Deng" <Emily.Deng@amd.com>
>
>For multiple VF, after engine hang,as host driver will first encounter FLR, so
>has no meanning to set compute to 60s.
>
>v2:
>   Refine the patch and comment
>
>Signed-off-by: Emily.Deng <Emily.Deng@amd.com>
>---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>index 5527c549db82..35edf58c825d 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>@@ -3133,7 +3133,10 @@ static int
>amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev)
>  */
> adev->gfx_timeout = msecs_to_jiffies(10000);
> adev->sdma_timeout = adev->video_timeout = adev->gfx_timeout;
>-if (amdgpu_sriov_vf(adev) || amdgpu_passthrough(adev))
>+if (amdgpu_sriov_vf(adev))
>+adev->compute_timeout =
>amdgpu_sriov_is_pp_one_vf(adev) ?
>+msecs_to_jiffies(60000) :
>msecs_to_jiffies(10000);
>+else if (amdgpu_passthrough(adev))
> adev->compute_timeout =  msecs_to_jiffies(60000);
> else
> adev->compute_timeout = MAX_SCHEDULE_TIMEOUT;
>--
>2.25.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH v2] drm/amdgpu: Decrease compute timeout to 10 s for sriov multiple VF

[Christian König]

Acked-by: Christian König <christian.koenig@amd.com>

Am 11.01.21 um 05:54 schrieb Deng, Emily:
> [AMD Official Use Only - Internal Distribution Only]
>
> Ping .....
>
>> -----Original Message-----
>> From: Emily Deng <Emily.Deng@amd.com>
>> Sent: Thursday, January 7, 2021 10:51 AM
>> To: amd-gfx@lists.freedesktop.org
>> Cc: Deng, Emily <Emily.Deng@amd.com>
>> Subject: [PATCH v2] drm/amdgpu: Decrease compute timeout to 10 s for sriov
>> multiple VF
>>
>> From: "Emily.Deng" <Emily.Deng@amd.com>
>>
>> For multiple VF, after engine hang,as host driver will first encounter FLR, so
>> has no meanning to set compute to 60s.
>>
>> v2:
>>    Refine the patch and comment
>>
>> Signed-off-by: Emily.Deng <Emily.Deng@amd.com>
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> index 5527c549db82..35edf58c825d 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> @@ -3133,7 +3133,10 @@ static int
>> amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev)
>>   */
>> adev->gfx_timeout = msecs_to_jiffies(10000);
>> adev->sdma_timeout = adev->video_timeout = adev->gfx_timeout;
>> -if (amdgpu_sriov_vf(adev) || amdgpu_passthrough(adev))
>> +if (amdgpu_sriov_vf(adev))
>> +adev->compute_timeout =
>> amdgpu_sriov_is_pp_one_vf(adev) ?
>> +msecs_to_jiffies(60000) :
>> msecs_to_jiffies(10000);
>> +else if (amdgpu_passthrough(adev))
>> adev->compute_timeout =  msecs_to_jiffies(60000);
>> else
>> adev->compute_timeout = MAX_SCHEDULE_TIMEOUT;
>> --
>> 2.25.1
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx