UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/tegra: sor: Make the +5V HDMI supply optional 

The SOR supports multiple display modes, but only when driving an HDMI
monitor does it make sense to control the +5V power supply. eDP and DP
don't need this, so make it optional.

This fixes a crash observed during system suspend/resume.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Thierry Reding 2019-12-03 17:19:13 +01:00
parent a8817489dc
commit b06e145f70
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/tegra/sor.c
View File

@ -3970,15 +3970,29 @@ static int tegra_sor_runtime_resume(struct device *dev)
static int tegra_sor_suspend(struct device *dev)
{
struct tegra_sor *sor = dev_get_drvdata(dev);
int err;
return regulator_disable(sor->hdmi_supply);
if (sor->hdmi_supply) {
err = regulator_disable(sor->hdmi_supply);
if (err < 0)
return err;
}
return 0;
}
static int tegra_sor_resume(struct device *dev)
{
struct tegra_sor *sor = dev_get_drvdata(dev);
int err;
return regulator_enable(sor->hdmi_supply);
if (sor->hdmi_supply) {
err = regulator_enable(sor->hdmi_supply);
if (err < 0)
return err;
}
return 0;
}
static const struct dev_pm_ops tegra_sor_pm_ops = {