Mesa (main): dzn: Don't hash adapter LUID as part of device UUID

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 9a2ab661b7c1fb56fd64c86f05a11afdc3d13aa6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a2ab661b7c1fb56fd64c86f05a11afdc3d13aa6

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Tue Jul  5 13:43:17 2022 -0700

dzn: Don't hash adapter LUID as part of device UUID

Per the Vulkan spec, the device UUID should be identical between reboots.
It should also uniquely identify different instances of the same device,
e.g. 2 identical GPUs connected to different PCI ports, but D3D doesn't
currently expose a way to do both of these things. Prefer persistence
over uniqueness here.

Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Bill Kristiansen <billkris at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17340>

---

 src/microsoft/vulkan/dzn_device.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c
index 49ad6fd987e..a390a93b932 100644
--- a/src/microsoft/vulkan/dzn_device.c
+++ b/src/microsoft/vulkan/dzn_device.c
@@ -287,7 +287,6 @@ dzn_physical_device_init_uuids(struct dzn_physical_device *pdev)
    _mesa_sha1_update(&sha1_ctx, &pdev->adapter_desc.DeviceId, sizeof(pdev->adapter_desc.DeviceId));
    _mesa_sha1_update(&sha1_ctx, &pdev->adapter_desc.SubSysId, sizeof(pdev->adapter_desc.SubSysId));
    _mesa_sha1_update(&sha1_ctx, &pdev->adapter_desc.Revision, sizeof(pdev->adapter_desc.Revision));
-   _mesa_sha1_update(&sha1_ctx, &pdev->adapter_desc.AdapterLuid, sizeof(pdev->adapter_desc.AdapterLuid));
    _mesa_sha1_final(&sha1_ctx, sha1);
    memcpy(pdev->device_uuid, sha1, VK_UUID_SIZE);
 }