From: jsg <jsg@openbsd.org>
Date: Wed, 25 Jan 2023 02:25:26 +0000 (+0000)
Subject: drm/amdgpu: add smu 13 support for smu 13.0.11
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=38e2d31838f12533cd7ed6f57e8f0f14482dcc33;p=openbsd

drm/amdgpu: add smu 13 support for smu 13.0.11

From Yifan Zhang
6ed56b86918d27f72b2cf283dcec6bb822813bc5 in linux-6.1.y/6.1.8
51e7a2168769c2f46edd93a18d4cba4a6d4adb13 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_discovery.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_discovery.c
index ba4fe409c48..bc1ff93c553 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1702,6 +1702,7 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev)
 	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:
diff --git a/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0.c
index 7ecda2b2f12..bc2c9f5b2a2 100644
--- a/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+++ b/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0.c
@@ -250,6 +250,7 @@ int smu_v13_0_check_fw_status(struct smu_context *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 smu_context *smu)
 		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):