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=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED 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 E8E88C4361B for ; Tue, 8 Dec 2020 15:18:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF02E23A9B for ; Tue, 8 Dec 2020 15:18:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729961AbgLHPSA (ORCPT ); Tue, 8 Dec 2020 10:18:00 -0500 Received: from perceval.ideasonboard.com ([213.167.242.64]:54234 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729734AbgLHPSA (ORCPT ); Tue, 8 Dec 2020 10:18:00 -0500 Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5B00ADD; Tue, 8 Dec 2020 16:17:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1607440637; bh=W7NX3ZMPw5YGTNSjtYYjuD40hn96OeVoj4VtW+qLtBE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=qO9y436yzMWcy4ix5CHnvtxITBO8h4MklQPQcX+VcUPEcgCsBBNJk3WxDuth6GprV 6cp5CWlqnEVGbIHjI3sIHzniIqVg/efliRQgRNrajXVeKwYBScPM19OJnZ3LgEM/92 v2j3I8BeHfZHDZfcg85vAgy1KQXzteTha6mdhwJw= Date: Tue, 8 Dec 2020 17:17:14 +0200 From: Laurent Pinchart To: Tomi Valkeinen Cc: Sebastian Reichel , Nikhil Devshatwar , dri-devel@lists.freedesktop.org, linux-omap@vger.kernel.org, Sekhar Nori , Tony Lindgren , hns@goldelico.com, Sam Ravnborg Subject: Re: [PATCH v5 09/29] drm/omap: dsi: cleanup dispc channel usage Message-ID: References: <20201208122855.254819-1-tomi.valkeinen@ti.com> <20201208122855.254819-10-tomi.valkeinen@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20201208122855.254819-10-tomi.valkeinen@ti.com> Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Hi Tomi, Thank you for the patch. On Tue, Dec 08, 2020 at 02:28:35PM +0200, Tomi Valkeinen wrote: > The "channel" usage in omap dsi driver is confusing. As the first step, > change "channel" to "dispc_channel" when dealing with the dispc channel. > > Signed-off-by: Tomi Valkeinen Reviewed-by: Laurent Pinchart > --- > drivers/gpu/drm/omapdrm/dss/dsi.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c > index c78ae99c8742..cf0dc4872d14 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dsi.c > +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c > @@ -3978,10 +3978,10 @@ static int dsi_configure_dispc_clocks(struct dsi_data *dsi) > > static int dsi_display_init_dispc(struct dsi_data *dsi) > { > - enum omap_channel channel = dsi->output.dispc_channel; > + enum omap_channel dispc_channel = dsi->output.dispc_channel; > int r; > > - dss_select_lcd_clk_source(dsi->dss, channel, dsi->module_id == 0 ? > + dss_select_lcd_clk_source(dsi->dss, dispc_channel, dsi->module_id == 0 ? > DSS_CLK_SRC_PLL1_1 : > DSS_CLK_SRC_PLL2_1); > > @@ -4017,19 +4017,19 @@ static int dsi_display_init_dispc(struct dsi_data *dsi) > dss_mgr_unregister_framedone_handler(&dsi->output, > dsi_framedone_irq_callback, dsi); > err: > - dss_select_lcd_clk_source(dsi->dss, channel, DSS_CLK_SRC_FCK); > + dss_select_lcd_clk_source(dsi->dss, dispc_channel, DSS_CLK_SRC_FCK); > return r; > } > > static void dsi_display_uninit_dispc(struct dsi_data *dsi) > { > - enum omap_channel channel = dsi->output.dispc_channel; > + enum omap_channel dispc_channel = dsi->output.dispc_channel; > > if (dsi->mode == OMAP_DSS_DSI_CMD_MODE) > dss_mgr_unregister_framedone_handler(&dsi->output, > dsi_framedone_irq_callback, dsi); > > - dss_select_lcd_clk_source(dsi->dss, channel, DSS_CLK_SRC_FCK); > + dss_select_lcd_clk_source(dsi->dss, dispc_channel, DSS_CLK_SRC_FCK); > } > > static int dsi_configure_dsi_clocks(struct dsi_data *dsi) > @@ -4846,12 +4846,12 @@ static int dsi_set_config(struct omap_dss_device *dssdev, > } > > /* > - * Return a hardcoded channel for the DSI output. This should work for > + * Return a hardcoded dispc channel for the DSI output. This should work for > * current use cases, but this can be later expanded to either resolve > * the channel in some more dynamic manner, or get the channel as a user > * parameter. > */ > -static enum omap_channel dsi_get_channel(struct dsi_data *dsi) > +static enum omap_channel dsi_get_dispc_channel(struct dsi_data *dsi) > { > switch (dsi->data->model) { > case DSI_MODEL_OMAP3: > @@ -5403,7 +5403,7 @@ static int dsi_init_output(struct dsi_data *dsi) > > out->type = OMAP_DISPLAY_TYPE_DSI; > out->name = dsi->module_id == 0 ? "dsi.0" : "dsi.1"; > - out->dispc_channel = dsi_get_channel(dsi); > + out->dispc_channel = dsi_get_dispc_channel(dsi); > out->dsi_ops = &dsi_ops; > out->of_port = 0; > out->bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE -- Regards, Laurent Pinchart