From patchwork Thu Aug 23 15:12:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 10574843 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 96CEE920 for ; Fri, 24 Aug 2018 07:09:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8512B2C46F for ; Fri, 24 Aug 2018 07:09:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 796562C472; Fri, 24 Aug 2018 07:09:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 16C272C46F for ; Fri, 24 Aug 2018 07:09:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1EA406E624; Fri, 24 Aug 2018 07:09:23 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A05E6E528 for ; Thu, 23 Aug 2018 15:12:34 +0000 (UTC) X-Originating-IP: 2.224.242.101 Received: from w540.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101]) (Authenticated sender: jacopo@jmondi.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 38B21E0010; Thu, 23 Aug 2018 15:12:32 +0000 (UTC) From: Jacopo Mondi To: Laurent Pinchart , David Airlie Subject: [PATCH 4/4] drm: rcar-du: Fix handling of PnMR register Date: Thu, 23 Aug 2018 17:12:14 +0200 Message-Id: <1535037134-373-5-git-send-email-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535037134-373-1-git-send-email-jacopo+renesas@jmondi.org> References: <1535037134-373-1-git-send-email-jacopo+renesas@jmondi.org> X-Mailman-Approved-At: Fri, 24 Aug 2018 07:09:20 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ulrich.hecht+renesas@gmail.com, "open list:DRM DRIVERS FOR RENESAS" , Jacopo Mondi , kieran.bingham@ideasonboard.com, "open list:DRM DRIVERS FOR RENESAS" MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP According to revision 1.00 of R-Car Gen3 Soc manual, setting bits PnMR[13:12] is only valid if the DU group has two channels. It is then valid writing to PnMR[13:12] for: R-Car H3 = DU group 0 and DU group 1 R-Car M3-W, M3-N: DU group 0 only R-Car D3/E3: DU group 0 (no group 1) It is always invalid writing PnMR[13:12] on: R-Car V3M/V3H: only group 0 is present, but with a single channel Signed-off-by: Jacopo Mondi --- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c index 5c2462a..647d2fc 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c @@ -505,8 +505,17 @@ static void rcar_du_plane_setup_format_gen3(struct rcar_du_group *rgrp, unsigned int index, const struct rcar_du_plane_state *state) { - rcar_du_plane_write(rgrp, index, PnMR, - PnMR_SPIM_TP_OFF | state->format->pnmr); + u32 mask = BIT(rgrp->index * 2) | BIT(rgrp->index * 2 + 1); + u32 pnmr = PnMR_SPIM_TP_OFF; + + /* + * Setting PnMR[13:12] is only allowed when more than 1 channel is + * availble in the group. + */ + if ((rgrp->channels_mask & mask) == mask) + pnmr |= state->format->pnmr; + + rcar_du_plane_write(rgrp, index, PnMR, pnmr); rcar_du_plane_write(rgrp, index, PnDDCR4, state->format->edf | PnDDCR4_CODE);