From: Daniel Vetter <daniel@ffwll.ch>
To: Damien Lespiau <damien.lespiau@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915/skl: Fix plane index in the colorkey vfuncs
Date: Tue, 10 Mar 2015 11:32:10 +0100 [thread overview]
Message-ID: <20150310103210.GN3800@phenom.ffwll.local> (raw)
In-Reply-To: <1423873606-15888-1-git-send-email-damien.lespiau@intel.com>
On Sat, Feb 14, 2015 at 12:26:46AM +0000, Damien Lespiau wrote:
> While the SKL versions of update_plane() and disable_plane() have been
> fixed before hitting upstream, the colorkey vfuncs have been left behind
> and so register writes for sprite 0 were landing on plane 0 (primary
> plane) instead of plane 1.
>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Sounds like we need an igt for this stuff asap, and then maybe also
converting this over to atomic props properly.
-Daniel
> ---
> 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 f2d408d..9bd5e28 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -308,7 +308,7 @@ skl_update_colorkey(struct drm_plane *drm_plane,
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_plane *intel_plane = to_intel_plane(drm_plane);
> const int pipe = intel_plane->pipe;
> - const int plane = intel_plane->plane;
> + const int plane = intel_plane->plane + 1;
> u32 plane_ctl;
>
> I915_WRITE(PLANE_KEYVAL(pipe, plane), key->min_value);
> @@ -336,7 +336,7 @@ skl_get_colorkey(struct drm_plane *drm_plane,
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_plane *intel_plane = to_intel_plane(drm_plane);
> const int pipe = intel_plane->pipe;
> - const int plane = intel_plane->plane;
> + const int plane = intel_plane->plane + 1;
> u32 plane_ctl;
>
> key->min_value = I915_READ(PLANE_KEYVAL(pipe, plane));
> --
> 1.8.3.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2015-03-10 10:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-14 0:26 [PATCH] drm/i915/skl: Fix plane index in the colorkey vfuncs Damien Lespiau
2015-02-14 12:15 ` shuang.he
2015-03-10 10:32 ` Daniel Vetter [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=20150310103210.GN3800@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=damien.lespiau@intel.com \
--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