From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay4-d.mail.gandi.net ([217.70.183.196]:59123 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732576AbeHWSmi (ORCPT ); Thu, 23 Aug 2018 14:42:38 -0400 From: Jacopo Mondi To: Laurent Pinchart , David Airlie Cc: Jacopo Mondi , ulrich.hecht+renesas@gmail.com, kieran.bingham@ideasonboard.com, dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR RENESAS), linux-renesas-soc@vger.kernel.org (open list:DRM DRIVERS FOR RENESAS) 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> In-Reply-To: <1535037134-373-1-git-send-email-jacopo+renesas@jmondi.org> References: <1535037134-373-1-git-send-email-jacopo+renesas@jmondi.org> Sender: linux-renesas-soc-owner@vger.kernel.org List-ID: 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); -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jacopo Mondi 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> References: <1535037134-373-1-git-send-email-jacopo+renesas@jmondi.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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) In-Reply-To: <1535037134-373-1-git-send-email-jacopo+renesas@jmondi.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Laurent Pinchart , David Airlie Cc: ulrich.hecht+renesas@gmail.com, "open list:DRM DRIVERS FOR RENESAS" , Jacopo Mondi , kieran.bingham@ideasonboard.com, "open list:DRM DRIVERS FOR RENESAS" List-Id: dri-devel@lists.freedesktop.org QWNjb3JkaW5nIHRvIHJldmlzaW9uIDEuMDAgb2YgUi1DYXIgR2VuMyBTb2MgbWFudWFsLCBzZXR0 aW5nIGJpdHMKUG5NUlsxMzoxMl0gaXMgb25seSB2YWxpZCBpZiB0aGUgRFUgZ3JvdXAgaGFzIHR3 byBjaGFubmVscy4KCkl0IGlzIHRoZW4gdmFsaWQgd3JpdGluZyB0byBQbk1SWzEzOjEyXSBmb3I6 ClItQ2FyIEgzID0gRFUgZ3JvdXAgMCBhbmQgRFUgZ3JvdXAgMQpSLUNhciBNMy1XLCBNMy1OOiBE VSBncm91cCAwIG9ubHkKUi1DYXIgRDMvRTM6IERVIGdyb3VwIDAgKG5vIGdyb3VwIDEpCgpJdCBp cyBhbHdheXMgaW52YWxpZCB3cml0aW5nIFBuTVJbMTM6MTJdIG9uOgpSLUNhciBWM00vVjNIOiBv bmx5IGdyb3VwIDAgaXMgcHJlc2VudCwgYnV0IHdpdGggYSBzaW5nbGUgY2hhbm5lbAoKU2lnbmVk LW9mZi1ieTogSmFjb3BvIE1vbmRpIDxqYWNvcG8rcmVuZXNhc0BqbW9uZGkub3JnPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfcGxhbmUuYyB8IDEzICsrKysrKysrKysrLS0K IDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfcGxhbmUuYyBiL2RyaXZlcnMv Z3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfcGxhbmUuYwppbmRleCA1YzI0NjJhLi42NDdkMmZjIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X3BsYW5lLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9wbGFuZS5jCkBAIC01MDUsOCArNTA1LDE3 IEBAIHN0YXRpYyB2b2lkIHJjYXJfZHVfcGxhbmVfc2V0dXBfZm9ybWF0X2dlbjMoc3RydWN0IHJj YXJfZHVfZ3JvdXAgKnJncnAsCiAJCQkJCSAgICB1bnNpZ25lZCBpbnQgaW5kZXgsCiAJCQkJCSAg ICBjb25zdCBzdHJ1Y3QgcmNhcl9kdV9wbGFuZV9zdGF0ZSAqc3RhdGUpCiB7Ci0JcmNhcl9kdV9w bGFuZV93cml0ZShyZ3JwLCBpbmRleCwgUG5NUiwKLQkJCSAgICBQbk1SX1NQSU1fVFBfT0ZGIHwg c3RhdGUtPmZvcm1hdC0+cG5tcik7CisJdTMyIG1hc2sgPSBCSVQocmdycC0+aW5kZXggKiAyKSB8 IEJJVChyZ3JwLT5pbmRleCAqIDIgKyAxKTsKKwl1MzIgcG5tciA9IFBuTVJfU1BJTV9UUF9PRkY7 CisKKwkvKgorCSAqIFNldHRpbmcgUG5NUlsxMzoxMl0gaXMgb25seSBhbGxvd2VkIHdoZW4gbW9y ZSB0aGFuIDEgY2hhbm5lbCBpcworCSAqIGF2YWlsYmxlIGluIHRoZSBncm91cC4KKwkgKi8KKwlp ZiAoKHJncnAtPmNoYW5uZWxzX21hc2sgJiBtYXNrKSA9PSBtYXNrKQorCQlwbm1yIHw9IHN0YXRl LT5mb3JtYXQtPnBubXI7CisKKwlyY2FyX2R1X3BsYW5lX3dyaXRlKHJncnAsIGluZGV4LCBQbk1S LCBwbm1yKTsKIAogCXJjYXJfZHVfcGxhbmVfd3JpdGUocmdycCwgaW5kZXgsIFBuRERDUjQsCiAJ CQkgICAgc3RhdGUtPmZvcm1hdC0+ZWRmIHwgUG5ERENSNF9DT0RFKTsKLS0gCjIuNy40CgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFp bGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK