drm/amdkfd: add GC 11.0.1 KFD support

Add initial support for GC 11.0.1 in KFD compute driver.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@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 765602a2cb4712833de5edfb434250c831b61526..5e9adbc71bbd3980739a87d1268974380d122aab 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
@@ -1520,6 +1520,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev,
                        num_of_cache_types = ARRAY_SIZE(yellow_carp_cache_info);
                        break;
                case IP_VERSION(11, 0, 0):
+               case IP_VERSION(11, 0, 1):
                case IP_VERSION(11, 0, 2):
                        pcache_info = cache_info;
                        num_of_cache_types =

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index ad41e6018ccdcd868aa3d9488fb6416719d1d111..f1a225a20719bcfba3b64153894c554eadf1b307 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -73,6 +73,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)
        case IP_VERSION(4, 1, 2):/* RENOIR */
        case IP_VERSION(5, 2, 1):/* VANGOGH */
        case IP_VERSION(5, 2, 3):/* YELLOW_CARP */
+       case IP_VERSION(6, 0, 1):
                kfd->device_info.num_sdma_queues_per_engine = 2;
                break;
        case IP_VERSION(4, 2, 0):/* VEGA20 */
@@ -99,6 +100,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)
 
        switch (sdma_version) {
        case IP_VERSION(6, 0, 0):
+       case IP_VERSION(6, 0, 1):
        case IP_VERSION(6, 0, 2):
                /* Reserve 1 for paging and 1 for gfx */
                kfd->device_info.num_reserved_sdma_queues_per_engine = 2;
@@ -137,6 +139,7 @@ static void kfd_device_info_set_event_interrupt_class(struct kfd_dev *kfd)
                kfd->device_info.event_interrupt_class = &event_interrupt_class_v9;
                break;
        case IP_VERSION(11, 0, 0):
+       case IP_VERSION(11, 0, 1):
        case IP_VERSION(11, 0, 2):
                kfd->device_info.event_interrupt_class = &event_interrupt_class_v11;
                break;
@@ -369,6 +372,10 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf)
                        gfx_target_version = 110000;
                        f2g = &gfx_v11_kfd2kgd;
                        break;
+               case IP_VERSION(11, 0, 1):
+                       gfx_target_version = 110003;
+                       f2g = &gfx_v11_kfd2kgd;
+                       break;
                case IP_VERSION(11, 0, 2):
                        gfx_target_version = 110002;
                        f2g = &gfx_v11_kfd2kgd;