[Intel-gfx] [PATCH] drm/i915: Reject the colorkey ioctls for primary and cursor planes

[Jani Nikula]

On Mon, 30 Mar 2015, Daniel Vetter <daniel at ffwll.ch> wrote:
> On Fri, Mar 27, 2015 at 07:59:40PM +0200, ville.syrjala at linux.intel.com wrote:
>> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>> 
>> The legcy colorkey ioctls are only implemented for sprite planes, so
>> reject the ioctl for primary/cursor planes. If we want to support
>> colorkeying with these planes (assuming we have hw support of course)
>> we should just move ahead with the colorkey property conversion.
>> 
>> Cc: Tommi Rantala <tt.rantala at gmail.com>
>> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> Testcase: kms_legacy_colorkey
> Cc: stable at vger.kernel.org
> Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Pushed to drm-intel-fixes, with cc: stable and a bunch of other tags
added, thanks for the patch, review, and testing.

BR,
Jani.



>
>> ---
>>  drivers/gpu/drm/i915/intel_sprite.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
>> index f41e872..7017384 100644
>> --- a/drivers/gpu/drm/i915/intel_sprite.c
>> +++ b/drivers/gpu/drm/i915/intel_sprite.c
>> @@ -1113,7 +1113,7 @@ int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
>>  	drm_modeset_lock_all(dev);
>>  
>>  	plane = drm_plane_find(dev, set->plane_id);
>> -	if (!plane) {
>> +	if (!plane || plane->type != DRM_PLANE_TYPE_OVERLAY) {
>>  		ret = -ENOENT;
>>  		goto out_unlock;
>>  	}
>> @@ -1145,7 +1145,7 @@ int intel_sprite_get_colorkey(struct drm_device *dev, void *data,
>>  	drm_modeset_lock_all(dev);
>>  
>>  	plane = drm_plane_find(dev, get->plane_id);
>> -	if (!plane) {
>> +	if (!plane || plane->type != DRM_PLANE_TYPE_OVERLAY) {
>>  		ret = -ENOENT;
>>  		goto out_unlock;
>>  	}
>> -- 
>> 2.0.5
>> 
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch

-- 
Jani Nikula, Intel Open Source Technology Center