Module: Mesa Branch: staging/22.2 Commit: 242b4981159da3ad0bfe8abb40f6a9e3682895e7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=242b4981159da3ad0bfe8abb40f6a9e3682895e7
Author: Riteo <[email protected]> Date: Tue Aug 16 11:41:59 2022 +0200 vulkan/device_select_wayland: fix a memory leak with DRM device handling Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18076> (cherry picked from commit 163390d762ba45c285d0ccafcbdd68f760d9b640) --- .pick_status.json | 2 +- src/vulkan/device-select-layer/device_select_wayland.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 961dbd494b4..0055c51000c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -13432,7 +13432,7 @@ "description": "vulkan/device_select_wayland: fix a memory leak with DRM device handling", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/vulkan/device-select-layer/device_select_wayland.c b/src/vulkan/device-select-layer/device_select_wayland.c index 161310b0292..c0256b12b1a 100644 --- a/src/vulkan/device-select-layer/device_select_wayland.c +++ b/src/vulkan/device-select-layer/device_select_wayland.c @@ -137,6 +137,8 @@ int device_select_find_wayland_pci_default(struct device_pci_info *devices, uint if (default_idx != -1) break; } + + drmFreeDevice(&info.dev_info); } if (info.wl_drm)
