Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] lib: Don't use libdrm_nouveau if not found
@ 2021-03-29 14:07 Petri Latvala
  2021-03-29 15:03 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Petri Latvala @ 2021-03-29 14:07 UTC (permalink / raw)
  To: igt-dev; +Cc: Petri Latvala

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@intel.com>
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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-03-30  4:04 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-29 14:07 [igt-dev] [PATCH i-g-t] lib: Don't use libdrm_nouveau if not found Petri Latvala
2021-03-29 15:03 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2021-03-29 16:25 ` [igt-dev] [PATCH i-g-t] " Lyude Paul
2021-03-30  4:05   ` Petri Latvala
2021-03-29 16:52 ` [igt-dev] ✗ Fi.CI.IGT: failure for " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox