From: Jani Nikula <jani.nikula@linux.intel.com>
To: Daniel Vetter <daniel@ffwll.ch>, ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Reject the colorkey ioctls for primary and cursor planes
Date: Thu, 02 Apr 2015 11:31:32 +0300 [thread overview]
Message-ID: <87fv8jrkwr.fsf@intel.com> (raw)
In-Reply-To: <20150330094557.GM23521@phenom.ffwll.local>
On Mon, 30 Mar 2015, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Fri, Mar 27, 2015 at 07:59:40PM +0200, ville.syrjala@linux.intel.com wrote:
>> From: Ville Syrjälä <ville.syrjala@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@gmail.com>
>> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Testcase: kms_legacy_colorkey
> Cc: stable@vger.kernel.org
> Reviewed-by: Daniel Vetter <daniel.vetter@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@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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2015-04-02 8:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-27 17:59 [PATCH] drm/i915: Reject the colorkey ioctls for primary and cursor planes ville.syrjala
2015-03-27 19:18 ` [PATCH i-g-t] tests: Add kms_legacy_colorkey ville.syrjala
2015-03-30 10:55 ` Thomas Wood
2015-03-28 8:34 ` [PATCH] drm/i915: Reject the colorkey ioctls for primary and cursor planes shuang.he
2015-03-29 18:45 ` Tommi Rantala
2015-03-30 9:45 ` Daniel Vetter
2015-04-02 8:31 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fv8jrkwr.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox