drm/amdkfd: Basic SDMA and cache info changes for GFX12.

Added GFX12 support to a few switch statements.

Signed-off-by: David Belanger <david.belanger@amd.com>
Reviewed-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@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 5141d970d591cfbfa9543023c050665c494d1108..71150d503dc73c1c0a654a9867a97d5e5bc1260d 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
@@ -1678,6 +1678,8 @@ int kfd_get_gpu_cache_info(struct kfd_node *kdev, struct kfd_gpu_cache_info **pc
                case IP_VERSION(11, 0, 4):
                case IP_VERSION(11, 5, 0):
                case IP_VERSION(11, 5, 1):
+               case IP_VERSION(12, 0, 0):
+               case IP_VERSION(12, 0, 1):
                        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 f622f96719ec5675c5995d8f945e3b7598aa1c4f..822774c46d80791ade458776f7cd83d9966eacb8 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -98,6 +98,8 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)
        case IP_VERSION(6, 0, 3):
        case IP_VERSION(6, 1, 0):
        case IP_VERSION(6, 1, 1):
+       case IP_VERSION(7, 0, 0):
+       case IP_VERSION(7, 0, 1):
                kfd->device_info.num_sdma_queues_per_engine = 8;
                break;
        default:
@@ -116,6 +118,8 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)
        case IP_VERSION(6, 0, 3):
        case IP_VERSION(6, 1, 0):
        case IP_VERSION(6, 1, 1):
+       case IP_VERSION(7, 0, 0):
+       case IP_VERSION(7, 0, 1):
                /* 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; ... */