fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panvk: correct VkPhysicalDeviceProperties::deviceName

Browse source 
We currently report a deviceName as e.g. "Mali-G610 (Panfrost)", but
panfrost has nothing to di with the physical device, and the suffix
doesn't belong there at all.

So let's remove that suffix from PanVK. This results in output like this
from vulkaninfo:

---8<---
VkPhysicalDeviceProperties:
---------------------------
        apiVersion        = 1.1.305 (4198705)
        driverVersion     = 25.0.99 (104857699)
        vendorID          = 0x13b5
        deviceID          = 0xa8670000
        deviceType        = PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU
        deviceName        = Mali-G610
        pipelineCacheUUID = <snip>
---8<---

We already sort of namedrop Panfrost in the driver properties:

---8<---
VkPhysicalDeviceDriverPropertiesKHR:
------------------------------------
        driverID        = DRIVER_ID_MESA_PANVK
        driverName      = panvk
        driverInfo      = Mesa 25.1.0-devel (git-136dd9f985)
        conformanceVersion:
                major    = 1
                minor    = 4
                subminor = 1
                patch    = 2
---8<---

While this might techically speaking be a regression, PanVK has been
marked as experimental until Mesa 25.0. But to reduce the risk of people
starting to depend on this behavior, let's also backport this change to
the 25.0 release.

The patch looks a bit funny, because we add the " (Panfrost)"-suffix in
common code, and this moves it to the Gallium driver. But effectively,
this means PanVK is the only driver that sees a change of behavior.

Backport-to: 25.0
Reviewed-by: John Anthony <john.anthony@arm.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33972>
(cherry picked from commit c34c7b1f3b)
This commit is contained in:
Erik Faye-Lund 2025-03-10 13:17:59 +01:00 • committed by Eric Engestrom
parent 6f0eb911f7
commit 7627192919
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2154,7 +2154,7 @@
"description": "panvk: correct VkPhysicalDeviceProperties::deviceName",
"nominated": true,
"nomination_type": 4,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

5
src/gallium/drivers/panfrost/pan_screen.c
View file

@ -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 *
@ -909,6 +909,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,

1
src/gallium/drivers/panfrost/pan_screen.h
View file

@ -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;

2
src/panfrost/lib/pan_props.c
View file

@ -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_, \