diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index 4444df2589ee4073679059e186bb34671fb0db8e..a043fbe4df9b9b65aa1b2cffea89e0362997591e 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -85,7 +85,7 @@ static const struct debug_named_value panfrost_debug_options[] = {
 static const char *
 panfrost_get_name(struct pipe_screen *screen)
 {
-   return pan_device(screen)->model->name;
+   return pan_screen(screen)->renderer_string;
 }
 
 static const char *
@@ -817,6 +817,9 @@ panfrost_create_screen(int fd, const struct pipe_screen_config *config,
       return NULL;
    }
 
+   snprintf(screen->renderer_string, sizeof(screen->renderer_string),
+            "%s (Panfrost)", dev->model->name);
+
    screen->force_afbc_packing = dev->debug & PAN_DBG_FORCE_PACK;
    if (!screen->force_afbc_packing)
       screen->force_afbc_packing = driQueryOptionb(config->options,
diff --git a/src/gallium/drivers/panfrost/pan_screen.h b/src/gallium/drivers/panfrost/pan_screen.h
index 813563d983cd611bb64a5cf53593980b316219f1..c53338fffeaf2708019b1589d22e6439dea40488 100644
--- a/src/gallium/drivers/panfrost/pan_screen.h
+++ b/src/gallium/drivers/panfrost/pan_screen.h
@@ -123,6 +123,7 @@ struct panfrost_screen {
       struct panfrost_pool desc;
    } mempools;
 
+   char renderer_string[100];
    struct panfrost_vtable vtbl;
    struct disk_cache *disk_cache;
    unsigned max_afbc_packing_ratio;
diff --git a/src/panfrost/lib/pan_props.c b/src/panfrost/lib/pan_props.c
index 278abfd2661d538654e2a94135626b7932e66edc..3b0fa994f532cfbf1f6df5b8eb5b917d49deda7c 100644
--- a/src/panfrost/lib/pan_props.c
+++ b/src/panfrost/lib/pan_props.c
@@ -40,7 +40,7 @@
               min_rev_anisotropic_, tib_size_, quirks_)                        \
    {                                                                           \
       .gpu_id = gpu_id_, .gpu_variant = gpu_variant_,                          \
-      .name = "Mali-" shortname " (Panfrost)",                                 \
+      .name = "Mali-" shortname,                                               \
       .performance_counters = counters_,                                       \
       .min_rev_anisotropic = min_rev_anisotropic_,                             \
       .tilebuffer_size = tib_size_, .quirks = quirks_,                         \