From 6130c8e6e769cf0361e36df0b4b5d288833adc27 Mon Sep 17 00:00:00 2001 From: Andres Rodriguez Date: Wed, 12 Jul 2017 18:45:25 -0400 Subject: [PATCH] ac/gpu: add driver/device UUID query helpers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We need vulkan and gl to produce the same UUIDs. Therefore we should keep the mechanism to compute these in a common location to guarantee they are updated in lockstep. Signed-off-by: Andres Rodriguez Reviewed-by: Marek Olšák --- src/amd/common/ac_gpu_info.c | 27 +++++++++++++++++++++++++++ src/amd/common/ac_gpu_info.h | 5 +++++ 2 files changed, 32 insertions(+) diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 929dfd2946f..e55d864187d 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -314,3 +314,30 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev, return true; } +void ac_compute_driver_uuid(char *uuid, size_t size) +{ + char amd_uuid[] = "AMD-MESA-DRV"; + + assert(size >= sizeof(amd_uuid)); + + memset(uuid, 0, size); + strncpy(uuid, amd_uuid, size); +} + +void ac_compute_device_uuid(struct radeon_info *info, char *uuid, size_t size) +{ + uint32_t *uint_uuid = (uint32_t*)uuid; + + assert(size >= sizeof(uint32_t)*4); + + /** + * Use the device info directly instead of using a sha1. GL/VK UUIDs + * are 16 byte vs 20 byte for sha1, and the truncation that would be + * required would get rid of part of the little entropy we have. + * */ + memset(uuid, 0, size); + uint_uuid[0] = info->pci_domain; + uint_uuid[1] = info->pci_bus; + uint_uuid[2] = info->pci_dev; + uint_uuid[3] = info->pci_func; +} diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index 20907c2620f..06b0c775466 100644 --- a/src/amd/common/ac_gpu_info.h +++ b/src/amd/common/ac_gpu_info.h @@ -26,6 +26,7 @@ #ifndef AC_GPU_INFO_H #define AC_GPU_INFO_H +#include #include #include #include "amd_family.h" @@ -106,6 +107,10 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev, struct radeon_info *info, struct amdgpu_gpu_info *amdinfo); +void ac_compute_driver_uuid(char *uuid, size_t size); + +void ac_compute_device_uuid(struct radeon_info *info, char *uuid, size_t size); + #ifdef __cplusplus } #endif -- 2.30.2