drm/amdkfd: Add GFX 12.1.0 support in KFD

Add support for GFX 12.1.0 in KFD.

Signed-off-by: Mukul Joshi <mukul.joshi@amd.com>
Reviewed-by: Alex Sierra <alex.sierra@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
index 4a7180b46b7195a0848ba5b00b4bb54b17a2ca6e..5f2dd378936ed96ef4247d4df22051fe94b91001 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
@@ -1712,6 +1712,7 @@ int kfd_get_gpu_cache_info(struct kfd_node *kdev, struct kfd_gpu_cache_info **pc
                        fallthrough;
                case IP_VERSION(12, 0, 0):
                case IP_VERSION(12, 0, 1):
+               case IP_VERSION(12, 1, 0):
                        num_of_cache_types =
                                kfd_fill_gpu_cache_info_from_gfx_config(kdev->kfd,
                                                                        cache_line_size_missing,

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 9f183d27a0ef9b6a33083348833166b1bccd3d8d..759b3cc814f95cba787286362c4fe8abcd4e185d 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -445,6 +445,10 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf)
                        gfx_target_version = 120001;
                        f2g = &gfx_v12_kfd2kgd;
                        break;
+               case IP_VERSION(12, 1, 0):
+                       gfx_target_version = 120500;
+                       f2g = &gfx_v12_kfd2kgd;
+                       break;
                default:
                        break;
                }
@@ -749,7 +753,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
         * If the VMID range changes for multi-partition capable GPUs, then
         * this code MUST be revisited.
         */
-       if (kfd->adev->xcp_mgr) {
+       if (kfd->adev->xcp_mgr && (KFD_GC_VERSION(kfd) != IP_VERSION(12, 1, 0))) {
                partition_mode = amdgpu_xcp_query_partition_mode(kfd->adev->xcp_mgr,
                                                                 AMDGPU_XCP_FL_LOCKED);
                if (partition_mode == AMDGPU_CPX_PARTITION_MODE &&