From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: dri-devel@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org, Kieran Bingham <kieran.bingham@ideasonboard.com>, Jacopo Mondi <jacopo+renesas@jmondi.org>, Jacopo Mondi <jacopo@jmondi.org> Subject: [PATCH v3 05/10] drm: rcar-du: lvds: Remove LVDS double-enable checks Date: Tue, 28 May 2019 17:12:29 +0300 [thread overview] Message-ID: <20190528141234.15425-6-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20190528141234.15425-1-laurent.pinchart+renesas@ideasonboard.com> The DRM core and DU driver guarantee that the LVDS bridge will not be double-enabled or double-disabled. Remove the corresponding unnecessary checks. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Tested-by: Jacopo Mondi <jacopo+renesas@jmondi.org> --- drivers/gpu/drm/rcar-du/rcar_lvds.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c index 620b51aab291..a331f0c32187 100644 --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c @@ -63,7 +63,6 @@ struct rcar_lvds { struct clk *extal; /* External clock */ struct clk *dotclkin[2]; /* External DU clocks */ } clocks; - bool enabled; struct drm_display_mode display_mode; enum rcar_lvds_mode mode; @@ -368,15 +367,12 @@ int rcar_lvds_clk_enable(struct drm_bridge *bridge, unsigned long freq) dev_dbg(lvds->dev, "enabling LVDS PLL, freq=%luHz\n", freq); - WARN_ON(lvds->enabled); - ret = clk_prepare_enable(lvds->clocks.mod); if (ret < 0) return ret; __rcar_lvds_pll_setup_d3_e3(lvds, freq, true); - lvds->enabled = true; return 0; } EXPORT_SYMBOL_GPL(rcar_lvds_clk_enable); @@ -390,13 +386,9 @@ void rcar_lvds_clk_disable(struct drm_bridge *bridge) dev_dbg(lvds->dev, "disabling LVDS PLL\n"); - WARN_ON(!lvds->enabled); - rcar_lvds_write(lvds, LVDPLLCR, 0); clk_disable_unprepare(lvds->clocks.mod); - - lvds->enabled = false; } EXPORT_SYMBOL_GPL(rcar_lvds_clk_disable); @@ -417,8 +409,6 @@ static void rcar_lvds_enable(struct drm_bridge *bridge) u32 lvdcr0; int ret; - WARN_ON(lvds->enabled); - ret = clk_prepare_enable(lvds->clocks.mod); if (ret < 0) return; @@ -507,16 +497,12 @@ static void rcar_lvds_enable(struct drm_bridge *bridge) drm_panel_prepare(lvds->panel); drm_panel_enable(lvds->panel); } - - lvds->enabled = true; } static void rcar_lvds_disable(struct drm_bridge *bridge) { struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge); - WARN_ON(!lvds->enabled); - if (lvds->panel) { drm_panel_disable(lvds->panel); drm_panel_unprepare(lvds->panel); @@ -527,8 +513,6 @@ static void rcar_lvds_disable(struct drm_bridge *bridge) rcar_lvds_write(lvds, LVDPLLCR, 0); clk_disable_unprepare(lvds->clocks.mod); - - lvds->enabled = false; } static bool rcar_lvds_mode_fixup(struct drm_bridge *bridge, @@ -592,8 +576,6 @@ static void rcar_lvds_mode_set(struct drm_bridge *bridge, { struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge); - WARN_ON(lvds->enabled); - lvds->display_mode = *adjusted_mode; rcar_lvds_get_lvds_mode(lvds); @@ -793,7 +775,6 @@ static int rcar_lvds_probe(struct platform_device *pdev) lvds->dev = &pdev->dev; lvds->info = of_device_get_match_data(&pdev->dev); - lvds->enabled = false; ret = rcar_lvds_parse_dt(lvds); if (ret < 0) -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: dri-devel@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org, Jacopo Mondi <jacopo@jmondi.org>, Jacopo Mondi <jacopo+renesas@jmondi.org>, Kieran Bingham <kieran.bingham@ideasonboard.com> Subject: [PATCH v3 05/10] drm: rcar-du: lvds: Remove LVDS double-enable checks Date: Tue, 28 May 2019 17:12:29 +0300 [thread overview] Message-ID: <20190528141234.15425-6-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20190528141234.15425-1-laurent.pinchart+renesas@ideasonboard.com> The DRM core and DU driver guarantee that the LVDS bridge will not be double-enabled or double-disabled. Remove the corresponding unnecessary checks. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Tested-by: Jacopo Mondi <jacopo+renesas@jmondi.org> --- drivers/gpu/drm/rcar-du/rcar_lvds.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c index 620b51aab291..a331f0c32187 100644 --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c @@ -63,7 +63,6 @@ struct rcar_lvds { struct clk *extal; /* External clock */ struct clk *dotclkin[2]; /* External DU clocks */ } clocks; - bool enabled; struct drm_display_mode display_mode; enum rcar_lvds_mode mode; @@ -368,15 +367,12 @@ int rcar_lvds_clk_enable(struct drm_bridge *bridge, unsigned long freq) dev_dbg(lvds->dev, "enabling LVDS PLL, freq=%luHz\n", freq); - WARN_ON(lvds->enabled); - ret = clk_prepare_enable(lvds->clocks.mod); if (ret < 0) return ret; __rcar_lvds_pll_setup_d3_e3(lvds, freq, true); - lvds->enabled = true; return 0; } EXPORT_SYMBOL_GPL(rcar_lvds_clk_enable); @@ -390,13 +386,9 @@ void rcar_lvds_clk_disable(struct drm_bridge *bridge) dev_dbg(lvds->dev, "disabling LVDS PLL\n"); - WARN_ON(!lvds->enabled); - rcar_lvds_write(lvds, LVDPLLCR, 0); clk_disable_unprepare(lvds->clocks.mod); - - lvds->enabled = false; } EXPORT_SYMBOL_GPL(rcar_lvds_clk_disable); @@ -417,8 +409,6 @@ static void rcar_lvds_enable(struct drm_bridge *bridge) u32 lvdcr0; int ret; - WARN_ON(lvds->enabled); - ret = clk_prepare_enable(lvds->clocks.mod); if (ret < 0) return; @@ -507,16 +497,12 @@ static void rcar_lvds_enable(struct drm_bridge *bridge) drm_panel_prepare(lvds->panel); drm_panel_enable(lvds->panel); } - - lvds->enabled = true; } static void rcar_lvds_disable(struct drm_bridge *bridge) { struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge); - WARN_ON(!lvds->enabled); - if (lvds->panel) { drm_panel_disable(lvds->panel); drm_panel_unprepare(lvds->panel); @@ -527,8 +513,6 @@ static void rcar_lvds_disable(struct drm_bridge *bridge) rcar_lvds_write(lvds, LVDPLLCR, 0); clk_disable_unprepare(lvds->clocks.mod); - - lvds->enabled = false; } static bool rcar_lvds_mode_fixup(struct drm_bridge *bridge, @@ -592,8 +576,6 @@ static void rcar_lvds_mode_set(struct drm_bridge *bridge, { struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge); - WARN_ON(lvds->enabled); - lvds->display_mode = *adjusted_mode; rcar_lvds_get_lvds_mode(lvds); @@ -793,7 +775,6 @@ static int rcar_lvds_probe(struct platform_device *pdev) lvds->dev = &pdev->dev; lvds->info = of_device_get_match_data(&pdev->dev); - lvds->enabled = false; ret = rcar_lvds_parse_dt(lvds); if (ret < 0) -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-05-28 14:13 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-28 14:12 [PATCH v3 00/10] R-Car DU: LVDS dual-link mode support Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-05-28 14:12 ` [PATCH v3 01/10] drm: bridge: Add dual_link field to the drm_bridge_timings structure Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-07-30 12:12 ` Neil Armstrong 2019-07-30 12:12 ` Neil Armstrong 2019-05-28 14:12 ` [PATCH v3 02/10] dt-bindings: display: bridge: thc63lvd1024: Document dual-link operation Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-06-07 22:15 ` Kieran Bingham 2019-06-07 22:15 ` Kieran Bingham 2019-06-07 22:30 ` Laurent Pinchart 2019-06-07 22:30 ` Laurent Pinchart 2019-06-07 22:36 ` Kieran Bingham 2019-06-07 22:36 ` Kieran Bingham 2019-05-28 14:12 ` [PATCH v3 03/10] drm: bridge: thc63: Report input bus mode through bridge timings Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-06-07 22:51 ` Kieran Bingham 2019-06-07 22:51 ` Kieran Bingham 2019-07-30 12:13 ` Neil Armstrong 2019-07-30 12:13 ` Neil Armstrong 2019-05-28 14:12 ` [PATCH v3 04/10] dt-bindings: display: renesas: lvds: Add renesas, companion property Laurent Pinchart 2019-05-28 14:12 ` [PATCH v3 04/10] dt-bindings: display: renesas: lvds: Add renesas,companion property Laurent Pinchart 2019-05-28 16:37 ` [PATCH v3 04/10] dt-bindings: display: renesas: lvds: Add renesas, companion property Sam Ravnborg 2019-05-28 16:37 ` Sam Ravnborg 2019-05-28 16:49 ` Laurent Pinchart 2019-05-28 16:49 ` Laurent Pinchart 2019-05-28 16:59 ` Sam Ravnborg 2019-05-28 16:59 ` Sam Ravnborg 2019-06-06 7:54 ` Laurent Pinchart 2019-06-06 7:54 ` Laurent Pinchart 2019-06-06 9:27 ` Sam Ravnborg 2019-06-06 9:27 ` Sam Ravnborg 2019-06-07 22:33 ` [PATCH v3 04/10] dt-bindings: display: renesas: lvds: Add renesas,companion property Kieran Bingham 2019-06-07 22:33 ` Kieran Bingham 2019-05-28 14:12 ` Laurent Pinchart [this message] 2019-05-28 14:12 ` [PATCH v3 05/10] drm: rcar-du: lvds: Remove LVDS double-enable checks Laurent Pinchart 2019-06-07 22:09 ` Kieran Bingham 2019-06-07 22:09 ` Kieran Bingham 2019-05-28 14:12 ` [PATCH v3 06/10] drm: rcar-du: lvds: Add support for dual-link mode Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-06-07 23:11 ` Kieran Bingham 2019-06-07 23:11 ` Kieran Bingham 2019-05-28 14:12 ` [PATCH v3 07/10] drm: rcar-du: Skip LVDS1 output on Gen3 when using dual-link LVDS mode Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-05-28 16:42 ` Sam Ravnborg 2019-05-28 16:42 ` Sam Ravnborg 2019-05-28 16:50 ` Laurent Pinchart 2019-05-28 16:50 ` Laurent Pinchart 2019-05-28 17:02 ` Sam Ravnborg 2019-05-28 17:02 ` Sam Ravnborg 2019-06-06 7:57 ` Laurent Pinchart 2019-06-06 7:57 ` Laurent Pinchart 2019-06-06 9:29 ` Sam Ravnborg 2019-06-06 9:29 ` Sam Ravnborg 2019-06-07 23:19 ` Kieran Bingham 2019-06-07 23:19 ` Kieran Bingham 2019-05-28 14:12 ` [PATCH v3 08/10] arm64: dts: renesas: r8a7799[05]: Point LVDS0 to its companion LVDS1 Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-06-03 11:40 ` Simon Horman 2019-06-03 11:40 ` Simon Horman 2019-06-06 7:59 ` Laurent Pinchart 2019-06-06 7:59 ` Laurent Pinchart 2019-06-06 8:51 ` Simon Horman 2019-06-06 8:51 ` Simon Horman 2019-06-12 10:21 ` Laurent Pinchart 2019-06-12 10:21 ` Laurent Pinchart 2019-06-12 11:52 ` Simon Horman 2019-06-12 11:52 ` Simon Horman 2019-06-07 23:15 ` Kieran Bingham 2019-06-07 23:15 ` Kieran Bingham 2019-05-28 14:12 ` [PATCH v3 09/10] [HACK] arm64: dts: renesas: draak: Enable LVDS dual-link operation Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-05-28 14:12 ` [PATCH v3 10/10] [HACK] arm64: dts: renesas: ebisu: " Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-07-22 11:27 ` Fabrizio Castro 2019-07-22 11:27 ` Fabrizio Castro 2019-07-23 10:30 ` Jacopo Mondi 2019-07-23 10:30 ` Jacopo Mondi 2019-07-23 12:16 ` Fabrizio Castro 2019-07-23 12:16 ` Fabrizio Castro 2019-05-28 16:46 ` [PATCH v3 00/10] R-Car DU: LVDS dual-link mode support Sam Ravnborg 2019-05-28 16:46 ` Sam Ravnborg 2019-06-07 22:16 ` Kieran Bingham 2019-06-07 22:16 ` Kieran Bingham 2019-06-07 22:21 ` Laurent Pinchart 2019-06-07 22:21 ` Laurent Pinchart
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190528141234.15425-6-laurent.pinchart+renesas@ideasonboard.com \ --to=laurent.pinchart+renesas@ideasonboard.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=jacopo+renesas@jmondi.org \ --cc=jacopo@jmondi.org \ --cc=kieran.bingham@ideasonboard.com \ --cc=linux-renesas-soc@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.