diff mbox series

[2/2] drm/tegra: sor: Fix hang on tegra124 due to NULL clk_out

Message ID 79b4a60f1d624b16eaef06258318861d4407fecd.1512411775.git.guillaume.tucker@collabora.com
State New
Headers show
Series [1/2] drm/nouveau/bar/gf100: fix hang when calling ->fini() before ->init() | expand

Commit Message

Guillaume Tucker Dec. 4, 2017, 6:37 p.m. UTC 
When neither HDMI nor DP is supported such as on the tegra124, the
sor->clk_out is not initialised and remains NULL.  In this case, the
parent clock can't be assigned to it so revert to the previous
behaviour of assigning it to the main sor->clock instead.

This fixes a kernel hang on tegra124.

Fixes: e1335e2f0cfc ("drm/tegra: sor: Reimplement pad clock")
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>

CC: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/tegra/sor.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

-- 
2.11.0
diff mbox series

Patch

diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index b0a1dedac802..8d2e29c9ab2b 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -255,7 +255,7 @@  static int tegra_sor_set_parent_clock(struct tegra_sor *sor, struct clk *parent)
 
 	clk_disable_unprepare(sor->clk);
 
-	err = clk_set_parent(sor->clk_out, parent);
+	err = clk_set_parent(sor->clk_out ? sor->clk_out : sor->clk, parent);
 	if (err < 0)
 		return err;
 
@@ -2698,15 +2698,19 @@  static int tegra_sor_probe(struct platform_device *pdev)
 		sor->clk_pad = NULL;
 	}
 
-	/*
-	 * The bootloader may have set up the SOR such that it's module clock
-	 * is sourced by one of the display PLLs. However, that doesn't work
-	 * without properly having set up other bits of the SOR.
-	 */
-	err = clk_set_parent(sor->clk_out, sor->clk_safe);
-	if (err < 0) {
-		dev_err(&pdev->dev, "failed to use safe clock: %d\n", err);
-		goto remove;
+	if (sor->clk_out) {
+		/*
+		 * The bootloader may have set up the SOR such that its module
+		 * clock is sourced by one of the display PLLs. However, that
+		 * doesn't work without properly having set up other bits of
+		 * the SOR.
+		 */
+		err = clk_set_parent(sor->clk_out, sor->clk_safe);
+		if (err < 0) {
+			dev_err(&pdev->dev, "failed to use safe clock: %d\n",
+				err);
+			goto remove;
+		}
 	}
 
 	platform_set_drvdata(pdev, sor);