This is a note to let you know that I've just added the patch titled
drm/amd/pm: Add error log for smu v13.0.6 reset
to the 6.7-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-amd-pm-add-error-log-for-smu-v13.0.6-reset.patch
and it can be found in the queue-6.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 91739a897c12dcec699e53f390be1b4abdeef3a0 Mon Sep 17 00:00:00 2001
From: Lijo Lazar <lijo.lazar@xxxxxxx>
Date: Thu, 11 Jan 2024 09:47:33 +0530
Subject: drm/amd/pm: Add error log for smu v13.0.6 reset
From: Lijo Lazar <lijo.lazar@xxxxxxx>
commit 91739a897c12dcec699e53f390be1b4abdeef3a0 upstream.
For all mode-2 reset fail cases, add error log.
Signed-off-by: Lijo Lazar <lijo.lazar@xxxxxxx>
Reviewed-by: Asad Kamal <asad.kamal@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # 6.7.x
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
@@ -2192,17 +2192,18 @@ static int smu_v13_0_6_mode2_reset(struc
continue;
}
- if (ret) {
- dev_err(adev->dev,
- "failed to send mode2 message \tparam: 0x%08x error code %d\n",
- SMU_RESET_MODE_2, ret);
+ if (ret)
goto out;
- }
+
} while (ret == -ETIME && timeout);
out:
mutex_unlock(&smu->message_lock);
+ if (ret)
+ dev_err(adev->dev, "failed to send mode2 reset, error code %d",
+ ret);
+
return ret;
}
Patches currently in stable-queue which might be from lijo.lazar@xxxxxxx are
queue-6.7/drm-amdgpu-show-vram-vendor-only-if-available.patch
queue-6.7/drm-amd-pm-add-error-log-for-smu-v13.0.6-reset.patch
queue-6.7/drm-amdgpu-pm-fix-the-power-source-flag-error.patch
queue-6.7/drm-amd-pm-fix-smuv13.0.6-current-clock-reporting.patch
queue-6.7/drm-amd-pm-fetch-current-power-limit-from-fw.patch
queue-6.7/drm-amdgpu-avoid-fetching-vram-vendor-information.patch
