v3dv: drop device_id field

This was added only to report the DRM device ID of the actual
GPU used in the simulated environment but there is no real
reason we need to do that, so let's juts keep it simple and
provide the device ID of the simulated device instead.

Reviewed-by: Juan A. Suarez <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31619>
This commit is contained in:
Iago Toral Quiroga 2024-10-14 08:59:29 +02:00 committed by Marge Bot
parent a3c03b6a96
commit 23432921b3
2 changed files with 0 additions and 12 deletions

View file

@ -1338,10 +1338,6 @@ create_physical_device(struct v3dv_instance *instance,
device->has_render = true;
device->render_devid = render_stat.st_rdev;
#if USE_V3D_SIMULATOR
device->device_id = gpu_device->deviceinfo.pci->device_id;
#endif
if (instance->vk.enabled_extensions.KHR_display ||
instance->vk.enabled_extensions.KHR_xcb_surface ||
instance->vk.enabled_extensions.KHR_xlib_surface ||
@ -1575,9 +1571,6 @@ v3dv_physical_device_vendor_id(const struct v3dv_physical_device *dev)
uint32_t
v3dv_physical_device_device_id(const struct v3dv_physical_device *dev)
{
#if USE_V3D_SIMULATOR
return dev->device_id;
#else
switch (dev->devinfo.ver) {
case 42:
return 0xBE485FD3; /* Broadcom deviceID for 2711 */
@ -1586,7 +1579,6 @@ v3dv_physical_device_device_id(const struct v3dv_physical_device *dev)
default:
unreachable("Unsupported V3D version");
}
#endif
}
/* We support exactly one queue family. */

View file

@ -139,10 +139,6 @@ struct v3dv_physical_device {
dev_t primary_devid;
dev_t render_devid;
#if USE_V3D_SIMULATOR
uint32_t device_id;
#endif
uint8_t driver_build_sha1[20];
uint8_t pipeline_cache_uuid[VK_UUID_SIZE];
uint8_t device_uuid[VK_UUID_SIZE];