diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-01-12 04:47:11 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-01-12 04:47:11 +0300 |
| commit | c59beeaf1555f0b8380e70e480bf4618454237af (patch) | |
| tree | acdd7536014eeb556c962d76860e0b5e61ed2e80 | |
| parent | b0bb222440a5c8273f67dd37946707e6ba6ad832 (diff) | |
| parent | d780537f9b49e9d714a454e5ed989d909beab8ec (diff) | |
| download | linux-c59beeaf1555f0b8380e70e480bf4618454237af.tar.xz | |
Merge tag 'drm/tegra/for-4.15-rc8' of git://anongit.freedesktop.org/tegra/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
| -rw-r--r-- | drivers/gpu/drm/tegra/sor.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index b0a1dedac802..476079f1255f 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -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"); |