Thread (5 messages) 5 messages, 3 authors, 2021-03-30

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

From: Petri Latvala <hidden>
Date: 2021-03-29 14:06:36
Subsystem: library code, the rest · Maintainers: Andrew Morton, Linus Torvalds

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

Signed-off-by: Petri Latvala <redacted>
Cc: Lyude Paul <lyude@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

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help