summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2020-02-26 10:21:24 +0100
committerMarge Bot <eric+marge@anholt.net>2020-02-26 10:28:46 +0000
commitd2e4435c205810b71990c27befde2f99ed45b9df (patch)
treed5aeca11d8514eaa0b59ba332e01d03fb5fb6470
parentef0abe5404ca3bb983e4afcbf2306291a15579ca (diff)
radv: fix creating null devices if KHR_display is enabled
Found this while replaying pipelines with Fossilize, it worked fine with vkpipeline-db. Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3959> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3959>
-rw-r--r--src/amd/vulkan/radv_device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index a130952e88f..d86f2c7d690 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -350,7 +350,7 @@ radv_physical_device_init(struct radv_physical_device *device,
goto fail;
}
- if (instance->enabled_extensions.KHR_display) {
+ if (drm_device && instance->enabled_extensions.KHR_display) {
master_fd = open(drm_device->nodes[DRM_NODE_PRIMARY], O_RDWR | O_CLOEXEC);
if (master_fd >= 0) {
uint32_t accel_working = 0;