diff options
| author | Philip Yang <Philip.Yang@amd.com> | 2026-02-03 19:26:44 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-02-06 16:48:29 +0100 |
| commit | a3f75ee1a436edfe87c4de66bfe58e7233a59da4 (patch) | |
| tree | 3824281b4e4c769a3b4d1e924f4163ac20fc73b5 | |
| parent | 21bad75012f76337022eeb00dadcaa07aa89f1f7 (diff) | |
| download | linux-a3f75ee1a436edfe87c4de66bfe58e7233a59da4.tar.gz linux-a3f75ee1a436edfe87c4de66bfe58e7233a59da4.tar.bz2 linux-a3f75ee1a436edfe87c4de66bfe58e7233a59da4.zip | |
drm/amdkfd: Don't use sw fault filter if retry cam enabled
[ Upstream commit e61801f162ddcf8874c820639483ec4849b0fb0b ]
If retry cam enabled, we don't use sw retry fault filter and add fault
into sw filter ring, so we shouldn't remove fault from sw filter.
Signed-off-by: Philip Yang <Philip.Yang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Stable-dep-of: 8b1ecc9377bc ("drm/amdgpu: fix NULL pointer dereference in amdgpu_gmc_filter_faults_remove")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c index 0b6a0e149f1c..9b225acdcf97 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c @@ -452,7 +452,10 @@ void amdgpu_gmc_filter_faults_remove(struct amdgpu_device *adev, uint64_t addr, uint32_t hash; uint64_t tmp; - ih = adev->irq.retry_cam_enabled ? &adev->irq.ih_soft : &adev->irq.ih1; + if (adev->irq.retry_cam_enabled) + return; + + ih = &adev->irq.ih1; /* Get the WPTR of the last entry in IH ring */ last_wptr = amdgpu_ih_get_wptr(adev, ih); /* Order wptr with ring data. */ |