mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-28 07:04:00 +08:00
drm/tegra: sor: Fix hang on Tegra124 eDP
The SOR0 found on Tegra124 and Tegra210 only supports eDP and LVDS and therefore has a slightly different clock tree than the SOR1 which does not support eDP, but HDMI and DP instead. Commite1335e2f0c
("drm/tegra: sor: Reimplement pad clock") breaks setups with eDP because the sor->clk_out clock is uninitialized and therefore setting the parent clock (either the safe clock or either of the display PLLs) fails, which can cause hangs later on since there is no clock driving the module. Fix this by falling back to the module clock for sor->clk_out on those setups. This guarantees that the module will always be clocked by an enabled clock and hence prevents those hangs. Fixes:e1335e2f0c
("drm/tegra: sor: Reimplement pad clock") Reported-by: Guillaume Tucker <guillaume.tucker@collabora.com> Tested-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
parent
b0bb222440
commit
d780537f9b
@ -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");
|
||||
|
Loading…
Reference in New Issue
Block a user