From 0f29e172fd8f94ea19e0aea1ed1b80bc7c497f09 Mon Sep 17 00:00:00 2001
From: Gurchetan Singh <gurchetansingh@google.com>
Date: Mon, 26 Aug 2024 18:44:01 -0700
Subject: [PATCH] gfxstream: delete duplicate virtgpu_drm.h

We have three versions of virtgpu_drm.h

In reality, we only need one. Update the version
in guest/mesa and use that.

clang-format went a little crazy here..

Reviewed-by: Aaron Ruby <aruby@blackberry.com>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27246>
---
 src/gfxstream/guest/platform/linux/LinuxVirtGpuBlob.cpp       | 4 ++--
 .../guest/platform/linux/LinuxVirtGpuBlobMapping.cpp          | 1 +
 src/gfxstream/guest/platform/linux/LinuxVirtGpuDevice.cpp     | 2 +-
 src/gfxstream/guest/platform/linux/meson.build                | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlob.cpp b/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlob.cpp
index 9bd056e5833..932673b0651 100644
--- a/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlob.cpp
+++ b/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlob.cpp
@@ -22,9 +22,9 @@
 #include <cerrno>
 #include <cstring>
 
-#include "util/log.h"
 #include "LinuxVirtGpu.h"
-#include "virtgpu_drm.h"
+#include "drm-uapi/virtgpu_drm.h"
+#include "util/log.h"
 
 LinuxVirtGpuResource::LinuxVirtGpuResource(int64_t deviceHandle, uint32_t blobHandle,
                                            uint32_t resourceHandle, uint64_t size)
diff --git a/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlobMapping.cpp b/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlobMapping.cpp
index d977d99b249..92c3581b5b0 100644
--- a/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlobMapping.cpp
+++ b/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlobMapping.cpp
@@ -17,6 +17,7 @@
 #include <sys/mman.h>
 
 #include "LinuxVirtGpu.h"
+#include "drm-uapi/virtgpu_drm.h"
 
 LinuxVirtGpuResourceMapping::LinuxVirtGpuResourceMapping(VirtGpuResourcePtr blob, uint8_t* ptr,
                                                          uint64_t size)
diff --git a/src/gfxstream/guest/platform/linux/LinuxVirtGpuDevice.cpp b/src/gfxstream/guest/platform/linux/LinuxVirtGpuDevice.cpp
index 51ae6770dac..aefd6e964d2 100644
--- a/src/gfxstream/guest/platform/linux/LinuxVirtGpuDevice.cpp
+++ b/src/gfxstream/guest/platform/linux/LinuxVirtGpuDevice.cpp
@@ -27,8 +27,8 @@
 #include <string>
 
 #include "LinuxVirtGpu.h"
+#include "drm-uapi/virtgpu_drm.h"
 #include "util/log.h"
-#include "virtgpu_drm.h"
 #include "virtgpu_gfxstream_protocol.h"
 
 #define VIRTGPU_PARAM_CREATE_FENCE_PASSING 9  /* Fence passing */
diff --git a/src/gfxstream/guest/platform/linux/meson.build b/src/gfxstream/guest/platform/linux/meson.build
index e1492807d70..157f4853956 100644
--- a/src/gfxstream/guest/platform/linux/meson.build
+++ b/src/gfxstream/guest/platform/linux/meson.build
@@ -12,6 +12,7 @@ libplatform_virtgpu_linux = static_library(
    'platform_virtgpu_linux',
    files_libplatform_virtgpu_linux,
    cpp_args: gfxstream_guest_args,
-   include_directories: [inc_platform_virtgpu, inc_src, inc_android_compat],
+   include_directories: [inc_platform_virtgpu, inc_src, inc_include,
+                         inc_android_compat],
    dependencies: drm_dep,
 )