diff mbox

aubinator: Define DRM_IOCTL_I915_GEM_EXECBUFFER2_WR if unavailable

Message ID 1489594171-10758-1-git-send-email-jason.ekstrand@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jason Ekstrand March 15, 2017, 4:09 p.m. UTC 
Depending on what version of drm_i915.h you have, you may not have
this #define but it's required in order to properly dump aubs from
newer versions of mesa.
---

I have no idea what the back-porting procedure is for IGT.  If someone
could provide me with a tagline to ensure it lands in stable, that would be
good.

 tools/aubdump.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Petri Latvala March 16, 2017, 10:51 a.m. UTC | #1 
On Wed, Mar 15, 2017 at 09:09:31AM -0700, Jason Ekstrand wrote:
> +#ifndef DRM_IOCTL_I915_GEM_EXECBUFFER2_WR
> +#define DRM_IOCTL_I915_GEM_EXECBUFFER2_WR	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER2_WR, struct drm_i915_gem_execbuffer2)
> +#endif

If DRM_IOCTL_I915_GEM_EXECBUFFER2_WR is not there, neither is DRM_I915_GEM_EXECBUFFER2_WR.


--
Petri Latvala
Jason Ekstrand March 16, 2017, 4:04 p.m. UTC | #2 
On Thu, Mar 16, 2017 at 3:51 AM, Petri Latvala <petri.latvala@intel.com>
wrote:

> On Wed, Mar 15, 2017 at 09:09:31AM -0700, Jason Ekstrand wrote:
> > +#ifndef DRM_IOCTL_I915_GEM_EXECBUFFER2_WR
> > +#define DRM_IOCTL_I915_GEM_EXECBUFFER2_WR    DRM_IOWR(DRM_COMMAND_BASE
> + DRM_I915_GEM_EXECBUFFER2_WR, struct drm_i915_gem_execbuffer2)
> > +#endif
>
> If DRM_IOCTL_I915_GEM_EXECBUFFER2_WR is not there, neither is
> DRM_I915_GEM_EXECBUFFER2_WR.
>

Right. :-)  I'll fix that.
diff mbox

Patch

diff --git a/tools/aubdump.c b/tools/aubdump.c
index 08cee55..dba5b35 100644
--- a/tools/aubdump.c
+++ b/tools/aubdump.c
@@ -47,6 +47,10 @@ 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
 #endif
 
+#ifndef DRM_IOCTL_I915_GEM_EXECBUFFER2_WR
+#define DRM_IOCTL_I915_GEM_EXECBUFFER2_WR	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER2_WR, struct drm_i915_gem_execbuffer2)
+#endif
+
 static int close_init_helper(int fd);
 static int ioctl_init_helper(int fd, unsigned long request, ...);