From 83e71e0ebd7f000ca84f230cfb3d8a9e8cb40197 Mon Sep 17 00:00:00 2001
From: bbhtt <bbhtt.zn0i8@slmail.me>
Date: Thu, 15 Aug 2024 15:42:08 +0530
Subject: [PATCH] pipe_loader_drm: Fix virtgpu_drm header path

Fixes: 2ea4a59ab7cf07d660c424760ec74eff8f34a3cc ("loader: Add better
support for virtgpu nctx driver loading")

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30673>
(cherry picked from commit 284ad7da39312ecdf74e95cc75b379d81eb37487)
---
 .pick_status.json                                   | 2 +-
 src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index defc9283487..5928475f9a7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -394,7 +394,7 @@
         "description": "pipe_loader_drm: Fix virtgpu_drm header path",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "2ea4a59ab7cf07d660c424760ec74eff8f34a3cc",
         "notes": null
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
index 263c80618bd..985ace997bd 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
@@ -51,7 +51,7 @@
 
 #include "virtio/virtio-gpu/drm_hw.h"
 #include "virtio/virtio-gpu/virglrenderer_hw.h"
-#include "virtgpu_drm.h"
+#include "drm-uapi/virtgpu_drm.h"
 
 #define DRM_RENDER_NODE_DEV_NAME_FORMAT "%s/renderD%d"
 #define DRM_RENDER_NODE_MAX_NODES 63