From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62A9DC49ED9 for ; Thu, 12 Sep 2019 08:05:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F33F2075C for ; Thu, 12 Sep 2019 08:05:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726744AbfILIFy (ORCPT ); Thu, 12 Sep 2019 04:05:54 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:58429 "EHLO relay8-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725789AbfILIFx (ORCPT ); Thu, 12 Sep 2019 04:05:53 -0400 X-Originating-IP: 85.243.204.24 Received: from uno.localdomain (bl10-204-24.dsl.telepac.pt [85.243.204.24]) (Authenticated sender: jacopo@jmondi.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 296811BF210; Thu, 12 Sep 2019 08:05:43 +0000 (UTC) Date: Thu, 12 Sep 2019 10:07:20 +0200 From: Jacopo Mondi To: Kieran Bingham Cc: Jacopo Mondi , laurent.pinchart@ideasonboard.com, geert@linux-m68k.org, horms@verge.net.au, uli+renesas@fpond.eu, VenkataRajesh.Kalakodima@in.bosch.com, airlied@linux.ie, daniel@ffwll.ch, koji.matsuoka.xm@renesas.com, muroya@ksk.co.jp, Harsha.ManjulaMallikarjun@in.bosch.com, linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 6/9] drm: rcar-du: crtc: Enable and disable CMMs Message-ID: <20190912080720.bn7bmu2o3gacrpf4@uno.localdomain> References: <20190906135436.10622-1-jacopo+renesas@jmondi.org> <20190906135436.10622-7-jacopo+renesas@jmondi.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="k2rlv3ba7xccay6w" Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20180716 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org --k2rlv3ba7xccay6w Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Hi Kieran, On Wed, Sep 11, 2019 at 07:40:27PM +0100, Kieran Bingham wrote: > Hi Jacopo, > > On 06/09/2019 14:54, Jacopo Mondi wrote: > > Enable/disable the CMM associated with a CRTC at CRTC start and stop > > time and enable the CMM unit through the Display Extensional Functions > > register at group setup time. > > > > Reviewed-by: Ulrich Hecht > > Reviewed-by: Laurent Pinchart > > Signed-off-by: Jacopo Mondi > > --- > > drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 7 +++++++ > > drivers/gpu/drm/rcar-du/rcar_du_group.c | 8 ++++++++ > > drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 +++++ > > 3 files changed, 20 insertions(+) > > > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > > index 23f1d6cc1719..3dac605c3a67 100644 > > --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > > +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > > @@ -21,6 +21,7 @@ > > #include > > #include > > > > +#include "rcar_cmm.h" > > #include "rcar_du_crtc.h" > > #include "rcar_du_drv.h" > > #include "rcar_du_encoder.h" > > @@ -619,6 +620,9 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc) > > if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_VSP1_SOURCE)) > > rcar_du_vsp_disable(rcrtc); > > > > + if (rcrtc->cmm) > > + rcar_cmm_disable(rcrtc->cmm); > > + > > /* > > * Select switch sync mode. This stops display operation and configures > > * the HSYNC and VSYNC signals as inputs. > > @@ -686,6 +690,9 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc *crtc, > > } > > > > rcar_du_crtc_start(rcrtc); > > + > > + if (rcrtc->cmm) > > + rcar_cmm_enable(rcrtc->cmm); > > } > > > > static void rcar_du_crtc_atomic_disable(struct drm_crtc *crtc, > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.c b/drivers/gpu/drm/rcar-du/rcar_du_group.c > > index 9eee47969e77..25d0fc125d7a 100644 > > --- a/drivers/gpu/drm/rcar-du/rcar_du_group.c > > +++ b/drivers/gpu/drm/rcar-du/rcar_du_group.c > > @@ -147,6 +147,14 @@ static void rcar_du_group_setup(struct rcar_du_group *rgrp) > > > > rcar_du_group_setup_pins(rgrp); > > > > + if (rcar_du_has(rcdu, RCAR_DU_FEATURE_CMM)) { > > + u32 defr7 = DEFR7_CODE > > + | (rgrp->cmms_mask & BIT(1) ? DEFR7_CMME1 : 0) > > + | (rgrp->cmms_mask & BIT(0) ? DEFR7_CMME0 : 0); > > + > > + rcar_du_group_write(rgrp, DEFR7, defr7); > > + } > > + > > What's the effect here on platforms with a CMM, but with > CONFIG_DRM_RCAR_CMM unset? > > Will this incorrectly configure the DU ? > > Will it stall the display if the DU tries to interact with another > module which is not enabled? I recall I tested that (that's why I had to add stubs for CMM functions, as I had linkage errors otherwise) and thing seems to be fine as the CMM configuration/enblement resolve to an empty function. Would you prefer to have this guarded by an #if IS_ENABLED() ? Thanks j > > > > if (rcdu->info->gen >= 2) { > > rcar_du_group_setup_defr8(rgrp); > > rcar_du_group_setup_didsr(rgrp); > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_regs.h b/drivers/gpu/drm/rcar-du/rcar_du_regs.h > > index bc87f080b170..fb9964949368 100644 > > --- a/drivers/gpu/drm/rcar-du/rcar_du_regs.h > > +++ b/drivers/gpu/drm/rcar-du/rcar_du_regs.h > > @@ -197,6 +197,11 @@ > > #define DEFR6_MLOS1 (1 << 2) > > #define DEFR6_DEFAULT (DEFR6_CODE | DEFR6_TCNE1) > > > > +#define DEFR7 0x000ec > > +#define DEFR7_CODE (0x7779 << 16) > > +#define DEFR7_CMME1 BIT(6) > > +#define DEFR7_CMME0 BIT(4) > > + > > /* ----------------------------------------------------------------------------- > > * R8A7790-only Control Registers > > */ > > > --k2rlv3ba7xccay6w Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEtcQ9SICaIIqPWDjAcjQGjxahVjwFAl15/LgACgkQcjQGjxah Vjx7txAAkCrsetrmnCoC6E1dVAdGEDFhdoD9Yba7icsaHU2h1A3HP9VQSAEk7qKr gpLa1OqvyLhpFHy3atZM4vxXq4AUA3g2Usvuth1CKfnbrNG3olfjEyYo3A+07Q82 9SheDJpz4jVFlqcgLD5jEbR1ZxDWiQ5WZdmw+fMxTvn7ZwpRiNSOml6aFpWLx6ET 4pIodHvxzp7+XYhzO7YUEVhihQjdfNDIJS2X2rfaPDR5mwHLFsiyOmQ4r7xxuoYT YCoXNDrwu1V6bks+LF4dhQU2tntJIf4FBl4MxzLToztE3zQcWq1ZFOlEO2qZLXHx hC+hoadzWweV5X4djR1DcSEV0d9oVBBsVqfY2daY7g3Eg8VQM9Kx41WgixZC4dM0 lsgWskHICclFQxaMw15TVf7Ruijaml/OXsD2qNNpWabzsWze0ITZxjQC5MpPzsj/ MGLVYrXZ62bQl2hPj2lItDiqbf1OmpDwJj+bsRA5ZWrEZ8JF803c73HLTtH5weyC KsLl1+gPd56BgzARQvBEwJ6oewgOauQR0AuoUBfdhiQ2rgxQoM+hawqBeXuuMCWY JO6hxT97nuQ0jwN8f55MJPdOCWb4y36ZltKaZLHmSexuAPFDThlaiffnGvdm5l7F WwWpx/+fg5BhdTCZXTnq/+xvU7uvxbdVNS5uWXUPfSH4GoBy7mE= =5xVC -----END PGP SIGNATURE----- --k2rlv3ba7xccay6w--