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=-15.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 000C1C433E0 for ; Mon, 8 Mar 2021 09:12:03 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5DB69650AE for ; Mon, 8 Mar 2021 09:12:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5DB69650AE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=foss.st.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:CC:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bKpjvhnWxGone2f5AKZPl/FpRoqZofLreqDE0GryTH4=; b=VO2tCZOW8n49Pg8IzS+nJaiWX 5vw0Nm7q0BOOgGCJPrgzvOSc7YvZrqlRD+g3QoXwZzbFs1zX8C1lZZH3qR0cmmfGSLGY5vSJI6eEH joW72p6zo45bPYz8ypENd+Zl0yvQ6V0EyBGaIFaoQadXOGChiVNCWUA7RGOgwQyEhVJx7djGcAKNL j/o8f49ZC7jUh5NkRqRpIoebj7lLCYYH/XP9gk6CkpGnwDkpPU9dqW+MPgTZ1G+qAYpKMI9XVlnR6 gOV8AU2eXdb7ycpB1UbIrBBCzguCBUiUogYfo+SApg32jO0rOq1yQVzjGWTdE998tspDzjCZe4PTX p/T8neRtg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lJBuT-00G6ut-6m; Mon, 08 Mar 2021 09:10:41 +0000 Received: from mx07-00178001.pphosted.com ([185.132.182.106]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lJBuJ-00G6ql-B9 for linux-arm-kernel@lists.infradead.org; Mon, 08 Mar 2021 09:10:33 +0000 Received: from pps.filterd (m0241204.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 12891mTe032543; Mon, 8 Mar 2021 10:10:22 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=selector1; bh=tsMjJOhPvrssHU3XosBPfY8oVdtkhbbslA07x76rM/E=; b=wEdvm+Bfs6C54dQRSTGCLvURrvgrhWLVN2E8qQ07IA6sMQn8AVPYa1jkfem16bRcezwU K8LxNOzIzkmiFzd4gKNGhag3Mq/lpFlz9g+pzSbQPlnULX5wf50VSQbey1CVSsRQHGO4 zFBcoq6FZnXIMktcGdi6gYvmPeiNF57QpRP37E3ne4VuCl3YR3uuQxvCe1rn3DQ8t2/O 1JyN7N0uuh+0BdG1uAcs9BvOiKJ0/kWb9Mq8AbGbEvMk3hsqu2Loz0WbPPBP009/WmUk mUFusDjbt+6XATjrQm9xHX2jWD9hTq7kENTCnOCpmDXoV27v0a+M+n/TXNKx0lp58XL3 xQ== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 3741y6h0rw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 Mar 2021 10:10:22 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 1EB7010002A; Mon, 8 Mar 2021 10:10:22 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node3.st.com [10.75.127.6]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 0C2C123D713; Mon, 8 Mar 2021 10:10:22 +0100 (CET) Received: from lmecxl0951.lme.st.com (10.75.127.46) by SFHDAG2NODE3.st.com (10.75.127.6) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 8 Mar 2021 10:10:20 +0100 Subject: Re: [PATCH 2/2] drm/stm: dsi: Use dev_ based logging To: Raphael GALLAIS-POU - foss , "Yannick FERTRE" , Philippe CORNU , Benjamin Gaignard , Vincent ABRIOU , Sam Ravnborg , Joe Perches CC: David Airlie , Daniel Vetter , "Maxime Coquelin" , Alexandre TORGUE , "dri-devel@lists.freedesktop.org" , "linux-stm32@st-md-mailman.stormreply.com" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Philippe CORNU - foss , Raphael GALLAIS-POU , Alexandre TORGUE - foss References: <20210222092205.32086-1-raphael.gallais-pou@foss.st.com> <20210222092205.32086-3-raphael.gallais-pou@foss.st.com> From: yannick Fertre Message-ID: Date: Mon, 8 Mar 2021 10:10:20 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210222092205.32086-3-raphael.gallais-pou@foss.st.com> Content-Language: en-US X-Originating-IP: [10.75.127.46] X-ClientProxiedBy: SFHDAG2NODE2.st.com (10.75.127.5) To SFHDAG2NODE3.st.com (10.75.127.6) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369, 18.0.761 definitions=2021-03-08_04:2021-03-08, 2021-03-08 signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210308_091031_576615_20A65D3E X-CRM114-Status: GOOD ( 27.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Tested-by: Yannick Fertre On 2/22/21 10:23 AM, Raphael GALLAIS-POU - foss wrote: > From: Yannick Fertre > > Standardize on the dev_ based logging. > > Signed-off-by: Raphael Gallais-Pou > Signed-off-by: Yannick Fertre > --- > drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 49 ++++++++++++++------------- > 1 file changed, 26 insertions(+), 23 deletions(-) > > diff --git a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c > index 8399d337589d..a7226bb3d0e8 100644 > --- a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c > +++ b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c > @@ -76,6 +76,7 @@ enum dsi_color { > > struct dw_mipi_dsi_stm { > void __iomem *base; > + struct device *dev; > struct clk *pllref_clk; > struct dw_mipi_dsi *dsi; > u32 hw_version; > @@ -110,7 +111,8 @@ static inline void dsi_update_bits(struct dw_mipi_dsi_stm *dsi, u32 reg, > dsi_write(dsi, reg, (dsi_read(dsi, reg) & ~mask) | val); > } > > -static enum dsi_color dsi_color_from_mipi(enum mipi_dsi_pixel_format fmt) > +static enum dsi_color dsi_color_from_mipi(struct dw_mipi_dsi_stm *dsi, > + enum mipi_dsi_pixel_format fmt) > { > switch (fmt) { > case MIPI_DSI_FMT_RGB888: > @@ -122,7 +124,7 @@ static enum dsi_color dsi_color_from_mipi(enum mipi_dsi_pixel_format fmt) > case MIPI_DSI_FMT_RGB565: > return DSI_RGB565_CONF1; > default: > - DRM_DEBUG_DRIVER("MIPI color invalid, so we use rgb888\n"); > + dev_dbg(dsi->dev, "MIPI color invalid, so we use rgb888\n"); > } > return DSI_RGB888; > } > @@ -205,14 +207,14 @@ static int dw_mipi_dsi_phy_init(void *priv_data) > ret = readl_poll_timeout(dsi->base + DSI_WISR, val, val & WISR_RRS, > SLEEP_US, TIMEOUT_US); > if (ret) > - DRM_DEBUG_DRIVER("!TIMEOUT! waiting REGU, let's continue\n"); > + dev_dbg(dsi->dev, "!TIMEOUT! waiting REGU, let's continue\n"); > > /* Enable the DSI PLL & wait for its lock */ > dsi_set(dsi, DSI_WRPCR, WRPCR_PLLEN); > ret = readl_poll_timeout(dsi->base + DSI_WISR, val, val & WISR_PLLLS, > SLEEP_US, TIMEOUT_US); > if (ret) > - DRM_DEBUG_DRIVER("!TIMEOUT! waiting PLL, let's continue\n"); > + dev_dbg(dsi->dev, "!TIMEOUT! waiting PLL, let's continue\n"); > > return 0; > } > @@ -221,7 +223,7 @@ static void dw_mipi_dsi_phy_power_on(void *priv_data) > { > struct dw_mipi_dsi_stm *dsi = priv_data; > > - DRM_DEBUG_DRIVER("\n"); > + dev_dbg(dsi->dev, "\n"); > > /* Enable the DSI wrapper */ > dsi_set(dsi, DSI_WCR, WCR_DSIEN); > @@ -231,7 +233,7 @@ static void dw_mipi_dsi_phy_power_off(void *priv_data) > { > struct dw_mipi_dsi_stm *dsi = priv_data; > > - DRM_DEBUG_DRIVER("\n"); > + dev_dbg(dsi->dev, "\n"); > > /* Disable the DSI wrapper */ > dsi_clear(dsi, DSI_WCR, WCR_DSIEN); > @@ -267,11 +269,11 @@ dw_mipi_dsi_get_lane_mbps(void *priv_data, const struct drm_display_mode *mode, > > if (pll_out_khz > dsi->lane_max_kbps) { > pll_out_khz = dsi->lane_max_kbps; > - DRM_WARN("Warning max phy mbps is used\n"); > + dev_warn(dsi->dev, "Warning max phy mbps is used\n"); > } > if (pll_out_khz < dsi->lane_min_kbps) { > pll_out_khz = dsi->lane_min_kbps; > - DRM_WARN("Warning min phy mbps is used\n"); > + dev_warn(dsi->dev, "Warning min phy mbps is used\n"); > } > > /* Compute best pll parameters */ > @@ -281,7 +283,7 @@ dw_mipi_dsi_get_lane_mbps(void *priv_data, const struct drm_display_mode *mode, > ret = dsi_pll_get_params(dsi, pll_in_khz, pll_out_khz, > &idf, &ndiv, &odf); > if (ret) > - DRM_WARN("Warning dsi_pll_get_params(): bad params\n"); > + dev_warn(dsi->dev, "Warning dsi_pll_get_params(): bad params\n"); > > /* Get the adjusted pll out value */ > pll_out_khz = dsi_pll_get_clkout_khz(pll_in_khz, idf, ndiv, odf); > @@ -299,13 +301,12 @@ dw_mipi_dsi_get_lane_mbps(void *priv_data, const struct drm_display_mode *mode, > > /* Select the color coding */ > dsi_update_bits(dsi, DSI_WCFGR, WCFGR_COLMUX, > - dsi_color_from_mipi(format) << 1); > + dsi_color_from_mipi(dsi, format) << 1); > > *lane_mbps = pll_out_khz / 1000; > > - DRM_DEBUG_DRIVER("pll_in %ukHz pll_out %ukHz lane_mbps %uMHz\n", > - pll_in_khz, pll_out_khz, *lane_mbps); > - > + dev_dbg(dsi->dev, "pll_in %ukHz pll_out %ukHz lane_mbps %uMHz\n", > + pll_in_khz, pll_out_khz, *lane_mbps); > return 0; > } > > @@ -352,11 +353,13 @@ static int dw_mipi_dsi_stm_probe(struct platform_device *pdev) > if (!dsi) > return -ENOMEM; > > + dsi->dev = dev; > + > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > dsi->base = devm_ioremap_resource(dev, res); > if (IS_ERR(dsi->base)) { > ret = PTR_ERR(dsi->base); > - DRM_ERROR("Unable to get dsi registers %d\n", ret); > + dev_err(dev, "Unable to get dsi registers %d\n", ret); > return ret; > } > > @@ -369,7 +372,7 @@ static int dw_mipi_dsi_stm_probe(struct platform_device *pdev) > > ret = regulator_enable(dsi->vdd_supply); > if (ret) { > - DRM_ERROR("Failed to enable regulator: %d\n", ret); > + dev_err(dev, "Failed to enable regulator: %d\n", ret); > return ret; > } > > @@ -382,20 +385,20 @@ static int dw_mipi_dsi_stm_probe(struct platform_device *pdev) > > ret = clk_prepare_enable(dsi->pllref_clk); > if (ret) { > - DRM_ERROR("Failed to enable pllref_clk: %d\n", ret); > + dev_err(dev, "Failed to enable pllref_clk: %d\n", ret); > goto err_clk_get; > } > > pclk = devm_clk_get(dev, "pclk"); > if (IS_ERR(pclk)) { > ret = PTR_ERR(pclk); > - DRM_ERROR("Unable to get peripheral clock: %d\n", ret); > + dev_err(dev, "Unable to get peripheral clock: %d\n", ret); > goto err_dsi_probe; > } > > ret = clk_prepare_enable(pclk); > if (ret) { > - DRM_ERROR("%s: Failed to enable peripheral clk\n", __func__); > + dev_err(dev, "%s: Failed to enable peripheral clk\n", __func__); > goto err_dsi_probe; > } > > @@ -404,7 +407,7 @@ static int dw_mipi_dsi_stm_probe(struct platform_device *pdev) > > if (dsi->hw_version != HWVER_130 && dsi->hw_version != HWVER_131) { > ret = -ENODEV; > - DRM_ERROR("bad dsi hardware version\n"); > + dev_err(dev, "bad dsi hardware version\n"); > goto err_dsi_probe; > } > > @@ -445,7 +448,7 @@ static int __maybe_unused dw_mipi_dsi_stm_suspend(struct device *dev) > { > struct dw_mipi_dsi_stm *dsi = dw_mipi_dsi_stm_plat_data.priv_data; > > - DRM_DEBUG_DRIVER("\n"); > + dev_dbg(dsi->dev, "\n"); > > clk_disable_unprepare(dsi->pllref_clk); > regulator_disable(dsi->vdd_supply); > @@ -458,18 +461,18 @@ static int __maybe_unused dw_mipi_dsi_stm_resume(struct device *dev) > struct dw_mipi_dsi_stm *dsi = dw_mipi_dsi_stm_plat_data.priv_data; > int ret; > > - DRM_DEBUG_DRIVER("\n"); > + dev_dbg(dsi->dev, "\n"); > > ret = regulator_enable(dsi->vdd_supply); > if (ret) { > - DRM_ERROR("Failed to enable regulator: %d\n", ret); > + dev_err(dev, "Failed to enable regulator: %d\n", ret); > return ret; > } > > ret = clk_prepare_enable(dsi->pllref_clk); > if (ret) { > regulator_disable(dsi->vdd_supply); > - DRM_ERROR("Failed to enable pllref_clk: %d\n", ret); > + dev_err(dev, "Failed to enable pllref_clk: %d\n", ret); > return ret; > } > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel