panfrost: Replace panfrost_model_name with model->name

One less place to update GPU IDs.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14726>

diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index fc72f7c..908fb08 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -74,7 +74,7 @@ static const struct debug_named_value panfrost_debug_options[] = {
 static const char *
 panfrost_get_name(struct pipe_screen *screen)
 {
-        return panfrost_model_name(pan_device(screen)->gpu_id);
+        return pan_device(screen)->model->name;
 }
 
 static const char *

diff --git a/src/panfrost/lib/pan_encoder.h b/src/panfrost/lib/pan_encoder.h
index e893601..df953bd 100644 (file)
--- a/src/panfrost/lib/pan_encoder.h
+++ b/src/panfrost/lib/pan_encoder.h
@@ -77,8 +77,6 @@ panfrost_get_total_stack_size(
                 unsigned threads_per_core,
                 unsigned core_count);
 
-const char * panfrost_model_name(unsigned gpu_id);
-
 /* Attributes / instancing */
 
 unsigned

diff --git a/src/panfrost/lib/pan_props.c b/src/panfrost/lib/pan_props.c
index 7ba2ca3..898f990 100644 (file)
--- a/src/panfrost/lib/pan_props.c
+++ b/src/panfrost/lib/pan_props.c
@@ -239,30 +239,6 @@ panfrost_supports_compressed_format(struct panfrost_device *dev, unsigned fmt)
         return dev->compressed_formats & (1 << idx);
 }
 
-/* Given a GPU ID like 0x860, return a prettified model name */
-
-const char *
-panfrost_model_name(unsigned gpu_id)
-{
-        switch (gpu_id) {
-        case 0x600: return "Mali-T600 (Panfrost)";
-        case 0x620: return "Mali-T620 (Panfrost)";
-        case 0x720: return "Mali-T720 (Panfrost)";
-        case 0x820: return "Mali-T820 (Panfrost)";
-        case 0x830: return "Mali-T830 (Panfrost)";
-        case 0x750: return "Mali-T760 (Panfrost)";
-        case 0x860: return "Mali-T860 (Panfrost)";
-        case 0x880: return "Mali-T880 (Panfrost)";
-        case 0x6221: return "Mali-G72 (Panfrost)";
-        case 0x7093: return "Mali-G31 (Panfrost)";
-        case 0x7211: return "Mali-G76 (Panfrost)";
-        case 0x7212: return "Mali-G52 (Panfrost)";
-        case 0x7402: return "Mali-G52 r1 (Panfrost)";
-        default:
-                    unreachable("Invalid GPU ID");
-        }
-}
-
 /* Check for AFBC hardware support. AFBC is introduced in v5. Implementations
  * may omit it, signaled as a nonzero value in the AFBC_FEATURES property. */
 

diff --git a/src/panfrost/vulkan/panvk_device.c b/src/panfrost/vulkan/panvk_device.c
index bf2164c..dd6fb16 100644 (file)
--- a/src/panfrost/vulkan/panvk_device.c
+++ b/src/panfrost/vulkan/panvk_device.c
@@ -316,14 +316,14 @@ panvk_physical_device_init(struct panvk_physical_device *device,
    if (device->pdev.arch < 5) {
       result = vk_errorf(instance, VK_ERROR_INCOMPATIBLE_DRIVER,
                          "%s not supported",
-                         panfrost_model_name(device->pdev.gpu_id));
+                         device->pdev.model->name);
       goto fail;
    }
 
    panvk_arch_dispatch(device->pdev.arch, meta_init, device);
 
    memset(device->name, 0, sizeof(device->name));
-   sprintf(device->name, "%s", panfrost_model_name(device->pdev.gpu_id));
+   sprintf(device->name, "%s", device->pdev.model->name);
 
    if (panvk_device_get_cache_uuid(device->pdev.gpu_id, device->cache_uuid)) {
       result = vk_errorf(instance, VK_ERROR_INITIALIZATION_FAILED,