Skip to contentSkip to conversation

igt: Disable igt_clflush_range() implementation on ARM builds.

PATCH In review Eric Anholt 2 participants 5 messages Jan 25, 2016 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 igt: Disable igt_clflush_range() implementation on ARM builds.

Daniel has suggested that I put vc4 testing into igt, since it's got the piglit integration and KMS coverage already. This gets the ccore building so that I can start writing tests.

---
 lib/igt_gt.c | 4 ++++
 1 file changed, 4 insertions(+)
lib/igt_gt.c +4 -0
index 149435c..b2c2273 100644
@@ -491,6 +491,7 @@ int igt_setup_clflush(void)
 
 void igt_clflush_range(void *addr, int size)
 {
+#if !defined(__arm__)
 	char *p, *end;
 
 	end = (char *)addr + size;
@@ -500,6 +501,9 @@ void igt_clflush_range(void *addr, int size)
 	for (; p < end; p += clflush_size)
 		asm volatile("clflush %0" : "+m" (*(volatile char *)p));
 	asm volatile("mfence" ::: "memory");
+#else
+	fprintf(stderr, "igt_clflush_range() unsupported\n");
+#endif
 }
 
 /**
Signature · 6 lines
2.6.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/2 configure.ac: Add a configure arg for the overlay.

It's autodetected if its dependencies are present, but it doesn't build for ARM, nor am I interested in it for now.

---
 configure.ac | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
configure.ac +12 -3
index ddfe696..41bf20d 100644
@@ -87,12 +87,21 @@ AC_SUBST(ASSEMBLER_WARN_CFLAGS)
 
 PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.64 libdrm])
 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
-PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no)
-PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib dri2proto >= 2.6], enable_overlay_xlib=yes, enable_overlay_xlib=no)
+
+AC_ARG_ENABLE(overlay, AS_HELP_STRING([--disable-overlay],
+	      [Disable the SNA GPU activity overlay (default: auto)]),
+	      [OVERLAY=$enableval], [OVERLAY=auto])
+if test x$OVERLAY = xno; then
+	enable_overlay_xvlib=no
+	enable_overlay_xlib=no
+else
+	PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no)
+	PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib dri2proto >= 2.6], enable_overlay_xlib=yes, enable_overlay_xlib=no)
+fi
 
 AM_CONDITIONAL(BUILD_OVERLAY_XVLIB, [test "x$enable_overlay_xvlib" = xyes])
 AM_CONDITIONAL(BUILD_OVERLAY_XLIB, [test "x$enable_overlay_xlib" = xyes])
-AM_CONDITIONAL(BUILD_OVERLAY, [test "x$enable_overlay_xlib" = xyes -o "x$enable_overlay_xvlib"])
+AM_CONDITIONAL(BUILD_OVERLAY, [test "x$enable_overlay_xlib" = xyes -o "x$enable_overlay_xvlib" = xyes])
 if test x$enable_overlay_xvlib = xyes; then
 	AC_DEFINE(HAVE_OVERLAY_XVLIB, 1, [Enable XV backend])
 fi
Signature · 6 lines
2.6.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

Re: [PATCH 2/2] configure.ac: Add a configure arg for the overlay.

Hi,

Quoted 2 lines · Eric Anholt

It's autodetected if its dependencies are present, but it doesn't build for ARM, nor am I interested in it for now.

The one I just sent auto-disables it when not building on x86.

Cheers,
Daniel
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/2
#3 lore raw
In reply to Eric Anholt

Hi,

Quoted 3 lines · Eric Anholt

Daniel has suggested that I put vc4 testing into igt, since it's got the piglit integration and KMS coverage already. This gets the ccore building so that I can start writing tests.

Works for me.

Cheers,
Daniel
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

Wait, no, thought of a bikeshed:
#if defined(__i386__) || defined(__x86_64__)

Quoted 7 lines · Daniel Stone

Hi,

Quoted 3 lines · Eric Anholt

Daniel has suggested that I put vc4 testing into igt, since it's got the piglit integration and KMS coverage already. This gets the ccore building so that I can start writing tests.

Quoted 6 lines

Works for me.

Cheers,
Daniel

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx