From patchwork Thu Apr 21 01:14:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 8895621 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 288279F39A for ; Thu, 21 Apr 2016 01:14:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8760E201FA for ; Thu, 21 Apr 2016 01:14:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DFC39202F2 for ; Thu, 21 Apr 2016 01:14:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751742AbcDUBOI (ORCPT ); Wed, 20 Apr 2016 21:14:08 -0400 Received: from galahad.ideasonboard.com ([185.26.127.97]:33561 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751430AbcDUBOH (ORCPT ); Wed, 20 Apr 2016 21:14:07 -0400 Received: from avalon.bb.dnainternet.fi (85-23-193-79.bb.dnainternet.fi [85.23.193.79]) by galahad.ideasonboard.com (Postfix) with ESMTPSA id 1B5092009B; Thu, 21 Apr 2016 03:13:32 +0200 (CEST) From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, David Airlie Subject: [PATCH 2/2] drm: rcar-du: Add alpha support for VSP planes Date: Thu, 21 Apr 2016 04:14:13 +0300 Message-Id: <1461201253-12170-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1461201253-12170-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> References: <1461201253-12170-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 = {