Message ID | 1419002698-4963-5-git-send-email-thierry.reding@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
+1 Mark On 12/19/2014 11:24 PM, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > For now only disable the KMS hotplug polling helper logic upon suspend > and re-enable it on resume. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > drivers/gpu/drm/tegra/drm.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c > index 272c2dca3536..16c44b9abbd8 100644 > --- a/drivers/gpu/drm/tegra/drm.c > +++ b/drivers/gpu/drm/tegra/drm.c > @@ -889,6 +889,30 @@ static int host1x_drm_remove(struct host1x_device *dev) > return 0; > } > > +#ifdef CONFIG_PM_SLEEP > +static int host1x_drm_suspend(struct device *dev) > +{ > + struct drm_device *drm = dev_get_drvdata(dev); > + > + drm_kms_helper_poll_disable(drm); > + > + return 0; > +} > + > +static int host1x_drm_resume(struct device *dev) > +{ > + struct drm_device *drm = dev_get_drvdata(dev); > + > + drm_kms_helper_poll_enable(drm); > + > + return 0; > +} > +#endif > + > +static const struct dev_pm_ops host1x_drm_pm_ops = { > + SET_SYSTEM_SLEEP_PM_OPS(host1x_drm_suspend, host1x_drm_resume) > +}; > + > static const struct of_device_id host1x_drm_subdevs[] = { > { .compatible = "nvidia,tegra20-dc", }, > { .compatible = "nvidia,tegra20-hdmi", }, > @@ -910,6 +934,7 @@ static const struct of_device_id host1x_drm_subdevs[] = { > static struct host1x_driver host1x_drm_driver = { > .driver = { > .name = "drm", > + .pm = &host1x_drm_pm_ops, > }, > .probe = host1x_drm_probe, > .remove = host1x_drm_remove, >
On Tue, Dec 23, 2014 at 03:32:43PM +0800, Mark Zhang wrote:
> +1
Does that translate into a "Reviewed-by" or "Tested-by"?
Thierry
On Fri, Dec 19, 2014 at 10:24 AM, Thierry Reding <thierry.reding@gmail.com> wrote: > From: Thierry Reding <treding@nvidia.com> > > For now only disable the KMS hotplug polling helper logic upon suspend > and re-enable it on resume. > > Signed-off-by: Thierry Reding <treding@nvidia.com> Reviewed-by: Sean Paul <seanpaul@chromium.org> > --- > drivers/gpu/drm/tegra/drm.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c > index 272c2dca3536..16c44b9abbd8 100644 > --- a/drivers/gpu/drm/tegra/drm.c > +++ b/drivers/gpu/drm/tegra/drm.c > @@ -889,6 +889,30 @@ static int host1x_drm_remove(struct host1x_device *dev) > return 0; > } > > +#ifdef CONFIG_PM_SLEEP > +static int host1x_drm_suspend(struct device *dev) > +{ > + struct drm_device *drm = dev_get_drvdata(dev); > + > + drm_kms_helper_poll_disable(drm); > + > + return 0; > +} > + > +static int host1x_drm_resume(struct device *dev) > +{ > + struct drm_device *drm = dev_get_drvdata(dev); > + > + drm_kms_helper_poll_enable(drm); > + > + return 0; > +} > +#endif > + > +static const struct dev_pm_ops host1x_drm_pm_ops = { > + SET_SYSTEM_SLEEP_PM_OPS(host1x_drm_suspend, host1x_drm_resume) > +}; > + > static const struct of_device_id host1x_drm_subdevs[] = { > { .compatible = "nvidia,tegra20-dc", }, > { .compatible = "nvidia,tegra20-hdmi", }, > @@ -910,6 +934,7 @@ static const struct of_device_id host1x_drm_subdevs[] = { > static struct host1x_driver host1x_drm_driver = { > .driver = { > .name = "drm", > + .pm = &host1x_drm_pm_ops, > }, > .probe = host1x_drm_probe, > .remove = host1x_drm_remove, > -- > 2.1.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-tegra" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
I mean: Reviewed-by: Mark Zhang <markz@nvidia.com> To make display suspend/resume working, we need some other patches. I will send out the patches soon, based on this patch set. Thanks Thierry. Mark On 01/05/2015 10:50 PM, Thierry Reding wrote: > * PGP Signed by an unknown key > > On Tue, Dec 23, 2014 at 03:32:43PM +0800, Mark Zhang wrote: >> +1 > > Does that translate into a "Reviewed-by" or "Tested-by"? > > Thierry > > * Unknown Key > * 0x7F3EB3A1 >
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 272c2dca3536..16c44b9abbd8 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -889,6 +889,30 @@ static int host1x_drm_remove(struct host1x_device *dev) return 0; } +#ifdef CONFIG_PM_SLEEP +static int host1x_drm_suspend(struct device *dev) +{ + struct drm_device *drm = dev_get_drvdata(dev); + + drm_kms_helper_poll_disable(drm); + + return 0; +} + +static int host1x_drm_resume(struct device *dev) +{ + struct drm_device *drm = dev_get_drvdata(dev); + + drm_kms_helper_poll_enable(drm); + + return 0; +} +#endif + +static const struct dev_pm_ops host1x_drm_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(host1x_drm_suspend, host1x_drm_resume) +}; + static const struct of_device_id host1x_drm_subdevs[] = { { .compatible = "nvidia,tegra20-dc", }, { .compatible = "nvidia,tegra20-hdmi", }, @@ -910,6 +934,7 @@ static const struct of_device_id host1x_drm_subdevs[] = { static struct host1x_driver host1x_drm_driver = { .driver = { .name = "drm", + .pm = &host1x_drm_pm_ops, }, .probe = host1x_drm_probe, .remove = host1x_drm_remove,