drm/i915: fix definition of the DRM_IOCTL_I915_GET_SPRITE_COLORKEY ioctl
Subsystems (4)
PATCH 1/1 drm/i915: fix definition of the DRM_IOCTL_I915_GET_SPRITE_COLORKEY ioctl
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.
--- include/uapi/drm/i915_drm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/drm/i915_drm.h +1 -1
@@ -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)
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Jani Nikula
maintainerQuoted 4 lines · Tommi Rantala
Fix definition of the
DRM_IOCTL_I915_GET_SPRITE_COLORKEYioctl, so that it is different from theDRM_IOCTL_I915_SET_SPRITE_COLORKEYioctl.Signed-off-by Tommi Rantala <[email protected]>
Whoa. Broken since its introduction in
commit 8ea30864229e54b01ac0e9fe88c4b733a940ec4e
Author: Jesse Barnes <[email protected]> Date: Tue Jan 3 08:05:39 2012 -0800
drm/i915: add color key support v4
BR,
Jani.
Quoted 20 lines
--- include/uapi/drm/i915_drm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/uapi/drm/i915_drm.h +1
-1@@ -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)Signature · 1 line
2.1.0
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 8 lines · Jani Nikula
Quoted 4 lines · Tommi Rantala
Fix definition of the
DRM_IOCTL_I915_GET_SPRITE_COLORKEYioctl, so that it is different from theDRM_IOCTL_I915_SET_SPRITE_COLORKEYioctl.Signed-off-by Tommi Rantala <[email protected]>Whoa. Broken since its introduction in
Quoted 7 lines
commit
8ea30864229e54b01ac0e9fe88c4b733a940ec4eAuthor: Jesse Barnes <[email protected]> Date: Tue Jan 3 08:05:39 2012 -0800drm/i915: add color key support v4
Nope, we'll just rip it out and replace it all with the drm_noop ioctl. At least I didn't find any userspace anywhere and only broken definitions. Proof enough this isn't useful.
Even more so since that means we don't have to convert the get ioctl over to atomic, yay! I'll send patches.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
A message that is not in the archive (sent off-list or not yet received): 20150327080427.GB23521-dv86pmgwkMBes7Z6vYuT8azUEOm+Xw19@public.gmane.org
Quoted 15 lines · Daniel Vetter
Quoted 14 lines · Jani Nikula
Quoted 4 lines · Tommi Rantala
Fix definition of the
DRM_IOCTL_I915_GET_SPRITE_COLORKEYioctl, so that it is different from theDRM_IOCTL_I915_SET_SPRITE_COLORKEYioctl.Signed-off-by Tommi Rantala <[email protected]>Whoa. Broken since its introduction in
commit
8ea30864229e54b01ac0e9fe88c4b733a940ec4eAuthor: Jesse Barnes <[email protected]> Date: Tue Jan 3 08:05:39 2012 -0800drm/i915: add color key support v4
Quoted 8 lines
Quoted 1 line
Nope, we'll just rip it out and replace it all with the
drm_noopioctl. At least I didn't find any userspace anywhere and only broken definitions. Proof enough this isn't useful.Even more so since that means we don't have to convert the get ioctl over to atomic, yay! I'll send patches.
Can we just skip the noop part and delete it altogether? It was only added speculatively and obviously never used at all...
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 22 lines · Jesse Barnes
Quoted 21 lines · Daniel Vetter
Quoted 8 lines · Jani Nikula
Quoted 4 lines · Tommi Rantala
Fix definition of the
DRM_IOCTL_I915_GET_SPRITE_COLORKEYioctl, so that it is different from theDRM_IOCTL_I915_SET_SPRITE_COLORKEYioctl.Signed-off-by Tommi Rantala <[email protected]>Whoa. Broken since its introduction in
Quoted 7 lines
commit
8ea30864229e54b01ac0e9fe88c4b733a940ec4eAuthor: Jesse Barnes <[email protected]> Date: Tue Jan 3 08:05:39 2012 -0800drm/i915: add color key support v4
Nope, we'll just rip it out and replace it all with the
drm_noopioctl. At least I didn't find any userspace anywhere and only broken definitions. Proof enough this isn't useful.
Quoted 5 lines
Quoted 2 lines
Even more so since that means we don't have to convert the get ioctl over to atomic, yay! I'll send patches.
Can we just skip the noop part and delete it altogether? It was only added speculatively and obviously never used at all...
The table is indexed, we need a dummy entry. I guess we could do a drm_invalid_ioctl function too for these, but then whether you get an error or not doesn't really matter for unused ioctls. Hence I've stuck with drm_noop for all these removed ioctl (except when we need a more tailore-made lie to keep userspace happy).
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 23 lines · Daniel Vetter
Quoted 22 lines · Jesse Barnes
Quoted 21 lines · Daniel Vetter
Quoted 8 lines · Jani Nikula
Quoted 4 lines · Tommi Rantala
Fix definition of the
DRM_IOCTL_I915_GET_SPRITE_COLORKEYioctl, so that it is different from theDRM_IOCTL_I915_SET_SPRITE_COLORKEYioctl.Signed-off-by Tommi Rantala <[email protected]>Whoa. Broken since its introduction in
Quoted 7 lines
commit
8ea30864229e54b01ac0e9fe88c4b733a940ec4eAuthor: Jesse Barnes <[email protected]> Date: Tue Jan 3 08:05:39 2012 -0800drm/i915: add color key support v4
Nope, we'll just rip it out and replace it all with the
drm_noopioctl. At least I didn't find any userspace anywhere and only broken definitions. Proof enough this isn't useful.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Even more so since that means we don't have to convert the get ioctl over to atomic, yay! I'll send patches.
Can we just skip the noop part and delete it altogether? It was only added speculatively and obviously never used at all...
The table is indexed, we need a dummy entry.
We shouldn't need any dummies. Any missing entry in the table will be zeroed, so we should simply return -EINVAL due to ioctl->func==NULL.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 24 lines · Jani Nikula
Quoted 4 lines · Tommi Rantala
Fix definition of the
DRM_IOCTL_I915_GET_SPRITE_COLORKEYioctl, so that it is different from theDRM_IOCTL_I915_SET_SPRITE_COLORKEYioctl.Signed-off-by Tommi Rantala <[email protected]>Whoa. Broken since its introduction in
commit
8ea30864229e54b01ac0e9fe88c4b733a940ec4eAuthor: Jesse Barnes <[email protected]> Date: Tue Jan 3 08:05:39 2012 -0800drm/i915: add color key support v4
BR,
Jani.Quoted 4 lines
--- include/uapi/drm/i915_drm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
include/uapi/drm/i915_drm.h typedef struct _drm_i915_sarea { · line 276
Quoted 13 lines
include/uapi/drm/i915_drm.h +1
-1@@ -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
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx