Skip to contentSkip to conversation

drm/amdgpu: Decrease compute timeout to 10 s for sriov multiple VF

PATCH In review Emily Deng 2 participants 3 messages Jan 7, 2021 – Jan 11, 2021

Subsystems (2)
lore
Share & tools
lore

Emily Deng

author
#0 lore raw

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

From: "Emily.Deng" <[email protected]>

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

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4 -1
index 5527c549db82..35edf58c825d 100644
@@ -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;
Signature · 6 lines
2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#1 lore raw

[AMD Official Use Only - Internal Distribution Only]

Ping .....

Quoted 35 lines

-----Original Message-----
From: Emily Deng <[email protected]>
Sent: Thursday, January 7, 2021 10:51 AM
To: [email protected]
Cc: Deng, Emily <[email protected]>
Subject: [PATCH v2] drm/amdgpu: Decrease compute timeout to 10 s for sriov multiple VF

From: "Emily.Deng" <[email protected]>

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

---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 ++++-

1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -1
index 5527c549db82..35edf58c825d 100644
@@ -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) ?

Quoted 8 lines

+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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#2 lore raw

Am 11.01.21 um 05:54 schrieb Deng, Emily:

Quoted 43 lines

[AMD Official Use Only - Internal Distribution Only]

Ping .....

Quoted 39 lines

-----Original Message-----
From: Emily Deng <[email protected]>
Sent: Thursday, January 7, 2021 10:51 AM
To: [email protected]
Cc: Deng, Emily <[email protected]>
Subject: [PATCH v2] drm/amdgpu: Decrease compute timeout to 10 s for sriov multiple VF

From: "Emily.Deng" <[email protected]>

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

---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 ++++-

1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -1
index 5527c549db82..35edf58c825d 100644
@@ -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);

Quoted 8 lines
Quoted 4 lines

else
adev->compute_timeout = MAX_SCHEDULE_TIMEOUT;
--
2.25.1

_______________________________________________
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