This is a note to let you know that I've just added the patch titled
drm/amdgpu: check RAS irq existence for VCN/JPEG
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-check-ras-irq-existence-for-vcn-jpeg.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From stable-owner@xxxxxxxxxxxxxxx Fri Jul 7 17:08:18 2023
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Fri, 7 Jul 2023 11:07:32 -0400
Subject: drm/amdgpu: check RAS irq existence for VCN/JPEG
To: <stable@xxxxxxxxxxxxxxx>
Cc: <mario.limonciello@xxxxxxx>, Tao Zhou <tao.zhou1@xxxxxxx>, Hawking Zhang <Hawking.Zhang@xxxxxxx>, Alex Deucher <alexander.deucher@xxxxxxx>
Message-ID: <20230707150734.746135-7-alexander.deucher@xxxxxxx>
From: Tao Zhou <tao.zhou1@xxxxxxx>
commit 4ff96bcc0d40b66bf3ddd6010830e9a4f9b85d53 upstream
No RAS irq is allowed.
Signed-off-by: Tao Zhou <tao.zhou1@xxxxxxx>
Reviewed-by: Hawking Zhang <Hawking.Zhang@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # 6.1.x
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 3 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
@@ -251,7 +251,8 @@ int amdgpu_jpeg_ras_late_init(struct amd
if (amdgpu_ras_is_supported(adev, ras_block->block)) {
for (i = 0; i < adev->jpeg.num_jpeg_inst; ++i) {
- if (adev->jpeg.harvest_config & (1 << i))
+ if (adev->jpeg.harvest_config & (1 << i) ||
+ !adev->jpeg.inst[i].ras_poison_irq.funcs)
continue;
r = amdgpu_irq_get(adev, &adev->jpeg.inst[i].ras_poison_irq, 0);
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -1191,7 +1191,8 @@ int amdgpu_vcn_ras_late_init(struct amdg
if (amdgpu_ras_is_supported(adev, ras_block->block)) {
for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
- if (adev->vcn.harvest_config & (1 << i))
+ if (adev->vcn.harvest_config & (1 << i) ||
+ !adev->vcn.inst[i].ras_poison_irq.funcs)
continue;
r = amdgpu_irq_get(adev, &adev->vcn.inst[i].ras_poison_irq, 0);
Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are
queue-6.4/drm-amd-pm-revise-the-aspm-settings-for-thunderbolt-attached-scenario.patch
queue-6.4/drm-amdgpu-make-sure-that-bos-have-a-backing-store.patch
queue-6.4/drm-amd-pm-add-abnormal-fan-detection-for-smu-13.0.0.patch
queue-6.4/drm-amdgpu-check-ras-irq-existence-for-vcn-jpeg.patch
queue-6.4/drm-amdgpu-sdma4-set-align-mask-to-255.patch
queue-6.4/drm-amdgpu-make-sure-bos-are-locked-in-amdgpu_vm_get_memory.patch
queue-6.4/drm-amdgpu-skip-mark-offset-for-high-priority-rings.patch
