fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

v3dv: retrieve device name from device info

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>
This commit is contained in:
Iago Toral Quiroga 2019-11-29 09:01:56 +01:00 • committed by Marge Bot
parent 4e88e2d4a9
commit 9de4ab17c5
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/broadcom/vulkan/v3dv_device.c
View file

@ -210,6 +210,8 @@ physical_device_finish(struct v3dv_physical_device *device)
if (device->master_fd >= 0)
close(device->master_fd);
free(device->name);
#if using_v3d_simulator
v3d_simulator_destroy(device->sim_file);
#endif
@ -247,6 +249,9 @@ physical_device_init(struct v3dv_physical_device *device,
struct v3dv_instance *instance,
drmDevicePtr drm_device)
{
VkResult result = VK_SUCCESS;
int32_t master_fd = -1;
const char *path = drm_device->nodes[DRM_NODE_RENDER];
int32_t fd = open(path, O_RDWR | O_CLOEXEC);
if (fd < 0)
@ -260,7 +265,7 @@ physical_device_init(struct v3dv_physical_device *device,
/* FIXME: we will have to do plenty more here */
device->local_fd = fd;
device->master_fd = -1;
device->master_fd = master_fd;
uint8_t zeroes[VK_UUID_SIZE] = { 0 };
memcpy(device->pipeline_cache_uuid, zeroes, VK_UUID_SIZE);
@ -269,7 +274,20 @@ physical_device_init(struct v3dv_physical_device *device,
device->sim_file = v3d_simulator_init(device->local_fd);
#endif
return VK_SUCCESS;
if (!v3d_get_device_info(device->local_fd, &device->devinfo, &v3dv_ioctl)) {
result = VK_ERROR_INCOMPATIBLE_DRIVER;
goto fail;
}
asprintf(&device->name, "V3D %d.%d",
device->devinfo.ver / 10, device->devinfo.ver % 10);
fail:
close(fd);
if (master_fd != -1)
close(master_fd);
return result;
}
static VkResult

2
src/broadcom/vulkan/v3dv_private.h
View file

@ -97,7 +97,7 @@ struct v3dv_physical_device {
struct v3dv_physical_device_dispatch_table dispatch;
char path[20];
const char *name;
char *name;
int32_t local_fd;
int32_t master_fd;
uint8_t pipeline_cache_uuid[VK_UUID_SIZE];