From nobody Sat Feb 7 11:38:06 2026 Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 46CB91E5B72 for ; Sat, 1 Mar 2025 17:36:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.11.138.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740850590; cv=none; b=WmtcUB43lp7yxzKk4orInfPdRoKQJGQWk3F5fsLLYBgiyjyYG/oGUwJRXWlQOWQbxrhjCVxBTlFWEUi7KTfRC2PXWPbbd58bt0WRgzfCXCeYquQ2VW8zH1YVn74ThDuif+0AOjufI9Ea5kBFHF20O0kY26oAYR8yiR7cToG+HVc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740850590; c=relaxed/simple; bh=4cFrJzdvIBeLK1E4VwP8M4rBsGeMFMns4LjpE0CsqYo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=scYlpV30C7mTWB2Tv6i7IfZLx4/HoEQVot761+iMoxsmVDNTeMua2FXECHGWaRaw3Z4gZ1d+trTPvC2VXoEXqmHiBC22uKHyF0ZPEdUjDBhUmWlNeaoAKipjPAjKXBUhKWHlsncDhQrzmCjRdZSgrX3j6sQAfcZBfhwYV4VFF+Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de; spf=pass smtp.mailfrom=sntech.de; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b=0fBkTHGP; arc=none smtp.client-ip=185.11.138.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sntech.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b="0fBkTHGP" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sntech.de; s=gloria202408; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=khpROQz+QoHslWzkgE9bCS7jGbs+TMKrHMOcimF7a4I=; b=0fBkTHGP4ldi2nAVA5K4i25Xtb YZRlvA0+aq8oHnqqyaVNwNweokElJnVn1SG7vorhi89gKFsUmamxLngSd/2On6B/AGMX1ey0zpWdk +lw+LtXd7yEaHE47Pv4h7JvwX3dLw9WHayFqWATSuGcp6FYn7kOEF8PAeRpkuTdB3AkKfGJSwFtge 0Ayf1wnHf4p8rjIHq2qkjnzk+c8vWNA2EhZ1zG/GyZs/IL2IBF9E2xzlhFdtpd0VaYaU3ufXroD37 iW6pS+bT5TkovpbD/Wu9IeAHBOw+BVs+CzS+hxzxZpcYlq1fiy4NsUVRocyBYuMzpKeWt17S9uTZ/ Nvf91OKw==; Received: from i53875b47.versanet.de ([83.135.91.71] helo=localhost.localdomain) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1toQkn-0001Tm-OM; Sat, 01 Mar 2025 18:35:57 +0100 From: Heiko Stuebner To: heiko@sntech.de Cc: andy.yan@rock-chips.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, quentin.schulz@cherry.de, Heiko Stuebner Subject: [PATCH v2 1/2] drm/rockchip: lvds: move pclk preparation in with clk_get Date: Sat, 1 Mar 2025 18:35:46 +0100 Message-ID: <20250301173547.710245-2-heiko@sntech.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250301173547.710245-1-heiko@sntech.de> References: <20250301173547.710245-1-heiko@sntech.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Heiko Stuebner The LVDS block needs a separate pclk only on some socs, so currently requests and prepares it in the soc-specific probe function, but common code is required to unprepare it in the error path or on driver remove. While this works because clk_unprepare just does nothing if clk is NULL, this mismatch of who is responsible still is not very nice. The clock-framework already has a helper for clk-get-and-prepare even with devres support in devm_clk_get_prepared(). This will get and prepare the clock and also unprepare it on driver removal, saving the driver from having to handle it "manually". Reviewed-by: Quentin Schulz Signed-off-by: Heiko Stuebner --- drivers/gpu/drm/rockchip/rockchip_lvds.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/roc= kchip/rockchip_lvds.c index 385cf6881504..ecfae8d5da89 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -448,15 +448,13 @@ struct drm_encoder_helper_funcs px30_lvds_encoder_hel= per_funcs =3D { static int rk3288_lvds_probe(struct platform_device *pdev, struct rockchip_lvds *lvds) { - int ret; - lvds->regs =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(lvds->regs)) return PTR_ERR(lvds->regs); =20 - lvds->pclk =3D devm_clk_get(lvds->dev, "pclk_lvds"); + lvds->pclk =3D devm_clk_get_prepared(lvds->dev, "pclk_lvds"); if (IS_ERR(lvds->pclk)) { - DRM_DEV_ERROR(lvds->dev, "could not get pclk_lvds\n"); + DRM_DEV_ERROR(lvds->dev, "could not get or prepare pclk_lvds\n"); return PTR_ERR(lvds->pclk); } =20 @@ -480,12 +478,6 @@ static int rk3288_lvds_probe(struct platform_device *p= dev, } } =20 - ret =3D clk_prepare(lvds->pclk); - if (ret < 0) { - DRM_DEV_ERROR(lvds->dev, "failed to prepare pclk_lvds\n"); - return ret; - } - return 0; } =20 @@ -728,20 +720,15 @@ static int rockchip_lvds_probe(struct platform_device= *pdev) dev_set_drvdata(dev, lvds); =20 ret =3D component_add(&pdev->dev, &rockchip_lvds_component_ops); - if (ret < 0) { + if (ret < 0) DRM_DEV_ERROR(dev, "failed to add component\n"); - clk_unprepare(lvds->pclk); - } =20 return ret; } =20 static void rockchip_lvds_remove(struct platform_device *pdev) { - struct rockchip_lvds *lvds =3D platform_get_drvdata(pdev); - component_del(&pdev->dev, &rockchip_lvds_component_ops); - clk_unprepare(lvds->pclk); } =20 struct platform_driver rockchip_lvds_driver =3D { --=20 2.47.2 From nobody Sat Feb 7 11:38:06 2026 Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 48CFD1E5B75 for ; Sat, 1 Mar 2025 17:36:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.11.138.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740850591; cv=none; b=p4cKMmCH06YPJMCM9itNTqObetMoVy9Xkou5VZMMb7+5N4HAd1lBypJxXaJEt3kNs4WiJM9RdITKYPfcTpvlkckxzHYF3ZqsKO4KdxWAJCjOuiMv1ntSIvAjV6hbLffzlfPWEr8cl+M9iGMrg2OzbbKEF/TLX7cFOet2BYzu53U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740850591; c=relaxed/simple; bh=3cSeg5GwvnCo+tre/YDJWXX0o42C0vQkWcKow0a5Nfg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T1DdXQsFck8a8jpJvccmACAfiqDOXXW3Ex/xeZ5iDWpWWxU8bBo+/JBuBMZ6p5u/LA9/RAEX23fxaQcQLyBQ/ndR9XNTfz9QBsQVIu3J9o/Mwv7tlr1hCf6xE57RG6k3/0252Z2F32q9a0Od0HOX9SkVXY82QM6R/fEgcfnuobY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de; spf=pass smtp.mailfrom=sntech.de; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b=Q84TEPT3; arc=none smtp.client-ip=185.11.138.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sntech.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b="Q84TEPT3" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sntech.de; s=gloria202408; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bqrftD8D/m+VwtB6WWXkN3nmmoijpnDNS2a+SxSawOE=; b=Q84TEPT3RY1a94rODGKy4I7/6n PaTb7Gps1jGksrOAo6BX7GVFVYAXxJnubNBE3pCAjaQNkMHxlQUV5M/Y5ZY9tdSxa9aFZHOq5QngB frgnj28N7/HPMYrNM1xVznRncR7+eqtfVnO5MF/JYpqcSswE8Emseal5/5vHBvArhgkn8W5gSl462 EKty6xleSqI5ka2S+OtEsdV+igKi+u57v8m6+KKF2A0XOfGJVJjmxXj9V40tRnYWkwNgNQqO78cPI +RVkEDJ3cCzjptIX6ExspG9LgewNdQKC465C+JWY9w/38t81x008HX3IFkIGqKRMxbMPgIGJRbjaj 1RVzaImg==; Received: from i53875b47.versanet.de ([83.135.91.71] helo=localhost.localdomain) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1toQko-0001Tm-83; Sat, 01 Mar 2025 18:35:58 +0100 From: Heiko Stuebner To: heiko@sntech.de Cc: andy.yan@rock-chips.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, quentin.schulz@cherry.de, Heiko Stuebner Subject: [PATCH v2 2/2] drm/rockchip: lvds: Hide scary error messages on probe deferral Date: Sat, 1 Mar 2025 18:35:47 +0100 Message-ID: <20250301173547.710245-3-heiko@sntech.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250301173547.710245-1-heiko@sntech.de> References: <20250301173547.710245-1-heiko@sntech.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Heiko Stuebner Commit 52d11c863ac9 ("drm/rockchip: lvds: do not print scary message when probing defer") already started hiding scary messages that are not relevant if the requested supply just returned EPROBE_DEFER, but there are more possible sources - like the phy. So modernize the whole logging in the probe path by replacing the remaining deprecated DRM_DEV_ERROR with appropriate dev_err(_probe) and drm_err calls. The distinction here is that all messages talking about mishaps of the lvds element use dev_err(_probe) while messages caused by interaction with the main Rockchip drm-device use drm_err. Signed-off-by: Heiko Stuebner --- drivers/gpu/drm/rockchip/rockchip_lvds.c | 61 ++++++++++-------------- 1 file changed, 26 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/roc= kchip/rockchip_lvds.c index ecfae8d5da89..d8b2007123fa 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -453,10 +453,9 @@ static int rk3288_lvds_probe(struct platform_device *p= dev, return PTR_ERR(lvds->regs); =20 lvds->pclk =3D devm_clk_get_prepared(lvds->dev, "pclk_lvds"); - if (IS_ERR(lvds->pclk)) { - DRM_DEV_ERROR(lvds->dev, "could not get or prepare pclk_lvds\n"); - return PTR_ERR(lvds->pclk); - } + if (IS_ERR(lvds->pclk)) + return dev_err_probe(lvds->dev, PTR_ERR(lvds->pclk), + "could not get or prepare pclk_lvds\n"); =20 lvds->pins =3D devm_kzalloc(lvds->dev, sizeof(*lvds->pins), GFP_KERNEL); @@ -465,14 +464,14 @@ static int rk3288_lvds_probe(struct platform_device *= pdev, =20 lvds->pins->p =3D devm_pinctrl_get(lvds->dev); if (IS_ERR(lvds->pins->p)) { - DRM_DEV_ERROR(lvds->dev, "no pinctrl handle\n"); + dev_err(lvds->dev, "no pinctrl handle\n"); devm_kfree(lvds->dev, lvds->pins); lvds->pins =3D NULL; } else { lvds->pins->default_state =3D pinctrl_lookup_state(lvds->pins->p, "lcdc"); if (IS_ERR(lvds->pins->default_state)) { - DRM_DEV_ERROR(lvds->dev, "no default pinctrl state\n"); + dev_err(lvds->dev, "no default pinctrl state\n"); devm_kfree(lvds->dev, lvds->pins); lvds->pins =3D NULL; } @@ -547,11 +546,10 @@ static int rockchip_lvds_bind(struct device *dev, str= uct device *master, =20 lvds->drm_dev =3D drm_dev; port =3D of_graph_get_port_by_id(dev->of_node, 1); - if (!port) { - DRM_DEV_ERROR(dev, - "can't found port point, please init lvds panel port!\n"); - return -EINVAL; - } + if (!port) + return dev_err_probe(dev, -EINVAL, + "can't found port point, please init lvds panel port!\n"); + for_each_child_of_node(port, endpoint) { child_count++; of_property_read_u32(endpoint, "reg", &endpoint_id); @@ -563,8 +561,7 @@ static int rockchip_lvds_bind(struct device *dev, struc= t device *master, } } if (!child_count) { - DRM_DEV_ERROR(dev, "lvds port does not have any children\n"); - ret =3D -EINVAL; + ret =3D dev_err_probe(dev, -EINVAL, "lvds port does not have any childre= n\n"); goto err_put_port; } else if (ret) { dev_err_probe(dev, ret, "failed to find panel and bridge node\n"); @@ -581,8 +578,7 @@ static int rockchip_lvds_bind(struct device *dev, struc= t device *master, lvds->output =3D rockchip_lvds_name_to_output(name); =20 if (lvds->output < 0) { - DRM_DEV_ERROR(dev, "invalid output type [%s]\n", name); - ret =3D lvds->output; + ret =3D dev_err_probe(dev, lvds->output, "invalid output type [%s]\n", n= ame); goto err_put_remote; } =20 @@ -593,7 +589,7 @@ static int rockchip_lvds_bind(struct device *dev, struc= t device *master, lvds->format =3D rockchip_lvds_name_to_format(name); =20 if (lvds->format < 0) { - DRM_DEV_ERROR(dev, "invalid data-mapping format [%s]\n", name); + dev_err(dev, "invalid data-mapping format [%s]\n", name); ret =3D lvds->format; goto err_put_remote; } @@ -604,8 +600,8 @@ static int rockchip_lvds_bind(struct device *dev, struc= t device *master, =20 ret =3D drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_LVDS); if (ret < 0) { - DRM_DEV_ERROR(drm_dev->dev, - "failed to initialize encoder: %d\n", ret); + drm_err(drm_dev, + "failed to initialize encoder: %d\n", ret); goto err_put_remote; } =20 @@ -618,8 +614,8 @@ static int rockchip_lvds_bind(struct device *dev, struc= t device *master, &rockchip_lvds_connector_funcs, DRM_MODE_CONNECTOR_LVDS); if (ret < 0) { - DRM_DEV_ERROR(drm_dev->dev, - "failed to initialize connector: %d\n", ret); + drm_err(drm_dev, + "failed to initialize connector: %d\n", ret); goto err_free_encoder; } =20 @@ -633,9 +629,9 @@ static int rockchip_lvds_bind(struct device *dev, struc= t device *master, =20 connector =3D drm_bridge_connector_init(lvds->drm_dev, encoder); if (IS_ERR(connector)) { - DRM_DEV_ERROR(drm_dev->dev, - "failed to initialize bridge connector: %pe\n", - connector); + drm_err(drm_dev, + "failed to initialize bridge connector: %pe\n", + connector); ret =3D PTR_ERR(connector); goto err_free_encoder; } @@ -643,8 +639,7 @@ static int rockchip_lvds_bind(struct device *dev, struc= t device *master, =20 ret =3D drm_connector_attach_encoder(connector, encoder); if (ret < 0) { - DRM_DEV_ERROR(drm_dev->dev, - "failed to attach encoder: %d\n", ret); + drm_err(drm_dev, "failed to attach encoder: %d\n", ret); goto err_free_connector; } =20 @@ -706,24 +701,20 @@ static int rockchip_lvds_probe(struct platform_device= *pdev) =20 lvds->grf =3D syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,grf"); - if (IS_ERR(lvds->grf)) { - DRM_DEV_ERROR(dev, "missing rockchip,grf property\n"); - return PTR_ERR(lvds->grf); - } + if (IS_ERR(lvds->grf)) + return dev_err_probe(dev, PTR_ERR(lvds->grf), "missing rockchip,grf prop= erty\n"); =20 ret =3D lvds->soc_data->probe(pdev, lvds); - if (ret) { - DRM_DEV_ERROR(dev, "Platform initialization failed\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Platform initialization failed\n"); =20 dev_set_drvdata(dev, lvds); =20 ret =3D component_add(&pdev->dev, &rockchip_lvds_component_ops); if (ret < 0) - DRM_DEV_ERROR(dev, "failed to add component\n"); + return dev_err_probe(dev, ret, "failed to add component\n"); =20 - return ret; + return 0; } =20 static void rockchip_lvds_remove(struct platform_device *pdev) --=20 2.47.2