summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2019-12-03 17:29:57 +0100
committerThierry Reding <treding@nvidia.com>2020-01-10 16:46:29 +0100
commit271502efbd3a9812f3d02230ff823b73141c6b39 (patch)
tree810b78bb104c04600144e943402e474b0e4a3765
parentf90965abc51d9a72cd6fa414e9480edff9ddaced (diff)
drm/tegra: output: Implement system suspend/resume
Implement generic system suspend/resume functions that can be used with any output type. Currently this only implements disabling and enabling of the IRQ functionality across system suspend/resume. This prevents an interrupt from happening before the display driver has fully resumed. Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/drm/tegra/output.c16
-rw-r--r--drivers/gpu/drm/tegra/sor.c17
2 files changed, 33 insertions, 0 deletions
diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
index 34373734ff68..57203030dd02 100644
--- a/drivers/gpu/drm/tegra/output.c
+++ b/drivers/gpu/drm/tegra/output.c
@@ -250,3 +250,19 @@ void tegra_output_find_possible_crtcs(struct tegra_output *output,
output->encoder.possible_crtcs = mask;
}
+
+int tegra_output_suspend(struct tegra_output *output)
+{
+ if (output->hpd_irq)
+ disable_irq(output->hpd_irq);
+
+ return 0;
+}
+
+int tegra_output_resume(struct tegra_output *output)
+{
+ if (output->hpd_irq)
+ enable_irq(output->hpd_irq);
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 4885f7d69a76..f884185c5e9f 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -3995,9 +3995,16 @@ static int __maybe_unused tegra_sor_suspend(struct device *dev)
struct tegra_sor *sor = dev_get_drvdata(dev);
int err;
+ err = tegra_output_suspend(&sor->output);
+ if (err < 0) {
+ dev_err(dev, "failed to suspend output: %d\n", err);
+ return err;
+ }
+
if (sor->hdmi_supply) {
err = regulator_disable(sor->hdmi_supply);
if (err < 0) {
+ tegra_output_resume(&sor->output);
return err;
}
}
@@ -4016,6 +4023,16 @@ static int __maybe_unused tegra_sor_resume(struct device *dev)
return err;
}
+ err = tegra_output_resume(&sor->output);
+ if (err < 0) {
+ dev_err(dev, "failed to resume output: %d\n", err);
+
+ if (sor->hdmi_supply)
+ regulator_disable(sor->hdmi_supply);
+
+ return err;
+ }
+
return 0;
}