OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: Add VkPhysicalDeviceIDProperties support.

Browse Source 
Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Bas Nieuwenhuizen
2017-05-23 09:22:09 +02:00
parent d513473cc1
commit d515b420dd
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/amd/vulkan/radv_device.c
View File

@@ -61,6 +61,15 @@ radv_device_get_cache_uuid(enum radeon_family family, void *uuid)
return 0; return 0;
} }
static void
radv_get_device_uuid(drmDevicePtr device, void *uuid) {
memset(uuid, 0, VK_UUID_SIZE);
memcpy((char*)uuid + 0, &device->businfo.pci->domain, 2);
memcpy((char*)uuid + 2, &device->businfo.pci->bus, 1);
memcpy((char*)uuid + 3, &device->businfo.pci->dev, 1);
memcpy((char*)uuid + 4, &device->businfo.pci->func, 1);
}
static const VkExtensionProperties instance_extensions[] = { static const VkExtensionProperties instance_extensions[] = {
{ {
.extensionName = VK_KHR_SURFACE_EXTENSION_NAME, .extensionName = VK_KHR_SURFACE_EXTENSION_NAME,
@@ -190,8 +199,9 @@ is_extension_enabled(const VkExtensionProperties *extensions,
static VkResult static VkResult
radv_physical_device_init(struct radv_physical_device *device, radv_physical_device_init(struct radv_physical_device *device,
struct radv_instance *instance, struct radv_instance *instance,
const char *path) drmDevicePtr drm_device)
{ {
const char *path = drm_device->nodes[DRM_NODE_RENDER];
VkResult result; VkResult result;
drmVersionPtr version; drmVersionPtr version;
int fd; int fd;
@@ -251,6 +261,8 @@ radv_physical_device_init(struct radv_physical_device *device,
fprintf(stderr, "WARNING: radv is not a conformant vulkan implementation, testing use only.\n"); fprintf(stderr, "WARNING: radv is not a conformant vulkan implementation, testing use only.\n");
device->name = device->rad_info.name; device->name = device->rad_info.name;
radv_get_device_uuid(drm_device, device->device_uuid);
return VK_SUCCESS; return VK_SUCCESS;
fail: fail:
@@ -413,7 +425,7 @@ radv_enumerate_devices(struct radv_instance *instance)
result = radv_physical_device_init(instance->physicalDevices + result = radv_physical_device_init(instance->physicalDevices +
instance->physicalDeviceCount, instance->physicalDeviceCount,
instance, instance,
devices[i]->nodes[DRM_NODE_RENDER]); devices[i]);
if (result == VK_SUCCESS) if (result == VK_SUCCESS)
++instance->physicalDeviceCount; ++instance->physicalDeviceCount;
else if (result != VK_ERROR_INCOMPATIBLE_DRIVER) else if (result != VK_ERROR_INCOMPATIBLE_DRIVER)
@@ -689,6 +701,7 @@ void radv_GetPhysicalDeviceProperties2KHR(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties2KHR *pProperties) VkPhysicalDeviceProperties2KHR *pProperties)
{ {
RADV_FROM_HANDLE(radv_physical_device, pdevice, physicalDevice);
radv_GetPhysicalDeviceProperties(physicalDevice, &pProperties->properties); radv_GetPhysicalDeviceProperties(physicalDevice, &pProperties->properties);
vk_foreach_struct(ext, pProperties->pNext) { vk_foreach_struct(ext, pProperties->pNext) {
@@ -699,6 +712,13 @@ void radv_GetPhysicalDeviceProperties2KHR(
properties->maxPushDescriptors = MAX_PUSH_DESCRIPTORS; properties->maxPushDescriptors = MAX_PUSH_DESCRIPTORS;
break; break;
} }
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHX: {
VkPhysicalDeviceIDPropertiesKHX *properties = (VkPhysicalDeviceIDPropertiesKHX*)ext;
radv_device_get_cache_uuid(0, properties->driverUUID);
memcpy(properties->deviceUUID, pdevice->device_uuid, VK_UUID_SIZE);
properties->deviceLUIDValid = false;
break;
}
default: default:
break; break;
} }

1
src/amd/vulkan/radv_private.h
View File

@@ -266,6 +266,7 @@ struct radv_physical_device {
char path[20]; char path[20];
const char * name; const char * name;
uint8_t uuid[VK_UUID_SIZE]; uint8_t uuid[VK_UUID_SIZE];
uint8_t device_uuid[VK_UUID_SIZE];
int local_fd; int local_fd;
struct wsi_device wsi_device; struct wsi_device wsi_device;