From: jsg <jsg@openbsd.org>
Date: Fri, 31 Mar 2023 02:14:03 +0000 (+0000)
Subject: drm/amdkfd: add GC 11.0.4 KFD support
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=55c5374fb822147ed3e30be3504ffbdfb8cf8b11;p=openbsd

drm/amdkfd: add GC 11.0.4 KFD support

From Yifan Zhang
132f1d39439142547d9d5e45d7744d375dd21fdc in linux-6.1.y/6.1.22
88c21c2b56aa21dd34290d43ada74033dc3bfe35 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/amdkfd/kfd_crat.c b/sys/dev/pci/drm/amd/amdkfd/kfd_crat.c
index 97700cb1bbe..f522e1c90dd 100644
--- a/sys/dev/pci/drm/amd/amdkfd/kfd_crat.c
+++ b/sys/dev/pci/drm/amd/amdkfd/kfd_crat.c
@@ -1522,6 +1522,7 @@ int kfd_get_gpu_cache_info(struct kfd_dev *kdev, struct kfd_gpu_cache_info **pca
 		case IP_VERSION(11, 0, 1):
 		case IP_VERSION(11, 0, 2):
 		case IP_VERSION(11, 0, 3):
+		case IP_VERSION(11, 0, 4):
 			num_of_cache_types =
 				kfd_fill_gpu_cache_info_from_gfx_config(kdev, *pcache_info);
 			break;
diff --git a/sys/dev/pci/drm/amd/amdkfd/kfd_device.c b/sys/dev/pci/drm/amd/amdkfd/kfd_device.c
index a75e1af7736..27820f0a282 100644
--- a/sys/dev/pci/drm/amd/amdkfd/kfd_device.c
+++ b/sys/dev/pci/drm/amd/amdkfd/kfd_device.c
@@ -154,6 +154,7 @@ static void kfd_device_info_set_event_interrupt_class(struct kfd_dev *kfd)
 	case IP_VERSION(11, 0, 1):
 	case IP_VERSION(11, 0, 2):
 	case IP_VERSION(11, 0, 3):
+	case IP_VERSION(11, 0, 4):
 		kfd->device_info.event_interrupt_class = &event_interrupt_class_v11;
 		break;
 	default:
@@ -396,6 +397,7 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf)
 			f2g = &gfx_v11_kfd2kgd;
 			break;
 		case IP_VERSION(11, 0, 1):
+		case IP_VERSION(11, 0, 4):
 			gfx_target_version = 110003;
 			f2g = &gfx_v11_kfd2kgd;
 			break;