diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2061-drm-amdgpu-drop-the-incorrect-soft_reset-for-SRIOV.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2061-drm-amdgpu-drop-the-incorrect-soft_reset-for-SRIOV.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2061-drm-amdgpu-drop-the-incorrect-soft_reset-for-SRIOV.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2061-drm-amdgpu-drop-the-incorrect-soft_reset-for-SRIOV.patch new file mode 100644 index 00000000..cf1de819 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2061-drm-amdgpu-drop-the-incorrect-soft_reset-for-SRIOV.patch @@ -0,0 +1,32 @@ +From 0c6b0acbc3fc81cedf9e60b9748bac831bd9871c Mon Sep 17 00:00:00 2001 +From: Monk Liu <Monk.Liu@amd.com> +Date: Fri, 7 Jun 2019 18:56:18 +0800 +Subject: [PATCH 2061/2940] drm/amdgpu: drop the incorrect soft_reset for SRIOV + +It's incorrect to do soft reset for SRIOV, when GFX +hang the WREG would stuck there becuase it goes KIQ way. + +the GPU reset counter is incorrect: always increase twice +for each timedout + +Signed-off-by: Monk Liu <Monk.Liu@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +index 8f5026c123ef..ff6976eaa919 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +@@ -399,7 +399,7 @@ bool amdgpu_ring_soft_recovery(struct amdgpu_ring *ring, unsigned int vmid, + { + ktime_t deadline = ktime_add_us(ktime_get(), 10000); + +- if (!ring->funcs->soft_recovery || !fence) ++ if (amdgpu_sriov_vf(ring->adev) || !ring->funcs->soft_recovery || !fence) + return false; + + atomic_inc(&ring->adev->gpu_reset_counter); +-- +2.17.1 + |