[igt-dev] [PATCH i-g-t] lib: Don't use libdrm_nouveau if not found

Petri Latvala petri.latvala at intel.com
Mon Mar 29 14:07:14 UTC 2021


Only #include the libdrm_nouveau headers if HAVE_LIBDRM_NOUVEAU is set
so IGT builds again without it installed.

Signed-off-by: Petri Latvala <petri.latvala at intel.com>
Cc: Lyude Paul <lyude at redhat.com>
---
 lib/igt_nouveau.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/igt_nouveau.h b/lib/igt_nouveau.h
index ea44adb2..c518de3c 100644
--- a/lib/igt_nouveau.h
+++ b/lib/igt_nouveau.h
@@ -26,10 +26,6 @@
 #include <stddef.h>
 #include <inttypes.h>
 
-#include <nouveau/nouveau.h>
-#include <nouveau/nvif/class.h>
-#include <nouveau/nvif/cl0080.h>
-
 #include "igt_core.h"
 
 #define IGT_NOUVEAU_CHIPSET_GV100 0x140
@@ -37,6 +33,10 @@
 typedef struct igt_fb igt_fb_t;
 
 #ifdef HAVE_LIBDRM_NOUVEAU
+#include <nouveau/nouveau.h>
+#include <nouveau/nvif/class.h>
+#include <nouveau/nvif/cl0080.h>
+
 #define DECL(d) d
 #else
 /* There shouldn't be any code that calls igt_nouveau_* functions without libdrm support enabled, as
-- 
2.29.2



More information about the igt-dev mailing list