drm/i915: Rip out GET_SPRITE_COLORKEY ioctl
It's completely unused and Tommi noticed that the #define is borked since forever. I've done a git search in userspace and only found broken definitions and no users anywhere. Cc: Tommi Rantala <tt.rantala@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
parent
d21bd67bbb
commit
a8265c59e2
|
@ -1199,7 +1199,7 @@ const struct drm_ioctl_desc i915_ioctls[] = {
|
||||||
DRM_IOCTL_DEF_DRV(I915_OVERLAY_PUT_IMAGE, intel_overlay_put_image, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
|
DRM_IOCTL_DEF_DRV(I915_OVERLAY_PUT_IMAGE, intel_overlay_put_image, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
|
||||||
DRM_IOCTL_DEF_DRV(I915_OVERLAY_ATTRS, intel_overlay_attrs, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
|
DRM_IOCTL_DEF_DRV(I915_OVERLAY_ATTRS, intel_overlay_attrs, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
|
||||||
DRM_IOCTL_DEF_DRV(I915_SET_SPRITE_COLORKEY, intel_sprite_set_colorkey, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
|
DRM_IOCTL_DEF_DRV(I915_SET_SPRITE_COLORKEY, intel_sprite_set_colorkey, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
|
||||||
DRM_IOCTL_DEF_DRV(I915_GET_SPRITE_COLORKEY, intel_sprite_get_colorkey, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
|
DRM_IOCTL_DEF_DRV(I915_GET_SPRITE_COLORKEY, drm_noop, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
|
||||||
DRM_IOCTL_DEF_DRV(I915_GEM_WAIT, i915_gem_wait_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
|
DRM_IOCTL_DEF_DRV(I915_GEM_WAIT, i915_gem_wait_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
|
||||||
DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE, i915_gem_context_create_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),
|
DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE, i915_gem_context_create_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),
|
||||||
DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_DESTROY, i915_gem_context_destroy_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),
|
DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_DESTROY, i915_gem_context_destroy_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),
|
||||||
|
|
|
@ -1282,8 +1282,6 @@ void intel_flush_primary_plane(struct drm_i915_private *dev_priv,
|
||||||
int intel_plane_restore(struct drm_plane *plane);
|
int intel_plane_restore(struct drm_plane *plane);
|
||||||
int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
|
int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
|
||||||
struct drm_file *file_priv);
|
struct drm_file *file_priv);
|
||||||
int intel_sprite_get_colorkey(struct drm_device *dev, void *data,
|
|
||||||
struct drm_file *file_priv);
|
|
||||||
bool intel_pipe_update_start(struct intel_crtc *crtc,
|
bool intel_pipe_update_start(struct intel_crtc *crtc,
|
||||||
uint32_t *start_vbl_count);
|
uint32_t *start_vbl_count);
|
||||||
void intel_pipe_update_end(struct intel_crtc *crtc, u32 start_vbl_count);
|
void intel_pipe_update_end(struct intel_crtc *crtc, u32 start_vbl_count);
|
||||||
|
|
|
@ -1134,30 +1134,6 @@ out_unlock:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int intel_sprite_get_colorkey(struct drm_device *dev, void *data,
|
|
||||||
struct drm_file *file_priv)
|
|
||||||
{
|
|
||||||
struct drm_intel_sprite_colorkey *get = data;
|
|
||||||
struct drm_plane *plane;
|
|
||||||
struct intel_plane *intel_plane;
|
|
||||||
int ret = 0;
|
|
||||||
|
|
||||||
drm_modeset_lock_all(dev);
|
|
||||||
|
|
||||||
plane = drm_plane_find(dev, get->plane_id);
|
|
||||||
if (!plane) {
|
|
||||||
ret = -ENOENT;
|
|
||||||
goto out_unlock;
|
|
||||||
}
|
|
||||||
|
|
||||||
intel_plane = to_intel_plane(plane);
|
|
||||||
*get = intel_plane->ckey;
|
|
||||||
|
|
||||||
out_unlock:
|
|
||||||
drm_modeset_unlock_all(dev);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
int intel_plane_restore(struct drm_plane *plane)
|
int intel_plane_restore(struct drm_plane *plane)
|
||||||
{
|
{
|
||||||
if (!plane->crtc || !plane->state->fb)
|
if (!plane->crtc || !plane->state->fb)
|
||||||
|
|
Loading…
Reference in a new issue