The spacing in i915_drm.h is inconsistent. Fix in workaround.

clib/wrapper.h

@@ -367,6 +367,15 @@ const __u64 DRM_IOCTL_I915_GEM_SET_DOMAIN = _DRM_IOCTL_I915_GEM_SET_DOMAIN;
 const __u64 _DRM_IOCTL_I915_GEM_SW_FINISH = DRM_IOCTL_I915_GEM_SW_FINISH;
 #undef DRM_IOCTL_I915_GEM_SW_FINISH
 const __u64 DRM_IOCTL_I915_GEM_SW_FINISH = _DRM_IOCTL_I915_GEM_SW_FINISH;
+const __u64 _DRM_IOCTL_I915_GEM_SET_TILING = DRM_IOCTL_I915_GEM_SET_TILING;
+#undef DRM_IOCTL_I915_GEM_SET_TILING
+const __u64 DRM_IOCTL_I915_GEM_SET_TILING = _DRM_IOCTL_I915_GEM_SET_TILING;
+const __u64 _DRM_IOCTL_I915_GEM_GET_TILING = DRM_IOCTL_I915_GEM_GET_TILING;
+#undef DRM_IOCTL_I915_GEM_GET_TILING
+const __u64 DRM_IOCTL_I915_GEM_GET_TILING = _DRM_IOCTL_I915_GEM_GET_TILING;
+const __u64 _DRM_IOCTL_I915_GEM_GET_APERTURE = DRM_IOCTL_I915_GEM_GET_APERTURE;
+#undef DRM_IOCTL_I915_GEM_GET_APERTURE
+const __u64 DRM_IOCTL_I915_GEM_GET_APERTURE = _DRM_IOCTL_I915_GEM_GET_APERTURE;
 const __u64 _DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID = DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID;
 #undef DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID
 const __u64 DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID = _DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID;
@@ -388,9 +397,30 @@ const __u64 DRM_IOCTL_I915_GET_SPRITE_COLORKEY = _DRM_IOCTL_I915_GET_SPRITE_COLO
 const __u64 _DRM_IOCTL_I915_GEM_WAIT = DRM_IOCTL_I915_GEM_WAIT;
 #undef DRM_IOCTL_I915_GEM_WAIT
 const __u64 DRM_IOCTL_I915_GEM_WAIT = _DRM_IOCTL_I915_GEM_WAIT;
+const __u64 _DRM_IOCTL_I915_GEM_CONTEXT_CREATE = DRM_IOCTL_I915_GEM_CONTEXT_CREATE;
+#undef DRM_IOCTL_I915_GEM_CONTEXT_CREATE
+const __u64 DRM_IOCTL_I915_GEM_CONTEXT_CREATE = _DRM_IOCTL_I915_GEM_CONTEXT_CREATE;
+const __u64 _DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT = DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT;
+#undef DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT
+const __u64 DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT = _DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT;
 const __u64 _DRM_IOCTL_I915_GEM_CONTEXT_DESTROY = DRM_IOCTL_I915_GEM_CONTEXT_DESTROY;
 #undef DRM_IOCTL_I915_GEM_CONTEXT_DESTROY
 const __u64 DRM_IOCTL_I915_GEM_CONTEXT_DESTROY = _DRM_IOCTL_I915_GEM_CONTEXT_DESTROY;
+const __u64 _DRM_IOCTL_I915_REG_READ = DRM_IOCTL_I915_REG_READ;
+#undef DRM_IOCTL_I915_REG_READ
+const __u64 DRM_IOCTL_I915_REG_READ = _DRM_IOCTL_I915_REG_READ;
+const __u64 _DRM_IOCTL_I915_GET_RESET_STATS = DRM_IOCTL_I915_GET_RESET_STATS;
+#undef DRM_IOCTL_I915_GET_RESET_STATS
+const __u64 DRM_IOCTL_I915_GET_RESET_STATS = _DRM_IOCTL_I915_GET_RESET_STATS;
+const __u64 _DRM_IOCTL_I915_GEM_USERPTR = DRM_IOCTL_I915_GEM_USERPTR;
+#undef DRM_IOCTL_I915_GEM_USERPTR
+const __u64 DRM_IOCTL_I915_GEM_USERPTR = _DRM_IOCTL_I915_GEM_USERPTR;
+const __u64 _DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM = DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM;
+#undef DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM
+const __u64 DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM = _DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM;
+const __u64 _DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM = DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM;
+#undef DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM
+const __u64 DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM = _DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM;
 const __u64 _DRM_IOCTL_I915_PERF_OPEN = DRM_IOCTL_I915_PERF_OPEN;
 #undef DRM_IOCTL_I915_PERF_OPEN
 const __u64 DRM_IOCTL_I915_PERF_OPEN = _DRM_IOCTL_I915_PERF_OPEN;

gen_workaround.sh

@@ -5,7 +5,7 @@ for F in $FILES; do
   echo "const __u64 $F = _$F;"
 done
 
-FILES=$(rg 'DRM_IO(.?)(.?)\(' /usr/include/libdrm/i915_drm.h | awk '{print $2}')
+FILES=$(rg 'DRM_IO(.?)(.?)(.?)\(' /usr/include/libdrm/i915_drm.h | awk '{print $2}')
 for F in $FILES; do
   echo "const __u64 _$F = $F;"
   echo "#undef $F"