Commit c59beeaf authored Jan 12, 2018 by Dave Airlie

linux into drm-fixes

drm/tegra: Fixes for v4.15-rc8

A single fix for a Tegra124 eDP regression introduced by the SOR changes
in v4.15-rc1.

* tag 'drm/tegra/for-4.15-rc8' of git://anongit.freedesktop.org/tegra/linux:
  drm/tegra: sor: Fix hang on Tegra124 eDP

parents b0bb2224 d780537f

drivers/gpu/drm/tegra/sor.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2656,6 +2656,9 @@ static int tegra_sor_probe(struct platform_device *pdev)
		name, err);
		goto remove;
		}
		} else {
		/* fall back to the module clock on SOR0 (eDP/LVDS only) */
		sor->clk_out = sor->clk;
		}

		sor->clk_parent = devm_clk_get(&pdev->dev, "parent");