From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Allow disabling the destination colorkey for overlay
Date: Thu, 2 Apr 2015 13:10:33 +0300 [thread overview]
Message-ID: <20150402101033.GY17410@intel.com> (raw)
In-Reply-To: <1427967308-29348-1-git-send-email-chris@chris-wilson.co.uk>
On Thu, Apr 02, 2015 at 10:35:08AM +0100, Chris Wilson wrote:
> Sometimes userspace wants a true overlay that is never clipped. In such
> cases, we need to disable the destination colorkey. However, it is
> currently unconditionally enabled in the overlay with no means of
> disabling. So rectify that by always default to on, and extending the
> UPDATE_ATTR ioctl to support explicit disabling of the colorkey.
>
> This is contrast to the spite code which requires explicit enabling of
> either the destination or source colorkey. Handling source colorkey is
> still todo for the overlay. (Of course it may be worth migrating overlay
> to sprite before then.)
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Looks all right to me.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> The recent discussion over colorkey reminded me about this feature
> discrepancy in the overlay. 2013!
> ---
> drivers/gpu/drm/i915/intel_overlay.c | 30 +++++++++++++++++++-----------
> include/uapi/drm/i915_drm.h | 1 +
> 2 files changed, 20 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
> index 36400bbbf715..936cf160bb7d 100644
> --- a/drivers/gpu/drm/i915/intel_overlay.c
> +++ b/drivers/gpu/drm/i915/intel_overlay.c
> @@ -175,7 +175,8 @@ struct intel_overlay {
> bool active;
> bool pfit_active;
> u32 pfit_vscale_ratio; /* shifted-point number, (1<<12) == 1.0 */
> - u32 color_key;
> + u32 color_key:24;
> + u32 color_key_enabled:1;
> u32 brightness, contrast, saturation;
> u32 old_xscale, old_yscale;
> /* register access */
> @@ -630,31 +631,36 @@ static void update_colorkey(struct intel_overlay *overlay,
> struct overlay_registers __iomem *regs)
> {
> u32 key = overlay->color_key;
> + u32 flags;
> +
> + flags = 0;
> + if (overlay->color_key_enabled)
> + flags |= DST_KEY_ENABLE;
>
> switch (overlay->crtc->base.primary->fb->bits_per_pixel) {
> case 8:
> - iowrite32(0, ®s->DCLRKV);
> - iowrite32(CLK_RGB8I_MASK | DST_KEY_ENABLE, ®s->DCLRKM);
> + key = 0;
> + flags |= CLK_RGB8I_MASK;
> break;
>
> case 16:
> if (overlay->crtc->base.primary->fb->depth == 15) {
> - iowrite32(RGB15_TO_COLORKEY(key), ®s->DCLRKV);
> - iowrite32(CLK_RGB15_MASK | DST_KEY_ENABLE,
> - ®s->DCLRKM);
> + key = RGB15_TO_COLORKEY(key);
> + flags |= CLK_RGB15_MASK;
> } else {
> - iowrite32(RGB16_TO_COLORKEY(key), ®s->DCLRKV);
> - iowrite32(CLK_RGB16_MASK | DST_KEY_ENABLE,
> - ®s->DCLRKM);
> + key = RGB16_TO_COLORKEY(key);
> + flags |= CLK_RGB16_MASK;
> }
> break;
>
> case 24:
> case 32:
> - iowrite32(key, ®s->DCLRKV);
> - iowrite32(CLK_RGB24_MASK | DST_KEY_ENABLE, ®s->DCLRKM);
> + flags |= CLK_RGB24_MASK;
> break;
> }
> +
> + iowrite32(key, ®s->DCLRKV);
> + iowrite32(flags, ®s->DCLRKM);
> }
>
> static u32 overlay_cmd_reg(struct put_image_params *params)
> @@ -1331,6 +1337,7 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
> I915_WRITE(OGAMC5, attrs->gamma5);
> }
> }
> + overlay->color_key_enabled = (attrs->flags & I915_OVERLAY_DISABLE_DEST_COLORKEY) == 0;
>
> ret = 0;
> out_unlock:
> @@ -1397,6 +1404,7 @@ void intel_setup_overlay(struct drm_device *dev)
>
> /* init all values */
> overlay->color_key = 0x0101fe;
> + overlay->color_key_enabled = true;
> overlay->brightness = -19;
> overlay->contrast = 75;
> overlay->saturation = 146;
> diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
> index 006f026f1ce0..c2e679be8903 100644
> --- a/include/uapi/drm/i915_drm.h
> +++ b/include/uapi/drm/i915_drm.h
> @@ -998,6 +998,7 @@ struct drm_intel_overlay_put_image {
> /* flags */
> #define I915_OVERLAY_UPDATE_ATTRS (1<<0)
> #define I915_OVERLAY_UPDATE_GAMMA (1<<1)
> +#define I915_OVERLAY_DISABLE_DEST_COLORKEY (1<<2)
> struct drm_intel_overlay_attrs {
> __u32 flags;
> __u32 color_key;
> --
> 2.1.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-04-02 10:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-02 9:35 [PATCH] drm/i915: Allow disabling the destination colorkey for overlay Chris Wilson
2015-04-02 10:10 ` Ville Syrjälä [this message]
2015-04-02 17:00 ` shuang.he
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=20150402101033.GY17410@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/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