[PATCH] drm/i915: Rip out GET_SPRITE_COLORKEY ioctl

[Jani Nikula]

On Fri, 27 Mar 2015, Daniel Vetter <daniel at ffwll.ch> wrote:
> On Fri, Mar 27, 2015 at 09:10:02AM +0100, Daniel Vetter wrote:
>> 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 at gmail.com>
>> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
>
> Hm Tommi discovered oopses in there, so I guess this should be
> cherry-picked to -fixes+cc: stable too? Jani?

I'm picking up Ville's fix [1] for the oops to fixes, cc: stable, and I
think the rest is -next material.

BR,
Jani.

[1] http://mid.gmane.org/1427479180-29894-1-git-send-email-ville.syrjala@linux.intel.com


> -Daniel
>
>> ---
>>  drivers/gpu/drm/i915/i915_dma.c     |  2 +-
>>  drivers/gpu/drm/i915/intel_drv.h    |  2 --
>>  drivers/gpu/drm/i915/intel_sprite.c | 24 ------------------------
>>  3 files changed, 1 insertion(+), 27 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
>> index d49ed68f041e..68e0c85a17cf 100644
>> --- a/drivers/gpu/drm/i915/i915_dma.c
>> +++ b/drivers/gpu/drm/i915/i915_dma.c
>> @@ -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_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_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_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),
>> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>> index cb57b9c446f3..6036e3b73b7b 100644
>> --- a/drivers/gpu/drm/i915/intel_drv.h
>> +++ b/drivers/gpu/drm/i915/intel_drv.h
>> @@ -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_sprite_set_colorkey(struct drm_device *dev, void *data,
>>  			      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,
>>  			     uint32_t *start_vbl_count);
>>  void intel_pipe_update_end(struct intel_crtc *crtc, u32 start_vbl_count);
>> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
>> index f41e872ad858..e9ff6fc61267 100644
>> --- a/drivers/gpu/drm/i915/intel_sprite.c
>> +++ b/drivers/gpu/drm/i915/intel_sprite.c
>> @@ -1134,30 +1134,6 @@ out_unlock:
>>  	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)
>>  {
>>  	if (!plane->crtc || !plane->state->fb)
>> -- 
>> 2.1.4
>> 
>
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch

-- 
Jani Nikula, Intel Open Source Technology Center