Skip to contentSkip to conversation

aubinator: Define DRM_IOCTL_I915_GEM_EXECBUFFER2_WR if unavailable

PATCH Superseded Jason Ekstrand 2 participants 4 messages Mar 15, 2017 – Mar 16, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 aubinator: Define DRM_IOCTL_I915_GEM_EXECBUFFER2_WR if unavailable

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(+)
tools/aubdump.c +4 -0
index 08cee55..dba5b35 100644
@@ -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, ...);
 
Signature · 6 lines
2.5.0.400.gff86faf

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

tools/aubdump.c line 52

Quoted 3 lines · Jason Ekstrand
tools/aubdump.c +3 -0
+#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
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 9 lines · Petri Latvala

Review

Quoted 2 lines · Jason Ekstrand
(quoted diff) +2 -0
+#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)

Quoted 1 line

+#endif

If DRM_IOCTL_I915_GEM_EXECBUFFER2_WR is not there, neither is DRM_I915_GEM_EXECBUFFER2_WR.

Right. :-) I'll fix that.

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

#3 lore raw

PATCH v2 1/1 aubinator: Define DRM_IOCTL_I915_GEM_EXECBUFFER2_WR if unavailable

In reply to Jason Ekstrand

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.

---
 tools/aubdump.c | 8 ++++++++
 1 file changed, 8 insertions(+)
tools/aubdump.c +8 -0
index 08cee55..8a89b8c 100644
@@ -47,6 +47,14 @@
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
 #endif
 
+#ifndef DRM_I915_GEM_EXECBUFFER2_WR
+#define DRM_I915_GEM_EXECBUFFER2_WR	DRM_I915_GEM_EXECBUFFER2
+#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, ...);
 
Signature · 6 lines
2.5.0.400.gff86faf

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