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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 384B6C76192 for ; Tue, 16 Jul 2019 13:22:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 74B4920693 for ; Tue, 16 Jul 2019 13:22:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=fpond.eu header.i=@fpond.eu header.b="d2N5s5+4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727796AbfGPNWi (ORCPT ); Tue, 16 Jul 2019 09:22:38 -0400 Received: from mo4-p02-ob.smtp.rzone.de ([85.215.255.83]:36813 "EHLO mo4-p02-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726997AbfGPNWi (ORCPT ); Tue, 16 Jul 2019 09:22:38 -0400 X-Greylist: delayed 312 seconds by postgrey-1.27 at vger.kernel.org; Tue, 16 Jul 2019 09:22:36 EDT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1563283355; s=strato-dkim-0002; d=fpond.eu; h=Subject:References:In-Reply-To:Message-ID:Cc:To:From:Date: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject:Sender; bh=qZ69iQvbLDq181Tg27Awg5DxpcFR/gNFpimZy9QSJ1o=; b=d2N5s5+4E/KTKZ0bjcx/x28qRr/YSJbf9x9tdjq2MHO8EWRQfzujweQU0yXjxpxlVe +ivQfKN4wzHQPdDq1WpfKZNP2YBeyMijZQpDSn7xPaA/wnw/+6EMa5tu8or9RC+R4TQu m11LPOsJor6Gyy0o7WDpTcz/yISqBHYkPS2T9irs4/cWUiMwUfrqP0yyYlcDebm2ehf3 nK8EQXP54qq6Xm/ZU/1hj0OKkMUbuylTT7kdtBbln1dpPhwIN58aMA2pbwFA4/UA7/K5 9nt8mN7mmicR7RM9J7yasqleCNaHKmAw3SrPXrBBpM0CbyxU3vuz3SnDN1hbLUFIlhBX X5Mw== X-RZG-AUTH: ":OWANVUa4dPFUgKR/3dpvnYP0Np73amq+g13rqGzmt2bYDnKIKaws6YXTsc4=" X-RZG-CLASS-ID: mo00 Received: from oxapp06-01.back.ox.d0m.de by smtp-ox.front (RZmta 44.24 AUTH) with ESMTPSA id h0a328v6GDMWcSQ (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve X9_62_prime256v1 with 256 ECDH bits, eq. 3072 bits RSA)) (Client did not present a certificate); Tue, 16 Jul 2019 15:22:32 +0200 (CEST) Date: Tue, 16 Jul 2019 15:22:32 +0200 (CEST) From: Ulrich Hecht To: Jacopo Mondi , laurent.pinchart@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, airlied@linux.ie, daniel@ffwll.ch Cc: koji.matsuoka.xm@renesas.com, muroya@ksk.co.jp, VenkataRajesh.Kalakodima@in.bosch.com, Harsha.ManjulaMallikarjun@in.bosch.com, linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Message-ID: <517354853.61853.1563283352362@webmail.strato.com> In-Reply-To: <20190706140746.29132-17-jacopo+renesas@jmondi.org> References: <20190706140746.29132-1-jacopo+renesas@jmondi.org> <20190706140746.29132-17-jacopo+renesas@jmondi.org> Subject: Re: [PATCH v2 16/19] drm: rcar-du: kms: Collect CMM instances MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Medium X-Mailer: Open-Xchange Mailer v7.8.4-Rev59 X-Originating-IP: 85.212.152.154 X-Originating-Client: open-xchange-appsuite Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org > On July 6, 2019 at 4:07 PM Jacopo Mondi wrote: > > > Implement device tree parsing to collect the available CMM instances > described by the 'cmms' property. Associate CMMs with CRTCs and store a > mask of active CMMs in the DU group for later enablement. > > Signed-off-by: Jacopo Mondi > --- > drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 6 +++ > drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 2 + > drivers/gpu/drm/rcar-du/rcar_du_drv.h | 3 ++ > drivers/gpu/drm/rcar-du/rcar_du_group.h | 2 + > drivers/gpu/drm/rcar-du/rcar_du_kms.c | 50 +++++++++++++++++++++++++ > 5 files changed, 63 insertions(+) > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > index 2da46e3dc4ae..23f1d6cc1719 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > @@ -1194,6 +1194,12 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int swindex, > if (ret < 0) > return ret; > > + /* CMM might be disabled for this CRTC. */ > + if (rcdu->cmms[swindex]) { > + rcrtc->cmm = rcdu->cmms[swindex]; > + rgrp->cmms_mask |= BIT(hwindex % 2); > + } > + > drm_crtc_helper_add(crtc, &crtc_helper_funcs); > > /* Start with vertical blanking interrupt reporting disabled. */ > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h > index 3b7fc668996f..5f2940c42225 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h > +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h > @@ -39,6 +39,7 @@ struct rcar_du_vsp; > * @vblank_wait: wait queue used to signal vertical blanking > * @vblank_count: number of vertical blanking interrupts to wait for > * @group: CRTC group this CRTC belongs to > + * @cmm: CMM associated with this CRTC > * @vsp: VSP feeding video to this CRTC > * @vsp_pipe: index of the VSP pipeline feeding video to this CRTC > * @writeback: the writeback connector > @@ -64,6 +65,7 @@ struct rcar_du_crtc { > unsigned int vblank_count; > > struct rcar_du_group *group; > + struct platform_device *cmm; > struct rcar_du_vsp *vsp; > unsigned int vsp_pipe; > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h > index a00dccc447aa..300ec60ba31b 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h > +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h > @@ -13,6 +13,7 @@ > #include > #include > > +#include "rcar_cmm.h" > #include "rcar_du_crtc.h" > #include "rcar_du_group.h" > #include "rcar_du_vsp.h" > @@ -70,6 +71,7 @@ struct rcar_du_device_info { > > #define RCAR_DU_MAX_CRTCS 4 > #define RCAR_DU_MAX_GROUPS DIV_ROUND_UP(RCAR_DU_MAX_CRTCS, 2) > +#define RCAR_DU_MAX_CMMS 4 > #define RCAR_DU_MAX_VSPS 4 > > struct rcar_du_device { > @@ -86,6 +88,7 @@ struct rcar_du_device { > struct rcar_du_encoder *encoders[RCAR_DU_OUTPUT_MAX]; > > struct rcar_du_group groups[RCAR_DU_MAX_GROUPS]; > + struct platform_device *cmms[RCAR_DU_MAX_CMMS]; > struct rcar_du_vsp vsps[RCAR_DU_MAX_VSPS]; > > struct { > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.h b/drivers/gpu/drm/rcar-du/rcar_du_group.h > index 87950c1f6a52..b0c1466593a3 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_group.h > +++ b/drivers/gpu/drm/rcar-du/rcar_du_group.h > @@ -22,6 +22,7 @@ struct rcar_du_device; > * @mmio_offset: registers offset in the device memory map > * @index: group index > * @channels_mask: bitmask of populated DU channels in this group > + * @cmms_mask: bitmask of enabled CMMs in this group > * @num_crtcs: number of CRTCs in this group (1 or 2) > * @use_count: number of users of the group (rcar_du_group_(get|put)) > * @used_crtcs: number of CRTCs currently in use > @@ -37,6 +38,7 @@ struct rcar_du_group { > unsigned int index; > > unsigned int channels_mask; > + unsigned int cmms_mask; > unsigned int num_crtcs; > unsigned int use_count; > unsigned int used_crtcs; > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c > index f8f7fff34dff..b79cda2f5531 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c > @@ -18,6 +18,7 @@ > #include > > #include > +#include > #include > > #include "rcar_du_crtc.h" > @@ -534,6 +535,51 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu) > return ret; > } > > +static int rcar_du_cmm_init(struct rcar_du_device *rcdu) > +{ > + const struct device_node *np = rcdu->dev->of_node; > + unsigned int i; > + int cells; > + > + cells = of_property_count_u32_elems(np, "cmms"); > + if (cells == -EINVAL) > + return 0; > + > + if (cells > RCAR_DU_MAX_CMMS || cells > rcdu->num_crtcs) { > + dev_err(rcdu->dev, "Invalid 'cmms' property format\n"); > + return -EINVAL; > + } > + > + for (i = 0; i < cells; ++i) { > + struct platform_device *pdev; > + struct device_node *cmm; > + > + cmm = of_parse_phandle(np, "cmms", i); > + if (IS_ERR(cmm)) { > + dev_err(rcdu->dev, "Failed to parse 'cmms' property\n"); > + return PTR_ERR(cmm); > + } > + > + pdev = of_find_device_by_node(cmm); > + if (IS_ERR(pdev)) { > + dev_err(rcdu->dev, "No device found for cmms[%u]\n", i); > + of_node_put(cmm); > + return PTR_ERR(pdev); > + } > + > + if (!of_device_is_available(cmm)) { > + /* It's fine to have a phandle to a non-enabled CMM. */ > + of_node_put(cmm); > + continue; > + } > + > + of_node_put(cmm); > + rcdu->cmms[i] = pdev; > + } > + > + return 0; > +} > + > int rcar_du_modeset_init(struct rcar_du_device *rcdu) > { > static const unsigned int mmio_offsets[] = { > @@ -624,6 +670,10 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) > return ret; > } > > + /* Initialize the Color Management Modules. */ > + if (rcar_du_cmm_init(rcdu)) > + return ret; > + > /* Create the CRTCs. */ > for (swindex = 0, hwindex = 0; swindex < rcdu->num_crtcs; ++hwindex) { > struct rcar_du_group *rgrp; > -- > 2.21.0 > Reviewed-by: Ulrich Hecht CU Uli