diff mbox

[v2,i-g-t] aubdump: support new ioctl

Message ID 20170130142047.7838-1-lionel.g.landwerlin@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lionel Landwerlin Jan. 30, 2017, 2:20 p.m. UTC
Otherwise we won't log anything with OpenGL applications using a
recent Mesa driver.

v2: This requires updated uapi headers, hence the libdrm dependency
    bump (Petri)

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
 configure.ac    | 4 ++--
 tools/aubdump.c | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

--
2.11.0

Comments

Chris Wilson Jan. 30, 2017, 2:37 p.m. UTC | #1
On Mon, Jan 30, 2017 at 02:20:47PM +0000, Lionel Landwerlin wrote:
> Otherwise we won't log anything with OpenGL applications using a
> recent Mesa driver.
> 
> v2: This requires updated uapi headers, hence the libdrm dependency
>     bump (Petri)
> 
> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> ---
>  configure.ac    | 4 ++--
>  tools/aubdump.c | 3 ++-
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 5bdd744a..06c19f14 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -182,10 +182,10 @@ AC_ARG_ENABLE(intel, AS_HELP_STRING([--disable-intel],
>  	      [Enable building of intel specific parts (default: auto)]),
>  	      [INTEL=$enableval], [INTEL=auto])
>  if test "x$INTEL" = xauto; then
> -	PKG_CHECK_EXISTS([libdrm_intel >= 2.4.74], [INTEL=yes], [INTEL=no])
> +	PKG_CHECK_EXISTS([libdrm_intel >= 2.4.75], [INTEL=yes], [INTEL=no])
>  fi
>  if test "x$INTEL" = xyes; then
> -	PKG_CHECK_MODULES(DRM_INTEL, [libdrm_intel >= 2.4.74])
> +	PKG_CHECK_MODULES(DRM_INTEL, [libdrm_intel >= 2.4.75])

Are we really using libdrm_intel as the canonical source for the uapi
headers? /irony
-Chris
diff mbox

Patch

diff --git a/configure.ac b/configure.ac
index 5bdd744a..06c19f14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,10 +182,10 @@  AC_ARG_ENABLE(intel, AS_HELP_STRING([--disable-intel],
 	      [Enable building of intel specific parts (default: auto)]),
 	      [INTEL=$enableval], [INTEL=auto])
 if test "x$INTEL" = xauto; then
-	PKG_CHECK_EXISTS([libdrm_intel >= 2.4.74], [INTEL=yes], [INTEL=no])
+	PKG_CHECK_EXISTS([libdrm_intel >= 2.4.75], [INTEL=yes], [INTEL=no])
 fi
 if test "x$INTEL" = xyes; then
-	PKG_CHECK_MODULES(DRM_INTEL, [libdrm_intel >= 2.4.74])
+	PKG_CHECK_MODULES(DRM_INTEL, [libdrm_intel >= 2.4.75])
 	AC_DEFINE(HAVE_LIBDRM_INTEL, 1, [Have intel support])
 else
 	DRM_INTEL_CFLAGS=-I$\(top_srcdir\)/lib/stubs/drm/
diff --git a/tools/aubdump.c b/tools/aubdump.c
index d53addc2..59ef3e7e 100644
--- a/tools/aubdump.c
+++ b/tools/aubdump.c
@@ -632,7 +632,8 @@  ioctl(int fd, unsigned long request, ...)
 			return libc_ioctl(fd, request, argp);
 		}

-		case DRM_IOCTL_I915_GEM_EXECBUFFER2: {
+		case DRM_IOCTL_I915_GEM_EXECBUFFER2:
+		case DRM_IOCTL_I915_GEM_EXECBUFFER2_WR: {
 			dump_execbuffer2(fd, argp);
 			if (device_override)
 				return 0;