From nobody Wed Dec 17 22:46:01 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9D07EE644A for ; Fri, 15 Sep 2023 08:54:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233486AbjIOIyz (ORCPT ); Fri, 15 Sep 2023 04:54:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233249AbjIOIy1 (ORCPT ); Fri, 15 Sep 2023 04:54:27 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A8BC2733 for ; Fri, 15 Sep 2023 01:54:17 -0700 (PDT) Received: from ramsan.of.borg ([84.195.187.55]) by baptiste.telenet-ops.be with bizsmtp id m8uF2A00k1C8whw018uF2t; Fri, 15 Sep 2023 10:54:15 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qh4aK-003lIY-Ad; Fri, 15 Sep 2023 10:54:15 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qh4ad-00Gddu-BK; Fri, 15 Sep 2023 10:54:15 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v4 41/41] drm: renesas: shmobile: Add DT support Date: Fri, 15 Sep 2023 10:53:56 +0200 Message-Id: <6185ab76aa300fa402e4f6610b2109665f2d8a1c.1694767209.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add DT support, by: 1. Creating a panel bridge from DT, and attaching it to the encoder, 2. Replacing the custom connector with a bridge connector, 3. Obtaining clock configuration based on the compatible value. Note that for now the driver uses a fixed clock configuration selecting the bus clock, as the current code to select other clock inputs needs changes to support any other SoCs than SH7724. Signed-off-by: Geert Uytterhoeven --- v4: - No changes, v3: - No changes, v2: - Use devm_drm_of_get_bridge(), - Don't print bridge->of_node on failure, as this field depends on CONFIG_OF. Notes: - SH-Mobile AG5 (SH73A0) support is untested. - Unbind crashes when drm_encoder_cleanup() calls drm_bridge_detach(), as the bridge (allocated by devm_drm_panel_bridge_add()) has already been freed by that time. This is a known issue with the bridge code. --- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 56 ++++++++++++++----- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 1 + .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 27 ++++++++- .../gpu/drm/renesas/shmobile/shmob_drm_drv.h | 6 ++ 4 files changed, 74 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gp= u/drm/renesas/shmobile/shmob_drm_crtc.c index 729028a15efae00c..2e2f37b9d0a4bafa 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -9,12 +9,16 @@ =20 #include #include +#include +#include #include =20 #include #include #include #include +#include +#include #include #include #include @@ -23,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -35,10 +40,6 @@ #include "shmob_drm_plane.h" #include "shmob_drm_regs.h" =20 -/* - * TODO: panel support - */ - /* -----------------------------------------------------------------------= ------ * Page Flip */ @@ -201,7 +202,7 @@ static void shmob_drm_crtc_atomic_enable(struct drm_crt= c *crtc, { struct shmob_drm_crtc *scrtc =3D to_shmob_crtc(crtc); struct shmob_drm_device *sdev =3D to_shmob_device(crtc->dev); - const struct shmob_drm_interface_data *idata =3D &sdev->pdata->iface; + unsigned int clk_div =3D sdev->config.clk_div; struct device *dev =3D sdev->dev; u32 value; int ret; @@ -223,17 +224,17 @@ static void shmob_drm_crtc_atomic_enable(struct drm_c= rtc *crtc, lcdc_write(sdev, LDPMR, 0); =20 value =3D sdev->lddckr; - if (idata->clk_div) { + if (clk_div) { /* FIXME: sh7724 can only use 42, 48, 54 and 60 for the divider * denominator. */ lcdc_write(sdev, LDDCKPAT1R, 0); - lcdc_write(sdev, LDDCKPAT2R, (1 << (idata->clk_div / 2)) - 1); + lcdc_write(sdev, LDDCKPAT2R, (1 << (clk_div / 2)) - 1); =20 - if (idata->clk_div =3D=3D 1) + if (clk_div =3D=3D 1) value |=3D LDDCKR_MOSEL; else - value |=3D idata->clk_div; + value |=3D clk_div; } =20 lcdc_write(sdev, LDDCKR, value); @@ -406,7 +407,7 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev) } =20 /* -----------------------------------------------------------------------= ------ - * Encoder + * Legacy Encoder */ =20 static bool shmob_drm_encoder_mode_fixup(struct drm_encoder *encoder, @@ -435,9 +436,14 @@ static const struct drm_encoder_helper_funcs encoder_h= elper_funcs =3D { .mode_fixup =3D shmob_drm_encoder_mode_fixup, }; =20 +/* -----------------------------------------------------------------------= ------ + * Encoder + */ + int shmob_drm_encoder_create(struct shmob_drm_device *sdev) { struct drm_encoder *encoder =3D &sdev->encoder; + struct drm_bridge *bridge; int ret; =20 encoder->possible_crtcs =3D 1; @@ -447,13 +453,30 @@ int shmob_drm_encoder_create(struct shmob_drm_device = *sdev) if (ret < 0) return ret; =20 - drm_encoder_helper_add(encoder, &encoder_helper_funcs); + if (sdev->pdata) { + drm_encoder_helper_add(encoder, &encoder_helper_funcs); + return 0; + } + + /* Create a panel bridge */ + bridge =3D devm_drm_of_get_bridge(sdev->dev, sdev->dev->of_node, 0, 0); + if (IS_ERR(bridge)) + return PTR_ERR(bridge); + + /* Attach the bridge to the encoder */ + ret =3D drm_bridge_attach(encoder, bridge, NULL, + DRM_BRIDGE_ATTACH_NO_CONNECTOR); + if (ret) { + dev_err(sdev->dev, "failed to attach bridge: %pe\n", + ERR_PTR(ret)); + return ret; + } =20 return 0; } =20 /* -----------------------------------------------------------------------= ------ - * Connector + * Legacy Connector */ =20 static inline struct shmob_drm_connector *to_shmob_connector(struct drm_co= nnector *connector) @@ -563,13 +586,20 @@ shmob_drm_connector_init(struct shmob_drm_device *sde= v, return connector; } =20 +/* -----------------------------------------------------------------------= ------ + * Connector + */ + int shmob_drm_connector_create(struct shmob_drm_device *sdev, struct drm_encoder *encoder) { struct drm_connector *connector; int ret; =20 - connector =3D shmob_drm_connector_init(sdev, encoder); + if (sdev->pdata) + connector =3D shmob_drm_connector_init(sdev, encoder); + else + connector =3D drm_bridge_connector_init(&sdev->ddev, encoder); if (IS_ERR(connector)) { dev_err(sdev->dev, "failed to created connector: %pe\n", connector); diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h b/drivers/gp= u/drm/renesas/shmobile/shmob_drm_crtc.h index 89a0746f9a35807d..16e1712dd04e0f2b 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h @@ -29,6 +29,7 @@ struct shmob_drm_crtc { wait_queue_head_t flip_wait; }; =20 +/* Legacy connector */ struct shmob_drm_connector { struct drm_connector base; struct drm_encoder *encoder; diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu= /drm/renesas/shmobile/shmob_drm_drv.c index c498d0d9b4fc4fc5..e83c3e52251dedf9 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -173,11 +174,13 @@ static void shmob_drm_remove(struct platform_device *= pdev) static int shmob_drm_probe(struct platform_device *pdev) { struct shmob_drm_platform_data *pdata =3D pdev->dev.platform_data; + const struct shmob_drm_config *config; struct shmob_drm_device *sdev; struct drm_device *ddev; int ret; =20 - if (pdata =3D=3D NULL) { + config =3D of_device_get_match_data(&pdev->dev); + if (!config && !pdata) { dev_err(&pdev->dev, "no platform data\n"); return -EINVAL; } @@ -193,7 +196,13 @@ static int shmob_drm_probe(struct platform_device *pde= v) =20 ddev =3D &sdev->ddev; sdev->dev =3D &pdev->dev; - sdev->pdata =3D pdata; + if (config) { + sdev->config =3D *config; + } else { + sdev->pdata =3D pdata; + sdev->config.clk_source =3D pdata->clk_source; + sdev->config.clk_div =3D pdata->iface.clk_div; + } spin_lock_init(&sdev->irq_lock); =20 platform_set_drvdata(pdev, sdev); @@ -202,7 +211,7 @@ static int shmob_drm_probe(struct platform_device *pdev) if (IS_ERR(sdev->mmio)) return PTR_ERR(sdev->mmio); =20 - ret =3D shmob_drm_setup_clocks(sdev, pdata->clk_source); + ret =3D shmob_drm_setup_clocks(sdev, sdev->config.clk_source); if (ret < 0) return ret; =20 @@ -250,11 +259,23 @@ static int shmob_drm_probe(struct platform_device *pd= ev) return ret; } =20 +static const struct shmob_drm_config shmob_arm_config =3D { + .clk_source =3D SHMOB_DRM_CLK_BUS, + .clk_div =3D 5, +}; + +static const struct of_device_id shmob_drm_of_table[] __maybe_unused =3D { + { .compatible =3D "renesas,r8a7740-lcdc", .data =3D &shmob_arm_config, }, + { .compatible =3D "renesas,sh73a0-lcdc", .data =3D &shmob_arm_config, }, + { /* sentinel */ } +}; + static struct platform_driver shmob_drm_platform_driver =3D { .probe =3D shmob_drm_probe, .remove_new =3D shmob_drm_remove, .driver =3D { .name =3D "shmob-drm", + .of_match_table =3D of_match_ptr(shmob_drm_of_table), .pm =3D &shmob_drm_pm_ops, }, }; diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h b/drivers/gpu= /drm/renesas/shmobile/shmob_drm_drv.h index 18907e5ace51c681..088ac5381e91e61a 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h @@ -20,9 +20,15 @@ struct clk; struct device; struct drm_device; =20 +struct shmob_drm_config { + enum shmob_drm_clk_source clk_source; + unsigned int clk_div; +}; + struct shmob_drm_device { struct device *dev; const struct shmob_drm_platform_data *pdata; + struct shmob_drm_config config; =20 void __iomem *mmio; struct clk *clock; --=20 2.34.1