<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Reviewed-by: Alex Deucher <alexander.deucher@amd.com><br>
</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Monk Liu <Monk.Liu@amd.com><br>
<b>Sent:</b> Monday, June 10, 2019 2:37 AM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org<br>
<b>Cc:</b> Liu, Monk<br>
<b>Subject:</b> [PATCH] drm/amdgpu: drop the incorrect soft_reset for SRIOV</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">It's incorrect to do soft reset for SRIOV, when GFX<br>
hang the WREG would stuck there becuase it goes KIQ way.<br>
<br>
the GPU reset counter is incorrect: always increase twice<br>
for each timedout<br>
<br>
Signed-off-by: Monk Liu <Monk.Liu@amd.com><br>
---<br>
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +-<br>
1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c<br>
index 8f5026c..ff6976e 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c<br>
@@ -399,7 +399,7 @@ bool amdgpu_ring_soft_recovery(struct amdgpu_ring *ring, unsigned int vmid,<br>
{<br>
ktime_t deadline = ktime_add_us(ktime_get(), 10000);<br>
<br>
- if (!ring->funcs->soft_recovery || !fence)<br>
+ if (amdgpu_sriov_vf(ring->adev) || !ring->funcs->soft_recovery || !fence)<br>
return false;<br>
<br>
atomic_inc(&ring->adev->gpu_reset_counter);<br>
-- <br>
2.7.4<br>
<br>
_______________________________________________<br>
amd-gfx mailing list<br>
amd-gfx@lists.freedesktop.org<br>
<a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a></div>
</span></font></div>
</body>
</html>