This is a note to let you know that I've just added the patch titled
drm/amdgpu: add smu 13 support for smu 13.0.11
to the 6.1-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-add-smu-13-support-for-smu-13.0.11.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 51e7a2168769c2f46edd93a18d4cba4a6d4adb13 Mon Sep 17 00:00:00 2001
From: Yifan Zhang <yifan1.zhang@xxxxxxx>
Date: Wed, 12 Oct 2022 13:16:25 +0800
Subject: drm/amdgpu: add smu 13 support for smu 13.0.11
From: Yifan Zhang <yifan1.zhang@xxxxxxx>
commit 51e7a2168769c2f46edd93a18d4cba4a6d4adb13 upstream.
this patch to add smu 13 support for smu 13.0.11.
Signed-off-by: Yifan Zhang <yifan1.zhang@xxxxxxx>
Reviewed-by: Aaron Liu <aaron.liu@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: "Limonciello, Mario" <Mario.Limonciello@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 ++
2 files changed, 3 insertions(+)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1689,6 +1689,7 @@ static int amdgpu_discovery_set_smu_ip_b
case IP_VERSION(13, 0, 7):
case IP_VERSION(13, 0, 8):
case IP_VERSION(13, 0, 10):
+ case IP_VERSION(13, 0, 11):
amdgpu_device_ip_block_add(adev, &smu_v13_0_ip_block);
break;
default:
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
@@ -250,6 +250,7 @@ int smu_v13_0_check_fw_status(struct smu
switch (adev->ip_versions[MP1_HWIP][0]) {
case IP_VERSION(13, 0, 4):
+ case IP_VERSION(13, 0, 11):
mp1_fw_flags = RREG32_PCIE(MP1_Public |
(smnMP1_V13_0_4_FIRMWARE_FLAGS & 0xffffffff));
break;
@@ -303,6 +304,7 @@ int smu_v13_0_check_fw_version(struct sm
smu->smc_driver_if_version = SMU13_DRIVER_IF_VERSION_YELLOW_CARP;
break;
case IP_VERSION(13, 0, 4):
+ case IP_VERSION(13, 0, 11):
smu->smc_driver_if_version = SMU13_DRIVER_IF_VERSION_SMU_V13_0_4;
break;
case IP_VERSION(13, 0, 5):
Patches currently in stable-queue which might be from yifan1.zhang@xxxxxxx are
queue-6.1/drm-amdgpu-add-gmc-v11-support-for-gc-11.0.4.patch
queue-6.1/drm-amdgpu-discovery-add-psp-ip-v13.0.11-support.patch
queue-6.1/drm-amdgpu-set-gc-11.0.4-family.patch
queue-6.1/drm-amdgpu-discovery-enable-nbio-support-for-nbio-v7.7.1.patch
queue-6.1/drm-amdgpu-enable-psp-ip-v13.0.11-support.patch
queue-6.1/drm-amdgpu-add-gfx-support-for-gc-11.0.4.patch
queue-6.1/drm-amdgpu-pm-enable-swsmu-for-smu-ip-v13.0.11.patch
queue-6.1/drm-amdgpu-discovery-enable-soc21-common-for-gc-11.0.4.patch
queue-6.1/drm-amdgpu-pm-add-gfxoff-control-ip-version-check-for-smu-ip-v13.0.11.patch
queue-6.1/drm-amd-display-disable-s-g-display-on-dcn-3.1.5.patch
queue-6.1/drm-amdgpu-add-smu-13-support-for-smu-13.0.11.patch
queue-6.1/drm-amdgpu-soc21-add-mode2-asic-reset-for-smu-ip-v13.0.11.patch
queue-6.1/drm-amdgpu-discovery-enable-mes-support-for-gc-v11.0.4.patch
queue-6.1/drm-amdgpu-discovery-set-the-apu-flag-for-gc-11.0.4.patch
queue-6.1/drm-amd-display-disable-s-g-display-on-dcn-3.1.4.patch
queue-6.1/drm-amdgpu-discovery-enable-gfx-v11-for-gc-11.0.4.patch
queue-6.1/drm-amdgpu-add-tmz-support-for-gc-11.0.1.patch
queue-6.1/drm-amdgpu-correct-mec-number-for-gfx11-apus.patch
queue-6.1/drm-amdgpu-allow-multipipe-policy-on-asics-with-one-mec.patch
queue-6.1/drm-amdgpu-pm-use-the-specific-mailbox-registers-only-for-smu-ip-v13.0.4.patch
queue-6.1/drm-amdgpu-discovery-enable-gmc-v11-for-gc-11.0.4.patch
