All of lore.kernel.org
 help / color / mirror / Atom feed
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
To: dri-devel@lists.freedesktop.org
Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
	David Airlie <airlied@linux.ie>
Subject: [PATCH 2/2] drm: rcar-du: Add alpha support for VSP planes
Date: Thu, 21 Apr 2016 04:14:13 +0300	[thread overview]
Message-ID: <1461201253-12170-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com> (raw)
In-Reply-To: <1461201253-12170-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com>

Make the global alpha multiplier of VSP planes configurable through the
alpha property, exactly as for the native DU planes.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
index 62e9619eaea4..7a588f1f6d69 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
@@ -180,9 +180,9 @@ static void rcar_du_vsp_plane_setup(struct rcar_du_vsp_plane *plane)
 
 	WARN_ON(!pixelformat);
 
-	vsp1_du_atomic_update_zpos(plane->vsp->vsp, plane->index, pixelformat,
-				   fb->pitches[0], paddr, &src, &dst,
-				   state->zpos);
+	vsp1_du_atomic_update_ext(plane->vsp->vsp, plane->index, pixelformat,
+				  fb->pitches[0], paddr, &src, &dst,
+				  state->alpha, state->zpos);
 }
 
 static int rcar_du_vsp_plane_atomic_check(struct drm_plane *plane,
@@ -221,8 +221,8 @@ static void rcar_du_vsp_plane_atomic_update(struct drm_plane *plane,
 	if (plane->state->crtc)
 		rcar_du_vsp_plane_setup(rplane);
 	else
-		vsp1_du_atomic_update_zpos(rplane->vsp->vsp, rplane->index,
-					   0, 0, 0, NULL, NULL, 0);
+		vsp1_du_atomic_update_ext(rplane->vsp->vsp, rplane->index,
+					  0, 0, 0, NULL, NULL, 0, 0);
 }
 
 static const struct drm_plane_helper_funcs rcar_du_vsp_plane_helper_funcs = {
-- 
2.7.3


WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
To: dri-devel@lists.freedesktop.org
Cc: linux-renesas-soc@vger.kernel.org, linux-media@vger.kernel.org
Subject: [PATCH 2/2] drm: rcar-du: Add alpha support for VSP planes
Date: Thu, 21 Apr 2016 04:14:13 +0300	[thread overview]
Message-ID: <1461201253-12170-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com> (raw)
In-Reply-To: <1461201253-12170-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com>

Make the global alpha multiplier of VSP planes configurable through the
alpha property, exactly as for the native DU planes.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
index 62e9619eaea4..7a588f1f6d69 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
@@ -180,9 +180,9 @@ static void rcar_du_vsp_plane_setup(struct rcar_du_vsp_plane *plane)
 
 	WARN_ON(!pixelformat);
 
-	vsp1_du_atomic_update_zpos(plane->vsp->vsp, plane->index, pixelformat,
-				   fb->pitches[0], paddr, &src, &dst,
-				   state->zpos);
+	vsp1_du_atomic_update_ext(plane->vsp->vsp, plane->index, pixelformat,
+				  fb->pitches[0], paddr, &src, &dst,
+				  state->alpha, state->zpos);
 }
 
 static int rcar_du_vsp_plane_atomic_check(struct drm_plane *plane,
@@ -221,8 +221,8 @@ static void rcar_du_vsp_plane_atomic_update(struct drm_plane *plane,
 	if (plane->state->crtc)
 		rcar_du_vsp_plane_setup(rplane);
 	else
-		vsp1_du_atomic_update_zpos(rplane->vsp->vsp, rplane->index,
-					   0, 0, 0, NULL, NULL, 0);
+		vsp1_du_atomic_update_ext(rplane->vsp->vsp, rplane->index,
+					  0, 0, 0, NULL, NULL, 0, 0);
 }
 
 static const struct drm_plane_helper_funcs rcar_du_vsp_plane_helper_funcs = {
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2016-04-21  1:14 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-21  1:14 [PATCH 0/2] Renesas R-Car Gen3 DU alpha and z-order support Laurent Pinchart
2016-04-21  1:14 ` Laurent Pinchart
2016-04-21  1:14 ` [PATCH 1/2] drm: rcar-du: Add Z-order support for VSP planes Laurent Pinchart
2016-04-21 16:10   ` Daniel Vetter
2016-04-21 16:10     ` Daniel Vetter
2016-04-21 21:00     ` Laurent Pinchart
2016-04-22  8:29       ` Daniel Vetter
2016-04-21  1:14 ` Laurent Pinchart [this message]
2016-04-21  1:14   ` [PATCH 2/2] drm: rcar-du: Add alpha " Laurent Pinchart
2016-04-21 19:45 ` [PATCH 0/2] Renesas R-Car Gen3 DU alpha and z-order support Dave Airlie
2016-04-21 19:45   ` Dave Airlie

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=1461201253-12170-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com \
    --to=laurent.pinchart+renesas@ideasonboard.com \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.