On 03/26/2015 11:39 PM, Jani Nikula wrote: > On Thu, 26 Mar 2015, Tommi Rantala <tt.rantala@xxxxxxxxx> wrote: >> Fix definition of the DRM_IOCTL_I915_GET_SPRITE_COLORKEY ioctl, so that it >> is different from the DRM_IOCTL_I915_SET_SPRITE_COLORKEY ioctl. >> >> Signed-off-by: Tommi Rantala <tt.rantala@xxxxxxxxx> > > Whoa. Broken since its introduction in > > commit 8ea30864229e54b01ac0e9fe88c4b733a940ec4e > Author: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> > Date: Tue Jan 3 08:05:39 2012 -0800 > > drm/i915: add color key support v4 > > Cc: stable@xxxxxxxxxxxxxxx > > BR, > Jani. > > >> --- >> include/uapi/drm/i915_drm.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h >> index 6eed16b..0e9c835 100644 >> --- a/include/uapi/drm/i915_drm.h >> +++ b/include/uapi/drm/i915_drm.h >> @@ -270,7 +270,7 @@ typedef struct _drm_i915_sarea { >> #define DRM_IOCTL_I915_OVERLAY_PUT_IMAGE DRM_IOW(DRM_COMMAND_BASE + DRM_I915_OVERLAY_PUT_IMAGE, struct drm_intel_overlay_put_image) >> #define DRM_IOCTL_I915_OVERLAY_ATTRS DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_OVERLAY_ATTRS, struct drm_intel_overlay_attrs) >> #define DRM_IOCTL_I915_SET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey) >> -#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey) >> +#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey) >> #define DRM_IOCTL_I915_GEM_WAIT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_WAIT, struct drm_i915_gem_wait) >> #define DRM_IOCTL_I915_GEM_CONTEXT_CREATE DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create) >> #define DRM_IOCTL_I915_GEM_CONTEXT_DESTROY DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_DESTROY, struct drm_i915_gem_context_destroy) Hah, I guess that must be a well used ioctl! Not even the test program does a get call! Jesse _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel