drm/amdkfd: add KFD support for GC 11.5.0

Enable KFD for GC 11.5.0.

Signed-off-by: Lang Yu <Lang.Yu@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 86fb7ac7982a1d633d83eeec8e6fde1065a02b35..2e9612cf56ae0a27c75a592c009d858b84737693 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
@@ -1522,6 +1522,7 @@ int kfd_get_gpu_cache_info(struct kfd_node *kdev, struct kfd_gpu_cache_info **pc
                case IP_VERSION(11, 0, 2):
                case IP_VERSION(11, 0, 3):
                case IP_VERSION(11, 0, 4):
+               case IP_VERSION(11, 5, 0):
                        num_of_cache_types =
                                kfd_fill_gpu_cache_info_from_gfx_config(kdev->kfd, *pcache_info);
                        break;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 93ce181eb3baa0fcf9812d99991ea46e4d7caf89..ab4a63bb3e3edaab8bb31e2186afdee62c90677c 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -95,6 +95,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)
        case IP_VERSION(6, 0, 1):
        case IP_VERSION(6, 0, 2):
        case IP_VERSION(6, 0, 3):
+       case IP_VERSION(6, 1, 0):
                kfd->device_info.num_sdma_queues_per_engine = 8;
                break;
        default:
@@ -111,6 +112,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)
        case IP_VERSION(6, 0, 1):
        case IP_VERSION(6, 0, 2):
        case IP_VERSION(6, 0, 3):
+       case IP_VERSION(6, 1, 0):
                /* Reserve 1 for paging and 1 for gfx */
                kfd->device_info.num_reserved_sdma_queues_per_engine = 2;
                /* BIT(0)=engine-0 queue-0; BIT(1)=engine-1 queue-0; BIT(2)=engine-0 queue-1; ... */
@@ -162,6 +164,7 @@ static void kfd_device_info_set_event_interrupt_class(struct kfd_dev *kfd)
        case IP_VERSION(11, 0, 2):
        case IP_VERSION(11, 0, 3):
        case IP_VERSION(11, 0, 4):
+       case IP_VERSION(11, 5, 0):
                kfd->device_info.event_interrupt_class = &event_interrupt_class_v11;
                break;
        default:
@@ -413,6 +416,10 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf)
                                gfx_target_version = 110001;
                        f2g = &gfx_v11_kfd2kgd;
                        break;
+               case IP_VERSION(11, 5, 0):
+                       gfx_target_version = 110500;
+                       f2g = &gfx_v11_kfd2kgd;
+                       break;
                default:
                        break;
                }