* [PATCH 1/2] gpu: host1x: Rename "parent" to "host" @ 2019-12-03 16:27 Thierry Reding 2019-12-03 16:27 ` [PATCH 2/2] drm/tegra: Do not implement runtime PM Thierry Reding 0 siblings, 1 reply; 5+ messages in thread From: Thierry Reding @ 2019-12-03 16:27 UTC (permalink / raw) To: Thierry Reding Cc: Daniel Vetter, Rafael J. Wysocki, dri-devel, linux-pm, linux-tegra From: Thierry Reding <treding@nvidia.com> Rename the host1x clients' parent to "host" because that more closely describes what it is. The parent can be confused with the parent device in terms of the device hierarchy. Subsequent patches will add a new member that refers to the parent in that hierarchy. Signed-off-by: Thierry Reding <treding@nvidia.com> --- drivers/gpu/drm/tegra/dc.c | 6 +++--- drivers/gpu/drm/tegra/drm.c | 4 ++-- drivers/gpu/drm/tegra/dsi.c | 2 +- drivers/gpu/drm/tegra/gr2d.c | 4 ++-- drivers/gpu/drm/tegra/gr3d.c | 4 ++-- drivers/gpu/drm/tegra/hdmi.c | 2 +- drivers/gpu/drm/tegra/hub.c | 4 ++-- drivers/gpu/drm/tegra/sor.c | 2 +- drivers/gpu/drm/tegra/vic.c | 8 ++++---- drivers/gpu/host1x/bus.c | 4 ++-- drivers/gpu/host1x/syncpt.c | 2 +- include/linux/host1x.h | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 2b9a25c977c0..2983eb33f2be 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -2006,7 +2006,7 @@ static bool tegra_dc_has_window_groups(struct tegra_dc *dc) static int tegra_dc_init(struct host1x_client *client) { - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); unsigned long flags = HOST1X_SYNCPT_CLIENT_MANAGED; struct tegra_dc *dc = host1x_client_to_dc(client); struct tegra_drm *tegra = drm->dev_private; @@ -2087,9 +2087,9 @@ static int tegra_dc_init(struct host1x_client *client) /* * Inherit the DMA parameters (such as maximum segment size) from the - * parent device. + * parent host1x device. */ - client->dev->dma_parms = client->parent->dma_parms; + client->dev->dma_parms = client->host->dma_parms; return 0; diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index f455ce71e85d..aa9e49f04988 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -905,7 +905,7 @@ int tegra_drm_unregister_client(struct tegra_drm *tegra, int host1x_client_iommu_attach(struct host1x_client *client) { struct iommu_domain *domain = iommu_get_domain_for_dev(client->dev); - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); struct tegra_drm *tegra = drm->dev_private; struct iommu_group *group = NULL; int err; @@ -941,7 +941,7 @@ int host1x_client_iommu_attach(struct host1x_client *client) void host1x_client_iommu_detach(struct host1x_client *client) { - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); struct tegra_drm *tegra = drm->dev_private; struct iommu_domain *domain; diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c index a5d47e301c5f..ec475d022fa0 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -1030,7 +1030,7 @@ static const struct drm_encoder_helper_funcs tegra_dsi_encoder_helper_funcs = { static int tegra_dsi_init(struct host1x_client *client) { - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); struct tegra_dsi *dsi = host1x_client_to_dsi(client); int err; diff --git a/drivers/gpu/drm/tegra/gr2d.c b/drivers/gpu/drm/tegra/gr2d.c index 1fc4e56c7cc5..48363f744bb9 100644 --- a/drivers/gpu/drm/tegra/gr2d.c +++ b/drivers/gpu/drm/tegra/gr2d.c @@ -34,7 +34,7 @@ static inline struct gr2d *to_gr2d(struct tegra_drm_client *client) static int gr2d_init(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct drm_device *dev = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->host); unsigned long flags = HOST1X_SYNCPT_HAS_BASE; struct gr2d *gr2d = to_gr2d(drm); int err; @@ -76,7 +76,7 @@ static int gr2d_init(struct host1x_client *client) static int gr2d_exit(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct drm_device *dev = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->host); struct tegra_drm *tegra = dev->dev_private; struct gr2d *gr2d = to_gr2d(drm); int err; diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c index 24fae0f64032..c0a528be0369 100644 --- a/drivers/gpu/drm/tegra/gr3d.c +++ b/drivers/gpu/drm/tegra/gr3d.c @@ -43,7 +43,7 @@ static inline struct gr3d *to_gr3d(struct tegra_drm_client *client) static int gr3d_init(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct drm_device *dev = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->host); unsigned long flags = HOST1X_SYNCPT_HAS_BASE; struct gr3d *gr3d = to_gr3d(drm); int err; @@ -85,7 +85,7 @@ static int gr3d_init(struct host1x_client *client) static int gr3d_exit(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct drm_device *dev = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->host); struct gr3d *gr3d = to_gr3d(drm); int err; diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index 50269ffbcb6b..38bf1d16095f 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -1424,8 +1424,8 @@ static const struct drm_encoder_helper_funcs tegra_hdmi_encoder_helper_funcs = { static int tegra_hdmi_init(struct host1x_client *client) { - struct drm_device *drm = dev_get_drvdata(client->parent); struct tegra_hdmi *hdmi = host1x_client_to_hdmi(client); + struct drm_device *drm = dev_get_drvdata(client->host); int err; hdmi->output.dev = client->dev; diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c index e56c0f7d3a13..5c7545ee5a5b 100644 --- a/drivers/gpu/drm/tegra/hub.c +++ b/drivers/gpu/drm/tegra/hub.c @@ -715,7 +715,7 @@ void tegra_display_hub_atomic_commit(struct drm_device *drm, static int tegra_display_hub_init(struct host1x_client *client) { struct tegra_display_hub *hub = to_tegra_display_hub(client); - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); struct tegra_drm *tegra = drm->dev_private; struct tegra_display_hub_state *state; @@ -733,7 +733,7 @@ static int tegra_display_hub_init(struct host1x_client *client) static int tegra_display_hub_exit(struct host1x_client *client) { - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); struct tegra_drm *tegra = drm->dev_private; drm_atomic_private_obj_fini(&tegra->hub->base); diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index a68d3b36b972..956bf5d680ad 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -3053,7 +3053,7 @@ static const struct tegra_sor_ops tegra_sor_dp_ops = { static int tegra_sor_init(struct host1x_client *client) { - struct drm_device *drm = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->host); const struct drm_encoder_helper_funcs *helpers = NULL; struct tegra_sor *sor = host1x_client_to_sor(client); int connector = DRM_MODE_CONNECTOR_Unknown; diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index 3526c2892ddb..ade56b860cf9 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -161,7 +161,7 @@ static int vic_boot(struct vic *vic) static int vic_init(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct drm_device *dev = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->host); struct tegra_drm *tegra = dev->dev_private; struct vic *vic = to_vic(drm); int err; @@ -190,9 +190,9 @@ static int vic_init(struct host1x_client *client) /* * Inherit the DMA parameters (such as maximum segment size) from the - * parent device. + * parent host1x device. */ - client->dev->dma_parms = client->parent->dma_parms; + client->dev->dma_parms = client->host->dma_parms; return 0; @@ -209,7 +209,7 @@ static int vic_init(struct host1x_client *client) static int vic_exit(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct drm_device *dev = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->host); struct tegra_drm *tegra = dev->dev_private; struct vic *vic = to_vic(drm); int err; diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index 2c8559ff3481..50d500345d04 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -120,7 +120,7 @@ static void host1x_subdev_register(struct host1x_device *device, mutex_lock(&device->clients_lock); list_move_tail(&client->list, &device->clients); list_move_tail(&subdev->list, &device->active); - client->parent = &device->dev; + client->host = &device->dev; subdev->client = client; mutex_unlock(&device->clients_lock); mutex_unlock(&device->subdevs_lock); @@ -156,7 +156,7 @@ static void __host1x_subdev_unregister(struct host1x_device *device, */ mutex_lock(&device->clients_lock); subdev->client = NULL; - client->parent = NULL; + client->host = NULL; list_move_tail(&subdev->list, &device->subdevs); /* * XXX: Perhaps don't do this here, but rather explicitly remove it diff --git a/drivers/gpu/host1x/syncpt.c b/drivers/gpu/host1x/syncpt.c index dd1cd0142941..fce7892d5137 100644 --- a/drivers/gpu/host1x/syncpt.c +++ b/drivers/gpu/host1x/syncpt.c @@ -421,7 +421,7 @@ int host1x_syncpt_init(struct host1x *host) struct host1x_syncpt *host1x_syncpt_request(struct host1x_client *client, unsigned long flags) { - struct host1x *host = dev_get_drvdata(client->parent->parent); + struct host1x *host = dev_get_drvdata(client->host->parent); return host1x_syncpt_alloc(host, client, flags); } diff --git a/include/linux/host1x.h b/include/linux/host1x.h index 6edeb9228c4e..470a193a9fed 100644 --- a/include/linux/host1x.h +++ b/include/linux/host1x.h @@ -44,7 +44,7 @@ struct host1x_client_ops { */ struct host1x_client { struct list_head list; - struct device *parent; + struct device *host; struct device *dev; struct iommu_group *group; -- 2.23.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] drm/tegra: Do not implement runtime PM 2019-12-03 16:27 [PATCH 1/2] gpu: host1x: Rename "parent" to "host" Thierry Reding @ 2019-12-03 16:27 ` Thierry Reding 2019-12-04 8:37 ` Mikko Perttunen 2019-12-04 15:22 ` Dmitry Osipenko 0 siblings, 2 replies; 5+ messages in thread From: Thierry Reding @ 2019-12-03 16:27 UTC (permalink / raw) To: Thierry Reding Cc: Daniel Vetter, Rafael J. Wysocki, dri-devel, linux-pm, linux-tegra From: Thierry Reding <treding@nvidia.com> The Tegra DRM driver heavily relies on the implementations for runtime suspend/resume to be called at specific times. Unfortunately, there are some cases where that doesn't work. One example is if the user disables runtime PM for a given subdevice. Another example is that the PM core acquires a reference to runtime PM during system sleep, effectively preventing devices from going into low power modes. This is intentional to avoid nasty race conditions, but it also causes system sleep to not function properly on all Tegra systems. Fix this by not implementing runtime PM at all. Instead, a minimal, reference-counted suspend/resume infrastructure is added to the host1x bus. This has the benefit that it can be used regardless of the system power state (or any transitions we might be in), or whether or not the user allows runtime PM. Atomic modesetting guarantees that these functions will end up being called at the right point in time, so the pitfalls for the more generic runtime PM do not apply here. Signed-off-by: Thierry Reding <treding@nvidia.com> --- drivers/gpu/drm/tegra/dc.c | 141 ++++++++++++++---------- drivers/gpu/drm/tegra/dpaux.c | 2 +- drivers/gpu/drm/tegra/drm.h | 2 + drivers/gpu/drm/tegra/dsi.c | 175 ++++++++++++++++-------------- drivers/gpu/drm/tegra/hdmi.c | 116 +++++++++++--------- drivers/gpu/drm/tegra/hub.c | 194 ++++++++++++++++++++-------------- drivers/gpu/drm/tegra/hub.h | 2 +- drivers/gpu/drm/tegra/sor.c | 154 +++++++++++++++------------ drivers/gpu/drm/tegra/vic.c | 131 +++++++++++------------ drivers/gpu/host1x/bus.c | 75 +++++++++++++ include/linux/host1x.h | 11 ++ 11 files changed, 604 insertions(+), 399 deletions(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 2983eb33f2be..871046f3f469 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -1737,6 +1737,7 @@ static void tegra_crtc_atomic_disable(struct drm_crtc *crtc, { struct tegra_dc *dc = to_tegra_dc(crtc); u32 value; + int err; if (!tegra_dc_idle(dc)) { tegra_dc_stop(dc); @@ -1783,7 +1784,9 @@ static void tegra_crtc_atomic_disable(struct drm_crtc *crtc, spin_unlock_irq(&crtc->dev->event_lock); - pm_runtime_put_sync(dc->dev); + err = host1x_client_suspend(&dc->client); + if (err < 0) + dev_err(dc->dev, "failed to suspend: %d\n", err); } static void tegra_crtc_atomic_enable(struct drm_crtc *crtc, @@ -1793,8 +1796,13 @@ static void tegra_crtc_atomic_enable(struct drm_crtc *crtc, struct tegra_dc_state *state = to_dc_state(crtc->state); struct tegra_dc *dc = to_tegra_dc(crtc); u32 value; + int err; - pm_runtime_get_sync(dc->dev); + err = host1x_client_resume(&dc->client); + if (err < 0) { + dev_err(dc->dev, "failed to resume: %d\n", err); + return; + } /* initialize display controller */ if (dc->syncpt) { @@ -2022,6 +2030,15 @@ static int tegra_dc_init(struct host1x_client *client) if (!tegra_dc_has_window_groups(dc)) return 0; + /* + * Set the display hub as the host1x client parent for the display + * controller. This is needed for the runtime reference counting that + * ensures the display hub is always powered when any of the display + * controllers are. + */ + if (dc->soc->has_nvdisplay) + client->parent = &tegra->hub->client; + dc->syncpt = host1x_syncpt_request(client, flags); if (!dc->syncpt) dev_warn(dc->dev, "failed to allocate syncpoint\n"); @@ -2131,9 +2148,74 @@ static int tegra_dc_exit(struct host1x_client *client) return 0; } +static int tegra_dc_runtime_suspend(struct host1x_client *client) +{ + struct tegra_dc *dc = host1x_client_to_dc(client); + struct device *dev = client->dev; + int err; + + err = reset_control_assert(dc->rst); + if (err < 0) { + dev_err(dev, "failed to assert reset: %d\n", err); + return err; + } + + if (dc->soc->has_powergate) + tegra_powergate_power_off(dc->powergate); + + clk_disable_unprepare(dc->clk); + pm_runtime_put_sync(dev); + + return 0; +} + +static int tegra_dc_runtime_resume(struct host1x_client *client) +{ + struct tegra_dc *dc = host1x_client_to_dc(client); + struct device *dev = client->dev; + int err; + + err = pm_runtime_get_sync(dev); + if (err < 0) { + dev_err(dev, "failed to get runtime PM: %d\n", err); + return err; + } + + if (dc->soc->has_powergate) { + err = tegra_powergate_sequence_power_up(dc->powergate, dc->clk, + dc->rst); + if (err < 0) { + dev_err(dev, "failed to power partition: %d\n", err); + goto put_rpm; + } + } else { + err = clk_prepare_enable(dc->clk); + if (err < 0) { + dev_err(dev, "failed to enable clock: %d\n", err); + goto put_rpm; + } + + err = reset_control_deassert(dc->rst); + if (err < 0) { + dev_err(dev, "failed to deassert reset: %d\n", err); + goto disable_clk; + } + } + + return 0; + +disable_clk: + clk_disable_unprepare(dc->clk); +put_rpm: + pm_runtime_put_sync(dev); + return err; +} + static const struct host1x_client_ops dc_client_ops = { .init = tegra_dc_init, .exit = tegra_dc_exit, + .suspend = tegra_dc_runtime_suspend, + .resume = tegra_dc_runtime_resume, }; static const struct tegra_dc_soc_info tegra20_dc_soc_info = { @@ -2545,65 +2627,10 @@ static int tegra_dc_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static int tegra_dc_suspend(struct device *dev) -{ - struct tegra_dc *dc = dev_get_drvdata(dev); - int err; - - err = reset_control_assert(dc->rst); - if (err < 0) { - dev_err(dev, "failed to assert reset: %d\n", err); - return err; - } - - if (dc->soc->has_powergate) - tegra_powergate_power_off(dc->powergate); - - clk_disable_unprepare(dc->clk); - - return 0; -} - -static int tegra_dc_resume(struct device *dev) -{ - struct tegra_dc *dc = dev_get_drvdata(dev); - int err; - - if (dc->soc->has_powergate) { - err = tegra_powergate_sequence_power_up(dc->powergate, dc->clk, - dc->rst); - if (err < 0) { - dev_err(dev, "failed to power partition: %d\n", err); - return err; - } - } else { - err = clk_prepare_enable(dc->clk); - if (err < 0) { - dev_err(dev, "failed to enable clock: %d\n", err); - return err; - } - - err = reset_control_deassert(dc->rst); - if (err < 0) { - dev_err(dev, "failed to deassert reset: %d\n", err); - return err; - } - } - - return 0; -} -#endif - -static const struct dev_pm_ops tegra_dc_pm_ops = { - SET_RUNTIME_PM_OPS(tegra_dc_suspend, tegra_dc_resume, NULL) -}; - struct platform_driver tegra_dc_driver = { .driver = { .name = "tegra-dc", .of_match_table = tegra_dc_of_match, - .pm = &tegra_dc_pm_ops, }, .probe = tegra_dc_probe, .remove = tegra_dc_remove, diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c index 622cdf1ad246..7dfb50f65067 100644 --- a/drivers/gpu/drm/tegra/dpaux.c +++ b/drivers/gpu/drm/tegra/dpaux.c @@ -588,7 +588,7 @@ static int tegra_dpaux_remove(struct platform_device *pdev) /* make sure pads are powered down when not in use */ tegra_dpaux_pad_power_down(dpaux); - pm_runtime_put(&pdev->dev); + pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); drm_dp_aux_unregister(&dpaux->aux); diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index d941553f7a3d..ed99b67deb29 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -144,6 +144,8 @@ int tegra_output_init(struct drm_device *drm, struct tegra_output *output); void tegra_output_exit(struct tegra_output *output); void tegra_output_find_possible_crtcs(struct tegra_output *output, struct drm_device *drm); +int tegra_output_suspend(struct tegra_output *output); +int tegra_output_resume(struct tegra_output *output); int tegra_output_connector_get_modes(struct drm_connector *connector); enum drm_connector_status diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c index ec475d022fa0..88b9d64c77bf 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -840,7 +840,9 @@ static void tegra_dsi_unprepare(struct tegra_dsi *dsi) dev_err(dsi->dev, "failed to disable MIPI calibration: %d\n", err); - pm_runtime_put(dsi->dev); + err = host1x_client_suspend(&dsi->client); + if (err < 0) + dev_err(dsi->dev, "failed to suspend: %d\n", err); } static void tegra_dsi_encoder_disable(struct drm_encoder *encoder) @@ -882,11 +884,15 @@ static void tegra_dsi_encoder_disable(struct drm_encoder *encoder) tegra_dsi_unprepare(dsi); } -static void tegra_dsi_prepare(struct tegra_dsi *dsi) +static int tegra_dsi_prepare(struct tegra_dsi *dsi) { int err; - pm_runtime_get_sync(dsi->dev); + err = host1x_client_resume(&dsi->client); + if (err < 0) { + dev_err(dsi->dev, "failed to resume: %d\n", err); + return err; + } err = tegra_mipi_enable(dsi->mipi); if (err < 0) @@ -899,6 +905,8 @@ static void tegra_dsi_prepare(struct tegra_dsi *dsi) if (dsi->slave) tegra_dsi_prepare(dsi->slave); + + return 0; } static void tegra_dsi_encoder_enable(struct drm_encoder *encoder) @@ -909,8 +917,13 @@ static void tegra_dsi_encoder_enable(struct drm_encoder *encoder) struct tegra_dsi *dsi = to_dsi(output); struct tegra_dsi_state *state; u32 value; + int err; - tegra_dsi_prepare(dsi); + err = tegra_dsi_prepare(dsi); + if (err < 0) { + dev_err(dsi->dev, "failed to prepare: %d\n", err); + return; + } state = tegra_dsi_get_state(dsi); @@ -1075,9 +1088,89 @@ static int tegra_dsi_exit(struct host1x_client *client) return 0; } +static int tegra_dsi_runtime_suspend(struct host1x_client *client) +{ + struct tegra_dsi *dsi = host1x_client_to_dsi(client); + struct device *dev = client->dev; + int err; + + if (dsi->rst) { + err = reset_control_assert(dsi->rst); + if (err < 0) { + dev_err(dev, "failed to assert reset: %d\n", err); + return err; + } + } + + usleep_range(1000, 2000); + + clk_disable_unprepare(dsi->clk_lp); + clk_disable_unprepare(dsi->clk); + + regulator_disable(dsi->vdd); + pm_runtime_put_sync(dev); + + return 0; +} + +static int tegra_dsi_runtime_resume(struct host1x_client *client) +{ + struct tegra_dsi *dsi = host1x_client_to_dsi(client); + struct device *dev = client->dev; + int err; + + err = pm_runtime_get_sync(dev); + if (err < 0) { + dev_err(dev, "failed to get runtime PM: %d\n", err); + return err; + } + + err = regulator_enable(dsi->vdd); + if (err < 0) { + dev_err(dev, "failed to enable VDD supply: %d\n", err); + goto put_rpm; + } + + err = clk_prepare_enable(dsi->clk); + if (err < 0) { + dev_err(dev, "cannot enable DSI clock: %d\n", err); + goto disable_vdd; + } + + err = clk_prepare_enable(dsi->clk_lp); + if (err < 0) { + dev_err(dev, "cannot enable low-power clock: %d\n", err); + goto disable_clk; + } + + usleep_range(1000, 2000); + + if (dsi->rst) { + err = reset_control_deassert(dsi->rst); + if (err < 0) { + dev_err(dev, "cannot assert reset: %d\n", err); + goto disable_clk_lp; + } + } + + return 0; + +disable_clk_lp: + clk_disable_unprepare(dsi->clk_lp); +disable_clk: + clk_disable_unprepare(dsi->clk); +disable_vdd: + regulator_disable(dsi->vdd); +put_rpm: + pm_runtime_put_sync(dev); + return err; +} + static const struct host1x_client_ops dsi_client_ops = { .init = tegra_dsi_init, .exit = tegra_dsi_exit, + .suspend = tegra_dsi_runtime_suspend, + .resume = tegra_dsi_runtime_resume, }; static int tegra_dsi_setup_clocks(struct tegra_dsi *dsi) @@ -1596,79 +1689,6 @@ static int tegra_dsi_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static int tegra_dsi_suspend(struct device *dev) -{ - struct tegra_dsi *dsi = dev_get_drvdata(dev); - int err; - - if (dsi->rst) { - err = reset_control_assert(dsi->rst); - if (err < 0) { - dev_err(dev, "failed to assert reset: %d\n", err); - return err; - } - } - - usleep_range(1000, 2000); - - clk_disable_unprepare(dsi->clk_lp); - clk_disable_unprepare(dsi->clk); - - regulator_disable(dsi->vdd); - - return 0; -} - -static int tegra_dsi_resume(struct device *dev) -{ - struct tegra_dsi *dsi = dev_get_drvdata(dev); - int err; - - err = regulator_enable(dsi->vdd); - if (err < 0) { - dev_err(dsi->dev, "failed to enable VDD supply: %d\n", err); - return err; - } - - err = clk_prepare_enable(dsi->clk); - if (err < 0) { - dev_err(dev, "cannot enable DSI clock: %d\n", err); - goto disable_vdd; - } - - err = clk_prepare_enable(dsi->clk_lp); - if (err < 0) { - dev_err(dev, "cannot enable low-power clock: %d\n", err); - goto disable_clk; - } - - usleep_range(1000, 2000); - - if (dsi->rst) { - err = reset_control_deassert(dsi->rst); - if (err < 0) { - dev_err(dev, "cannot assert reset: %d\n", err); - goto disable_clk_lp; - } - } - - return 0; - -disable_clk_lp: - clk_disable_unprepare(dsi->clk_lp); -disable_clk: - clk_disable_unprepare(dsi->clk); -disable_vdd: - regulator_disable(dsi->vdd); - return err; -} -#endif - -static const struct dev_pm_ops tegra_dsi_pm_ops = { - SET_RUNTIME_PM_OPS(tegra_dsi_suspend, tegra_dsi_resume, NULL) -}; - static const struct of_device_id tegra_dsi_of_match[] = { { .compatible = "nvidia,tegra210-dsi", }, { .compatible = "nvidia,tegra132-dsi", }, @@ -1682,7 +1702,6 @@ struct platform_driver tegra_dsi_driver = { .driver = { .name = "tegra-dsi", .of_match_table = tegra_dsi_of_match, - .pm = &tegra_dsi_pm_ops, }, .probe = tegra_dsi_probe, .remove = tegra_dsi_remove, diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index 38bf1d16095f..cb504ec8f284 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -1146,6 +1146,7 @@ static void tegra_hdmi_encoder_disable(struct drm_encoder *encoder) struct tegra_dc *dc = to_tegra_dc(encoder->crtc); struct tegra_hdmi *hdmi = to_hdmi(output); u32 value; + int err; /* * The following accesses registers of the display controller, so make @@ -1171,7 +1172,9 @@ static void tegra_hdmi_encoder_disable(struct drm_encoder *encoder) tegra_hdmi_writel(hdmi, 0, HDMI_NV_PDISP_INT_ENABLE); tegra_hdmi_writel(hdmi, 0, HDMI_NV_PDISP_INT_MASK); - pm_runtime_put(hdmi->dev); + err = host1x_client_suspend(&hdmi->client); + if (err < 0) + dev_err(hdmi->dev, "failed to suspend: %d\n", err); } static void tegra_hdmi_encoder_enable(struct drm_encoder *encoder) @@ -1186,7 +1189,11 @@ static void tegra_hdmi_encoder_enable(struct drm_encoder *encoder) u32 value; int err; - pm_runtime_get_sync(hdmi->dev); + err = host1x_client_resume(&hdmi->client); + if (err < 0) { + dev_err(hdmi->dev, "failed to resume: %d\n", err); + return; + } /* * Enable and unmask the HDA codec SCRATCH0 register interrupt. This @@ -1489,9 +1496,66 @@ static int tegra_hdmi_exit(struct host1x_client *client) return 0; } +static int tegra_hdmi_runtime_suspend(struct host1x_client *client) +{ + struct tegra_hdmi *hdmi = host1x_client_to_hdmi(client); + struct device *dev = client->dev; + int err; + + err = reset_control_assert(hdmi->rst); + if (err < 0) { + dev_err(dev, "failed to assert reset: %d\n", err); + return err; + } + + usleep_range(1000, 2000); + + clk_disable_unprepare(hdmi->clk); + pm_runtime_put_sync(dev); + + return 0; +} + +static int tegra_hdmi_runtime_resume(struct host1x_client *client) +{ + struct tegra_hdmi *hdmi = host1x_client_to_hdmi(client); + struct device *dev = client->dev; + int err; + + err = pm_runtime_get_sync(dev); + if (err < 0) { + dev_err(dev, "failed to get runtime PM: %d\n", err); + return err; + } + + err = clk_prepare_enable(hdmi->clk); + if (err < 0) { + dev_err(dev, "failed to enable clock: %d\n", err); + goto put_rpm; + } + + usleep_range(1000, 2000); + + err = reset_control_deassert(hdmi->rst); + if (err < 0) { + dev_err(dev, "failed to deassert reset: %d\n", err); + goto disable_clk; + } + + return 0; + +disable_clk: + clk_disable_unprepare(hdmi->clk); +put_rpm: + pm_runtime_put_sync(dev); + return err; +} + static const struct host1x_client_ops hdmi_client_ops = { .init = tegra_hdmi_init, .exit = tegra_hdmi_exit, + .suspend = tegra_hdmi_runtime_suspend, + .resume = tegra_hdmi_runtime_resume, }; static const struct tegra_hdmi_config tegra20_hdmi_config = { @@ -1699,58 +1763,10 @@ static int tegra_hdmi_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static int tegra_hdmi_suspend(struct device *dev) -{ - struct tegra_hdmi *hdmi = dev_get_drvdata(dev); - int err; - - err = reset_control_assert(hdmi->rst); - if (err < 0) { - dev_err(dev, "failed to assert reset: %d\n", err); - return err; - } - - usleep_range(1000, 2000); - - clk_disable_unprepare(hdmi->clk); - - return 0; -} - -static int tegra_hdmi_resume(struct device *dev) -{ - struct tegra_hdmi *hdmi = dev_get_drvdata(dev); - int err; - - err = clk_prepare_enable(hdmi->clk); - if (err < 0) { - dev_err(dev, "failed to enable clock: %d\n", err); - return err; - } - - usleep_range(1000, 2000); - - err = reset_control_deassert(hdmi->rst); - if (err < 0) { - dev_err(dev, "failed to deassert reset: %d\n", err); - clk_disable_unprepare(hdmi->clk); - return err; - } - - return 0; -} -#endif - -static const struct dev_pm_ops tegra_hdmi_pm_ops = { - SET_RUNTIME_PM_OPS(tegra_hdmi_suspend, tegra_hdmi_resume, NULL) -}; - struct platform_driver tegra_hdmi_driver = { .driver = { .name = "tegra-hdmi", .of_match_table = tegra_hdmi_of_match, - .pm = &tegra_hdmi_pm_ops, }, .probe = tegra_hdmi_probe, .remove = tegra_hdmi_remove, diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c index 5c7545ee5a5b..73e6fe9b833d 100644 --- a/drivers/gpu/drm/tegra/hub.c +++ b/drivers/gpu/drm/tegra/hub.c @@ -105,17 +105,25 @@ static inline void tegra_plane_writel(struct tegra_plane *plane, u32 value, static int tegra_windowgroup_enable(struct tegra_windowgroup *wgrp) { + int err = 0; + mutex_lock(&wgrp->lock); if (wgrp->usecount == 0) { - pm_runtime_get_sync(wgrp->parent); + err = host1x_client_resume(wgrp->parent); + if (err < 0) { + dev_err(wgrp->parent->dev, "failed to resume: %d\n", err); + goto unlock; + } + reset_control_deassert(wgrp->rst); } wgrp->usecount++; - mutex_unlock(&wgrp->lock); - return 0; +unlock: + mutex_unlock(&wgrp->lock); + return err; } static void tegra_windowgroup_disable(struct tegra_windowgroup *wgrp) @@ -131,7 +139,7 @@ static void tegra_windowgroup_disable(struct tegra_windowgroup *wgrp) wgrp->index); } - pm_runtime_put(wgrp->parent); + host1x_client_suspend(wgrp->parent); } wgrp->usecount--; @@ -389,6 +397,7 @@ static void tegra_shared_plane_atomic_disable(struct drm_plane *plane, struct tegra_plane *p = to_tegra_plane(plane); struct tegra_dc *dc; u32 value; + int err; /* rien ne va plus */ if (!old_state || !old_state->crtc) @@ -396,6 +405,12 @@ static void tegra_shared_plane_atomic_disable(struct drm_plane *plane, dc = to_tegra_dc(old_state->crtc); + err = host1x_client_resume(&dc->client); + if (err < 0) { + dev_err(dc->dev, "failed to resume: %d\n", err); + return; + } + /* * XXX Legacy helpers seem to sometimes call ->atomic_disable() even * on planes that are already disabled. Make sure we fallback to the @@ -404,15 +419,13 @@ static void tegra_shared_plane_atomic_disable(struct drm_plane *plane, if (WARN_ON(p->dc == NULL)) p->dc = dc; - pm_runtime_get_sync(dc->dev); - value = tegra_plane_readl(p, DC_WIN_WIN_OPTIONS); value &= ~WIN_ENABLE; tegra_plane_writel(p, value, DC_WIN_WIN_OPTIONS); tegra_dc_remove_shared_plane(dc, p); - pm_runtime_put(dc->dev); + host1x_client_suspend(&dc->client); } static void tegra_shared_plane_atomic_update(struct drm_plane *plane, @@ -425,6 +438,7 @@ static void tegra_shared_plane_atomic_update(struct drm_plane *plane, struct tegra_plane *p = to_tegra_plane(plane); dma_addr_t base; u32 value; + int err; /* rien ne va plus */ if (!plane->state->crtc || !plane->state->fb) @@ -435,7 +449,11 @@ static void tegra_shared_plane_atomic_update(struct drm_plane *plane, return; } - pm_runtime_get_sync(dc->dev); + err = host1x_client_resume(&dc->client); + if (err < 0) { + dev_err(dc->dev, "failed to resume: %d\n", err); + return; + } tegra_dc_assign_shared_plane(dc, p); @@ -525,7 +543,7 @@ static void tegra_shared_plane_atomic_update(struct drm_plane *plane, value &= ~CONTROL_CSC_ENABLE; tegra_plane_writel(p, value, DC_WIN_WINDOW_SET_CONTROL); - pm_runtime_put(dc->dev); + host1x_client_suspend(&dc->client); } static const struct drm_plane_helper_funcs tegra_shared_plane_helper_funcs = { @@ -561,7 +579,7 @@ struct drm_plane *tegra_shared_plane_create(struct drm_device *drm, plane->base.index = index; plane->wgrp = &hub->wgrps[wgrp]; - plane->wgrp->parent = dc->dev; + plane->wgrp->parent = &dc->client; p = &plane->base.base; @@ -666,8 +684,13 @@ int tegra_display_hub_atomic_check(struct drm_device *drm, static void tegra_display_hub_update(struct tegra_dc *dc) { u32 value; + int err; - pm_runtime_get_sync(dc->dev); + err = host1x_client_resume(&dc->client); + if (err < 0) { + dev_err(dc->dev, "failed to resume: %d\n", err); + return; + } value = tegra_dc_readl(dc, DC_CMD_IHUB_COMMON_MISC_CTL); value &= ~LATENCY_EVENT; @@ -682,7 +705,7 @@ static void tegra_display_hub_update(struct tegra_dc *dc) tegra_dc_writel(dc, COMMON_ACTREQ, DC_CMD_STATE_CONTROL); tegra_dc_readl(dc, DC_CMD_STATE_CONTROL); - pm_runtime_put(dc->dev); + host1x_client_suspend(&dc->client); } void tegra_display_hub_atomic_commit(struct drm_device *drm, @@ -742,9 +765,85 @@ static int tegra_display_hub_exit(struct host1x_client *client) return 0; } +static int tegra_display_hub_runtime_suspend(struct host1x_client *client) +{ + struct tegra_display_hub *hub = to_tegra_display_hub(client); + struct device *dev = client->dev; + unsigned int i = hub->num_heads; + int err; + + err = reset_control_assert(hub->rst); + if (err < 0) + return err; + + while (i--) + clk_disable_unprepare(hub->clk_heads[i]); + + clk_disable_unprepare(hub->clk_hub); + clk_disable_unprepare(hub->clk_dsc); + clk_disable_unprepare(hub->clk_disp); + + pm_runtime_put_sync(dev); + + return 0; +} + +static int tegra_display_hub_runtime_resume(struct host1x_client *client) +{ + struct tegra_display_hub *hub = to_tegra_display_hub(client); + struct device *dev = client->dev; + unsigned int i; + int err; + + err = pm_runtime_get_sync(dev); + if (err < 0) { + dev_err(dev, "failed to get runtime PM: %d\n", err); + return err; + } + + err = clk_prepare_enable(hub->clk_disp); + if (err < 0) + goto put_rpm; + + err = clk_prepare_enable(hub->clk_dsc); + if (err < 0) + goto disable_disp; + + err = clk_prepare_enable(hub->clk_hub); + if (err < 0) + goto disable_dsc; + + for (i = 0; i < hub->num_heads; i++) { + err = clk_prepare_enable(hub->clk_heads[i]); + if (err < 0) + goto disable_heads; + } + + err = reset_control_deassert(hub->rst); + if (err < 0) + goto disable_heads; + + return 0; + +disable_heads: + while (i--) + clk_disable_unprepare(hub->clk_heads[i]); + + clk_disable_unprepare(hub->clk_hub); +disable_dsc: + clk_disable_unprepare(hub->clk_dsc); +disable_disp: + clk_disable_unprepare(hub->clk_disp); +put_rpm: + pm_runtime_put_sync(dev); + return err; +} + static const struct host1x_client_ops tegra_display_hub_ops = { .init = tegra_display_hub_init, .exit = tegra_display_hub_exit, + .suspend = tegra_display_hub_runtime_suspend, + .resume = tegra_display_hub_runtime_resume, }; static int tegra_display_hub_probe(struct platform_device *pdev) @@ -861,6 +960,7 @@ static int tegra_display_hub_probe(struct platform_device *pdev) static int tegra_display_hub_remove(struct platform_device *pdev) { struct tegra_display_hub *hub = platform_get_drvdata(pdev); + unsigned int i; int err; err = host1x_client_unregister(&hub->client); @@ -869,78 +969,17 @@ static int tegra_display_hub_remove(struct platform_device *pdev) err); } - pm_runtime_disable(&pdev->dev); - - return err; -} - -static int __maybe_unused tegra_display_hub_suspend(struct device *dev) -{ - struct tegra_display_hub *hub = dev_get_drvdata(dev); - unsigned int i = hub->num_heads; - int err; - - err = reset_control_assert(hub->rst); - if (err < 0) - return err; - - while (i--) - clk_disable_unprepare(hub->clk_heads[i]); - - clk_disable_unprepare(hub->clk_hub); - clk_disable_unprepare(hub->clk_dsc); - clk_disable_unprepare(hub->clk_disp); - - return 0; -} - -static int __maybe_unused tegra_display_hub_resume(struct device *dev) -{ - struct tegra_display_hub *hub = dev_get_drvdata(dev); - unsigned int i; - int err; - - err = clk_prepare_enable(hub->clk_disp); - if (err < 0) - return err; - - err = clk_prepare_enable(hub->clk_dsc); - if (err < 0) - goto disable_disp; - - err = clk_prepare_enable(hub->clk_hub); - if (err < 0) - goto disable_dsc; + for (i = 0; i < hub->soc->num_wgrps; i++) { + struct tegra_windowgroup *wgrp = &hub->wgrps[i]; - for (i = 0; i < hub->num_heads; i++) { - err = clk_prepare_enable(hub->clk_heads[i]); - if (err < 0) - goto disable_heads; + mutex_destroy(&wgrp->lock); } - err = reset_control_deassert(hub->rst); - if (err < 0) - goto disable_heads; - - return 0; - -disable_heads: - while (i--) - clk_disable_unprepare(hub->clk_heads[i]); + pm_runtime_disable(&pdev->dev); - clk_disable_unprepare(hub->clk_hub); -disable_dsc: - clk_disable_unprepare(hub->clk_dsc); -disable_disp: - clk_disable_unprepare(hub->clk_disp); return err; } -static const struct dev_pm_ops tegra_display_hub_pm_ops = { - SET_RUNTIME_PM_OPS(tegra_display_hub_suspend, - tegra_display_hub_resume, NULL) -}; - static const struct tegra_display_hub_soc tegra186_display_hub = { .num_wgrps = 6, .supports_dsc = true, @@ -968,7 +1007,6 @@ struct platform_driver tegra_display_hub_driver = { .driver = { .name = "tegra-display-hub", .of_match_table = tegra_display_hub_of_match, - .pm = &tegra_display_hub_pm_ops, }, .probe = tegra_display_hub_probe, .remove = tegra_display_hub_remove, diff --git a/drivers/gpu/drm/tegra/hub.h b/drivers/gpu/drm/tegra/hub.h index 767a60d9313c..3efa1be07ff8 100644 --- a/drivers/gpu/drm/tegra/hub.h +++ b/drivers/gpu/drm/tegra/hub.h @@ -17,7 +17,7 @@ struct tegra_windowgroup { struct mutex lock; unsigned int index; - struct device *parent; + struct host1x_client *parent; struct reset_control *rst; }; diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 956bf5d680ad..200d99e17afe 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -2255,7 +2255,7 @@ static void tegra_sor_hdmi_disable(struct drm_encoder *encoder) if (err < 0) dev_err(sor->dev, "failed to power off I/O pad: %d\n", err); - pm_runtime_put(sor->dev); + host1x_client_suspend(&sor->client); } static void tegra_sor_hdmi_enable(struct drm_encoder *encoder) @@ -2276,7 +2276,11 @@ static void tegra_sor_hdmi_enable(struct drm_encoder *encoder) mode = &encoder->crtc->state->adjusted_mode; pclk = mode->clock * 1000; - pm_runtime_get_sync(sor->dev); + err = host1x_client_resume(&sor->client); + if (err < 0) { + dev_err(sor->dev, "failed to resume: %d\n", err); + return; + } /* switch to safe parent clock */ err = tegra_sor_set_parent_clock(sor, sor->clk_safe); @@ -2722,7 +2726,7 @@ static void tegra_sor_dp_disable(struct drm_encoder *encoder) if (output->panel) drm_panel_unprepare(output->panel); - pm_runtime_put(sor->dev); + host1x_client_suspend(&sor->client); } static void tegra_sor_dp_enable(struct drm_encoder *encoder) @@ -2742,7 +2746,11 @@ static void tegra_sor_dp_enable(struct drm_encoder *encoder) mode = &encoder->crtc->state->adjusted_mode; info = &output->connector.display_info; - pm_runtime_get_sync(sor->dev); + err = host1x_client_resume(&sor->client); + if (err < 0) { + dev_err(sor->dev, "failed to resume: %d\n", err); + return; + } /* switch to safe parent clock */ err = tegra_sor_set_parent_clock(sor, sor->clk_safe); @@ -3189,9 +3197,80 @@ static int tegra_sor_exit(struct host1x_client *client) return 0; } +static int tegra_sor_runtime_suspend(struct host1x_client *client) +{ + struct tegra_sor *sor = host1x_client_to_sor(client); + struct device *dev = client->dev; + int err; + + if (sor->rst) { + err = reset_control_assert(sor->rst); + if (err < 0) { + dev_err(dev, "failed to assert reset: %d\n", err); + return err; + } + + reset_control_release(sor->rst); + } + + usleep_range(1000, 2000); + + clk_disable_unprepare(sor->clk); + pm_runtime_put_sync(dev); + + return 0; +} + +static int tegra_sor_runtime_resume(struct host1x_client *client) +{ + struct tegra_sor *sor = host1x_client_to_sor(client); + struct device *dev = client->dev; + int err; + + err = pm_runtime_get_sync(dev); + if (err < 0) { + dev_err(dev, "failed to get runtime PM: %d\n", err); + return err; + } + + err = clk_prepare_enable(sor->clk); + if (err < 0) { + dev_err(dev, "failed to enable clock: %d\n", err); + goto put_rpm; + } + + usleep_range(1000, 2000); + + if (sor->rst) { + err = reset_control_acquire(sor->rst); + if (err < 0) { + dev_err(dev, "failed to acquire reset: %d\n", err); + goto disable_clk; + } + + err = reset_control_deassert(sor->rst); + if (err < 0) { + dev_err(dev, "failed to deassert reset: %d\n", err); + goto release_reset; + } + } + + return 0; + +release_reset: + reset_control_release(sor->rst); +disable_clk: + clk_disable_unprepare(sor->clk); +put_rpm: + pm_runtime_put_sync(dev); + return err; +} + static const struct host1x_client_ops sor_client_ops = { .init = tegra_sor_init, .exit = tegra_sor_exit, + .suspend = tegra_sor_runtime_suspend, + .resume = tegra_sor_runtime_resume, }; static const u8 tegra124_sor_xbar_cfg[5] = { @@ -3842,10 +3921,9 @@ static int tegra_sor_probe(struct platform_device *pdev) if (!sor->clk_pad) { char *name; - err = pm_runtime_get_sync(&pdev->dev); + err = host1x_client_resume(&sor->client); if (err < 0) { - dev_err(&pdev->dev, "failed to get runtime PM: %d\n", - err); + dev_err(sor->dev, "failed to resume: %d\n", err); goto remove; } @@ -3856,7 +3934,7 @@ static int tegra_sor_probe(struct platform_device *pdev) } sor->clk_pad = tegra_clk_sor_pad_register(sor, name); - pm_runtime_put(&pdev->dev); + host1x_client_suspend(&sor->client); } if (IS_ERR(sor->clk_pad)) { @@ -3912,61 +3990,6 @@ static int tegra_sor_remove(struct platform_device *pdev) return 0; } -static int tegra_sor_runtime_suspend(struct device *dev) -{ - struct tegra_sor *sor = dev_get_drvdata(dev); - int err; - - if (sor->rst) { - err = reset_control_assert(sor->rst); - if (err < 0) { - dev_err(dev, "failed to assert reset: %d\n", err); - return err; - } - - reset_control_release(sor->rst); - } - - usleep_range(1000, 2000); - - clk_disable_unprepare(sor->clk); - - return 0; -} - -static int tegra_sor_runtime_resume(struct device *dev) -{ - struct tegra_sor *sor = dev_get_drvdata(dev); - int err; - - err = clk_prepare_enable(sor->clk); - if (err < 0) { - dev_err(dev, "failed to enable clock: %d\n", err); - return err; - } - - usleep_range(1000, 2000); - - if (sor->rst) { - err = reset_control_acquire(sor->rst); - if (err < 0) { - dev_err(dev, "failed to acquire reset: %d\n", err); - clk_disable_unprepare(sor->clk); - return err; - } - - err = reset_control_deassert(sor->rst); - if (err < 0) { - dev_err(dev, "failed to deassert reset: %d\n", err); - reset_control_release(sor->rst); - clk_disable_unprepare(sor->clk); - return err; - } - } - - return 0; -} - static int tegra_sor_suspend(struct device *dev) { struct tegra_sor *sor = dev_get_drvdata(dev); @@ -3974,8 +3997,9 @@ static int tegra_sor_suspend(struct device *dev) if (sor->hdmi_supply) { err = regulator_disable(sor->hdmi_supply); - if (err < 0) + if (err < 0) { return err; + } } return 0; @@ -3996,8 +4020,6 @@ static int tegra_sor_resume(struct device *dev) } static const struct dev_pm_ops tegra_sor_pm_ops = { - SET_RUNTIME_PM_OPS(tegra_sor_runtime_suspend, tegra_sor_runtime_resume, - NULL) SET_SYSTEM_SLEEP_PM_OPS(tegra_sor_suspend, tegra_sor_resume) }; diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index ade56b860cf9..678961ada17f 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -52,48 +52,6 @@ static void vic_writel(struct vic *vic, u32 value, unsigned int offset) writel(value, vic->regs + offset); } -static int vic_runtime_resume(struct device *dev) -{ - struct vic *vic = dev_get_drvdata(dev); - int err; - - err = clk_prepare_enable(vic->clk); - if (err < 0) - return err; - - usleep_range(10, 20); - - err = reset_control_deassert(vic->rst); - if (err < 0) - goto disable; - - usleep_range(10, 20); - - return 0; - -disable: - clk_disable_unprepare(vic->clk); - return err; -} - -static int vic_runtime_suspend(struct device *dev) -{ - struct vic *vic = dev_get_drvdata(dev); - int err; - - err = reset_control_assert(vic->rst); - if (err < 0) - return err; - - usleep_range(2000, 4000); - - clk_disable_unprepare(vic->clk); - - vic->booted = false; - - return 0; -} - static int vic_boot(struct vic *vic) { #ifdef CONFIG_IOMMU_API @@ -240,9 +198,62 @@ static int vic_exit(struct host1x_client *client) return 0; } +static int vic_runtime_suspend(struct host1x_client *client) +{ + struct tegra_drm_client *drm = host1x_to_drm_client(client); + struct vic *vic = to_vic(drm); + int err; + + err = reset_control_assert(vic->rst); + if (err < 0) + return err; + + usleep_range(2000, 4000); + + clk_disable_unprepare(vic->clk); + pm_runtime_put_sync(vic->dev); + + vic->booted = false; + + return 0; +} + +static int vic_runtime_resume(struct host1x_client *client) +{ + struct tegra_drm_client *drm = host1x_to_drm_client(client); + struct vic *vic = to_vic(drm); + int err; + + err = pm_runtime_get_sync(vic->dev); + if (err < 0) + return err; + + err = clk_prepare_enable(vic->clk); + if (err < 0) + goto put_rpm; + + usleep_range(10, 20); + + err = reset_control_deassert(vic->rst); + if (err < 0) + goto disable; + + usleep_range(10, 20); + + return 0; + +put_rpm: + pm_runtime_put_sync(vic->dev); +disable: + clk_disable_unprepare(vic->clk); + return err; +} + static const struct host1x_client_ops vic_client_ops = { .init = vic_init, .exit = vic_exit, + .suspend = vic_runtime_suspend, + .resume = vic_runtime_resume, }; static int vic_load_firmware(struct vic *vic) @@ -314,38 +325,37 @@ static int vic_open_channel(struct tegra_drm_client *client, struct vic *vic = to_vic(client); int err; - err = pm_runtime_get_sync(vic->dev); + err = host1x_client_resume(&client->base); if (err < 0) return err; err = vic_load_firmware(vic); if (err < 0) - goto rpm_put; + goto suspend; err = vic_boot(vic); if (err < 0) - goto rpm_put; + goto suspend; context->channel = host1x_channel_get(vic->channel); if (!context->channel) { err = -ENOMEM; - goto rpm_put; + goto suspend; } return 0; -rpm_put: - pm_runtime_put(vic->dev); +suspend: + host1x_client_suspend(&client->base); return err; } static void vic_close_channel(struct tegra_drm_context *context) { - struct vic *vic = to_vic(context->client); + struct host1x_client *client = &context->client->base; host1x_channel_put(context->channel); - - pm_runtime_put(vic->dev); + host1x_client_suspend(client); } static const struct tegra_drm_client_ops vic_ops = { @@ -472,16 +482,9 @@ static int vic_probe(struct platform_device *pdev) } pm_runtime_enable(&pdev->dev); - if (!pm_runtime_enabled(&pdev->dev)) { - err = vic_runtime_resume(&pdev->dev); - if (err < 0) - goto unregister_client; - } return 0; -unregister_client: - host1x_client_unregister(&vic->client.base); exit_falcon: falcon_exit(&vic->falcon); @@ -493,6 +496,8 @@ static int vic_remove(struct platform_device *pdev) struct vic *vic = platform_get_drvdata(pdev); int err; + pm_runtime_disable(&pdev->dev); + err = host1x_client_unregister(&vic->client.base); if (err < 0) { dev_err(&pdev->dev, "failed to unregister host1x client: %d\n", @@ -500,25 +505,15 @@ static int vic_remove(struct platform_device *pdev) return err; } - if (pm_runtime_enabled(&pdev->dev)) - pm_runtime_disable(&pdev->dev); - else - vic_runtime_suspend(&pdev->dev); - falcon_exit(&vic->falcon); return 0; } -static const struct dev_pm_ops vic_pm_ops = { - SET_RUNTIME_PM_OPS(vic_runtime_suspend, vic_runtime_resume, NULL) -}; - struct platform_driver tegra_vic_driver = { .driver = { .name = "tegra-vic", .of_match_table = tegra_vic_of_match, - .pm = &vic_pm_ops }, .probe = vic_probe, .remove = vic_remove, diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index 50d500345d04..6a995db51d6d 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -710,6 +710,10 @@ int host1x_client_register(struct host1x_client *client) struct host1x *host1x; int err; + INIT_LIST_HEAD(&client->list); + mutex_init(&client->lock); + client->usecount = 0; + mutex_lock(&devices_lock); list_for_each_entry(host1x, &devices, list) { @@ -768,3 +772,74 @@ int host1x_client_unregister(struct host1x_client *client) return 0; } EXPORT_SYMBOL(host1x_client_unregister); + +int host1x_client_suspend(struct host1x_client *client) +{ + int err = 0; + + mutex_lock(&client->lock); + + if (client->usecount == 1) { + if (client->ops && client->ops->suspend) { + err = client->ops->suspend(client); + if (err < 0) + goto unlock; + } + } + + client->usecount--; + dev_dbg(client->dev, "use count: %u\n", client->usecount); + + if (client->parent) { + err = host1x_client_suspend(client->parent); + if (err < 0) + goto resume; + } + + goto unlock; + +resume: + if (client->usecount == 0) + if (client->ops && client->ops->resume) + client->ops->resume(client); + + client->usecount++; +unlock: + mutex_unlock(&client->lock); + return err; +} +EXPORT_SYMBOL(host1x_client_suspend); + +int host1x_client_resume(struct host1x_client *client) +{ + int err = 0; + + mutex_lock(&client->lock); + + if (client->parent) { + err = host1x_client_resume(client->parent); + if (err < 0) + goto unlock; + } + + if (client->usecount == 0) { + if (client->ops && client->ops->resume) { + err = client->ops->resume(client); + if (err < 0) + goto suspend; + } + } + + client->usecount++; + dev_dbg(client->dev, "use count: %u\n", client->usecount); + + goto unlock; + +suspend: + if (client->parent) + host1x_client_suspend(client->parent); +unlock: + mutex_unlock(&client->lock); + return err; +} +EXPORT_SYMBOL(host1x_client_resume); diff --git a/include/linux/host1x.h b/include/linux/host1x.h index 470a193a9fed..0254ebcdc0a7 100644 --- a/include/linux/host1x.h +++ b/include/linux/host1x.h @@ -24,10 +24,14 @@ struct iommu_group; * struct host1x_client_ops - host1x client operations * @init: host1x client initialization code * @exit: host1x client tear down code + * @suspend: host1x client suspend code + * @resume: host1x client resume code */ struct host1x_client_ops { int (*init)(struct host1x_client *client); int (*exit)(struct host1x_client *client); + int (*suspend)(struct host1x_client *client); + int (*resume)(struct host1x_client *client); }; /** @@ -55,6 +59,10 @@ struct host1x_client { struct host1x_syncpt **syncpts; unsigned int num_syncpts; + + struct host1x_client *parent; + unsigned int usecount; + struct mutex lock; }; /* @@ -309,6 +317,9 @@ int host1x_device_exit(struct host1x_device *device); int host1x_client_register(struct host1x_client *client); int host1x_client_unregister(struct host1x_client *client); +int host1x_client_suspend(struct host1x_client *client); +int host1x_client_resume(struct host1x_client *client); + struct tegra_mipi_device; struct tegra_mipi_device *tegra_mipi_request(struct device *device); -- 2.23.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/tegra: Do not implement runtime PM 2019-12-03 16:27 ` [PATCH 2/2] drm/tegra: Do not implement runtime PM Thierry Reding @ 2019-12-04 8:37 ` Mikko Perttunen 2019-12-04 9:36 ` Thierry Reding 2019-12-04 15:22 ` Dmitry Osipenko 1 sibling, 1 reply; 5+ messages in thread From: Mikko Perttunen @ 2019-12-04 8:37 UTC (permalink / raw) To: Thierry Reding; +Cc: linux-tegra, Rafael J. Wysocki, dri-devel, linux-pm Is there any specific reason non-display engines like VIC cannot continue to use runtime PM? I know being able to do 'echo on > power/control' for VIC has been quite useful for debugging in the past. Mikko On 3.12.2019 18.27, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > The Tegra DRM driver heavily relies on the implementations for runtime > suspend/resume to be called at specific times. Unfortunately, there are > some cases where that doesn't work. One example is if the user disables > runtime PM for a given subdevice. Another example is that the PM core > acquires a reference to runtime PM during system sleep, effectively > preventing devices from going into low power modes. This is intentional > to avoid nasty race conditions, but it also causes system sleep to not > function properly on all Tegra systems. > > Fix this by not implementing runtime PM at all. Instead, a minimal, > reference-counted suspend/resume infrastructure is added to the host1x > bus. This has the benefit that it can be used regardless of the system > power state (or any transitions we might be in), or whether or not the > user allows runtime PM. > > Atomic modesetting guarantees that these functions will end up being > called at the right point in time, so the pitfalls for the more generic > runtime PM do not apply here. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > drivers/gpu/drm/tegra/dc.c | 141 ++++++++++++++---------- > drivers/gpu/drm/tegra/dpaux.c | 2 +- > drivers/gpu/drm/tegra/drm.h | 2 + > drivers/gpu/drm/tegra/dsi.c | 175 ++++++++++++++++-------------- > drivers/gpu/drm/tegra/hdmi.c | 116 +++++++++++--------- > drivers/gpu/drm/tegra/hub.c | 194 ++++++++++++++++++++-------------- > drivers/gpu/drm/tegra/hub.h | 2 +- > drivers/gpu/drm/tegra/sor.c | 154 +++++++++++++++------------ > drivers/gpu/drm/tegra/vic.c | 131 +++++++++++------------ > drivers/gpu/host1x/bus.c | 75 +++++++++++++ > include/linux/host1x.h | 11 ++ > 11 files changed, 604 insertions(+), 399 deletions(-) > > diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c > index 2983eb33f2be..871046f3f469 100644 > --- a/drivers/gpu/drm/tegra/dc.c > +++ b/drivers/gpu/drm/tegra/dc.c > @@ -1737,6 +1737,7 @@ static void tegra_crtc_atomic_disable(struct drm_crtc *crtc, > { > struct tegra_dc *dc = to_tegra_dc(crtc); > u32 value; > + int err; > > if (!tegra_dc_idle(dc)) { > tegra_dc_stop(dc); > @@ -1783,7 +1784,9 @@ static void tegra_crtc_atomic_disable(struct drm_crtc *crtc, > > spin_unlock_irq(&crtc->dev->event_lock); > > - pm_runtime_put_sync(dc->dev); > + err = host1x_client_suspend(&dc->client); > + if (err < 0) > + dev_err(dc->dev, "failed to suspend: %d\n", err); > } > > static void tegra_crtc_atomic_enable(struct drm_crtc *crtc, > @@ -1793,8 +1796,13 @@ static void tegra_crtc_atomic_enable(struct drm_crtc *crtc, > struct tegra_dc_state *state = to_dc_state(crtc->state); > struct tegra_dc *dc = to_tegra_dc(crtc); > u32 value; > + int err; > > - pm_runtime_get_sync(dc->dev); > + err = host1x_client_resume(&dc->client); > + if (err < 0) { > + dev_err(dc->dev, "failed to resume: %d\n", err); > + return; > + } > > /* initialize display controller */ > if (dc->syncpt) { > @@ -2022,6 +2030,15 @@ static int tegra_dc_init(struct host1x_client *client) > if (!tegra_dc_has_window_groups(dc)) > return 0; > > + /* > + * Set the display hub as the host1x client parent for the display > + * controller. This is needed for the runtime reference counting that > + * ensures the display hub is always powered when any of the display > + * controllers are. > + */ > + if (dc->soc->has_nvdisplay) > + client->parent = &tegra->hub->client; > + > dc->syncpt = host1x_syncpt_request(client, flags); > if (!dc->syncpt) > dev_warn(dc->dev, "failed to allocate syncpoint\n"); > @@ -2131,9 +2148,74 @@ static int tegra_dc_exit(struct host1x_client *client) > return 0; > } > > +static int tegra_dc_runtime_suspend(struct host1x_client *client) > +{ > + struct tegra_dc *dc = host1x_client_to_dc(client); > + struct device *dev = client->dev; > + int err; > + > + err = reset_control_assert(dc->rst); > + if (err < 0) { > + dev_err(dev, "failed to assert reset: %d\n", err); > + return err; > + } > + > + if (dc->soc->has_powergate) > + tegra_powergate_power_off(dc->powergate); > + > + clk_disable_unprepare(dc->clk); > + pm_runtime_put_sync(dev); > + > + return 0; > +} > + > +static int tegra_dc_runtime_resume(struct host1x_client *client) > +{ > + struct tegra_dc *dc = host1x_client_to_dc(client); > + struct device *dev = client->dev; > + int err; > + > + err = pm_runtime_get_sync(dev); > + if (err < 0) { > + dev_err(dev, "failed to get runtime PM: %d\n", err); > + return err; > + } > + > + if (dc->soc->has_powergate) { > + err = tegra_powergate_sequence_power_up(dc->powergate, dc->clk, > + dc->rst); > + if (err < 0) { > + dev_err(dev, "failed to power partition: %d\n", err); > + goto put_rpm; > + } > + } else { > + err = clk_prepare_enable(dc->clk); > + if (err < 0) { > + dev_err(dev, "failed to enable clock: %d\n", err); > + goto put_rpm; > + } > + > + err = reset_control_deassert(dc->rst); > + if (err < 0) { > + dev_err(dev, "failed to deassert reset: %d\n", err); > + goto disable_clk; > + } > + } > + > + return 0; > + > +disable_clk: > + clk_disable_unprepare(dc->clk); > +put_rpm: > + pm_runtime_put_sync(dev); > + return err; > +} > + > static const struct host1x_client_ops dc_client_ops = { > .init = tegra_dc_init, > .exit = tegra_dc_exit, > + .suspend = tegra_dc_runtime_suspend, > + .resume = tegra_dc_runtime_resume, > }; > > static const struct tegra_dc_soc_info tegra20_dc_soc_info = { > @@ -2545,65 +2627,10 @@ static int tegra_dc_remove(struct platform_device *pdev) > return 0; > } > > -#ifdef CONFIG_PM > -static int tegra_dc_suspend(struct device *dev) > -{ > - struct tegra_dc *dc = dev_get_drvdata(dev); > - int err; > - > - err = reset_control_assert(dc->rst); > - if (err < 0) { > - dev_err(dev, "failed to assert reset: %d\n", err); > - return err; > - } > - > - if (dc->soc->has_powergate) > - tegra_powergate_power_off(dc->powergate); > - > - clk_disable_unprepare(dc->clk); > - > - return 0; > -} > - > -static int tegra_dc_resume(struct device *dev) > -{ > - struct tegra_dc *dc = dev_get_drvdata(dev); > - int err; > - > - if (dc->soc->has_powergate) { > - err = tegra_powergate_sequence_power_up(dc->powergate, dc->clk, > - dc->rst); > - if (err < 0) { > - dev_err(dev, "failed to power partition: %d\n", err); > - return err; > - } > - } else { > - err = clk_prepare_enable(dc->clk); > - if (err < 0) { > - dev_err(dev, "failed to enable clock: %d\n", err); > - return err; > - } > - > - err = reset_control_deassert(dc->rst); > - if (err < 0) { > - dev_err(dev, "failed to deassert reset: %d\n", err); > - return err; > - } > - } > - > - return 0; > -} > -#endif > - > -static const struct dev_pm_ops tegra_dc_pm_ops = { > - SET_RUNTIME_PM_OPS(tegra_dc_suspend, tegra_dc_resume, NULL) > -}; > - > struct platform_driver tegra_dc_driver = { > .driver = { > .name = "tegra-dc", > .of_match_table = tegra_dc_of_match, > - .pm = &tegra_dc_pm_ops, > }, > .probe = tegra_dc_probe, > .remove = tegra_dc_remove, > diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c > index 622cdf1ad246..7dfb50f65067 100644 > --- a/drivers/gpu/drm/tegra/dpaux.c > +++ b/drivers/gpu/drm/tegra/dpaux.c > @@ -588,7 +588,7 @@ static int tegra_dpaux_remove(struct platform_device *pdev) > /* make sure pads are powered down when not in use */ > tegra_dpaux_pad_power_down(dpaux); > > - pm_runtime_put(&pdev->dev); > + pm_runtime_put_sync(&pdev->dev); > pm_runtime_disable(&pdev->dev); > > drm_dp_aux_unregister(&dpaux->aux); > diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h > index d941553f7a3d..ed99b67deb29 100644 > --- a/drivers/gpu/drm/tegra/drm.h > +++ b/drivers/gpu/drm/tegra/drm.h > @@ -144,6 +144,8 @@ int tegra_output_init(struct drm_device *drm, struct tegra_output *output); > void tegra_output_exit(struct tegra_output *output); > void tegra_output_find_possible_crtcs(struct tegra_output *output, > struct drm_device *drm); > +int tegra_output_suspend(struct tegra_output *output); > +int tegra_output_resume(struct tegra_output *output); > > int tegra_output_connector_get_modes(struct drm_connector *connector); > enum drm_connector_status > diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c > index ec475d022fa0..88b9d64c77bf 100644 > --- a/drivers/gpu/drm/tegra/dsi.c > +++ b/drivers/gpu/drm/tegra/dsi.c > @@ -840,7 +840,9 @@ static void tegra_dsi_unprepare(struct tegra_dsi *dsi) > dev_err(dsi->dev, "failed to disable MIPI calibration: %d\n", > err); > > - pm_runtime_put(dsi->dev); > + err = host1x_client_suspend(&dsi->client); > + if (err < 0) > + dev_err(dsi->dev, "failed to suspend: %d\n", err); > } > > static void tegra_dsi_encoder_disable(struct drm_encoder *encoder) > @@ -882,11 +884,15 @@ static void tegra_dsi_encoder_disable(struct drm_encoder *encoder) > tegra_dsi_unprepare(dsi); > } > > -static void tegra_dsi_prepare(struct tegra_dsi *dsi) > +static int tegra_dsi_prepare(struct tegra_dsi *dsi) > { > int err; > > - pm_runtime_get_sync(dsi->dev); > + err = host1x_client_resume(&dsi->client); > + if (err < 0) { > + dev_err(dsi->dev, "failed to resume: %d\n", err); > + return err; > + } > > err = tegra_mipi_enable(dsi->mipi); > if (err < 0) > @@ -899,6 +905,8 @@ static void tegra_dsi_prepare(struct tegra_dsi *dsi) > > if (dsi->slave) > tegra_dsi_prepare(dsi->slave); > + > + return 0; > } > > static void tegra_dsi_encoder_enable(struct drm_encoder *encoder) > @@ -909,8 +917,13 @@ static void tegra_dsi_encoder_enable(struct drm_encoder *encoder) > struct tegra_dsi *dsi = to_dsi(output); > struct tegra_dsi_state *state; > u32 value; > + int err; > > - tegra_dsi_prepare(dsi); > + err = tegra_dsi_prepare(dsi); > + if (err < 0) { > + dev_err(dsi->dev, "failed to prepare: %d\n", err); > + return; > + } > > state = tegra_dsi_get_state(dsi); > > @@ -1075,9 +1088,89 @@ static int tegra_dsi_exit(struct host1x_client *client) > return 0; > } > > +static int tegra_dsi_runtime_suspend(struct host1x_client *client) > +{ > + struct tegra_dsi *dsi = host1x_client_to_dsi(client); > + struct device *dev = client->dev; > + int err; > + > + if (dsi->rst) { > + err = reset_control_assert(dsi->rst); > + if (err < 0) { > + dev_err(dev, "failed to assert reset: %d\n", err); > + return err; > + } > + } > + > + usleep_range(1000, 2000); > + > + clk_disable_unprepare(dsi->clk_lp); > + clk_disable_unprepare(dsi->clk); > + > + regulator_disable(dsi->vdd); > + pm_runtime_put_sync(dev); > + > + return 0; > +} > + > +static int tegra_dsi_runtime_resume(struct host1x_client *client) > +{ > + struct tegra_dsi *dsi = host1x_client_to_dsi(client); > + struct device *dev = client->dev; > + int err; > + > + err = pm_runtime_get_sync(dev); > + if (err < 0) { > + dev_err(dev, "failed to get runtime PM: %d\n", err); > + return err; > + } > + > + err = regulator_enable(dsi->vdd); > + if (err < 0) { > + dev_err(dev, "failed to enable VDD supply: %d\n", err); > + goto put_rpm; > + } > + > + err = clk_prepare_enable(dsi->clk); > + if (err < 0) { > + dev_err(dev, "cannot enable DSI clock: %d\n", err); > + goto disable_vdd; > + } > + > + err = clk_prepare_enable(dsi->clk_lp); > + if (err < 0) { > + dev_err(dev, "cannot enable low-power clock: %d\n", err); > + goto disable_clk; > + } > + > + usleep_range(1000, 2000); > + > + if (dsi->rst) { > + err = reset_control_deassert(dsi->rst); > + if (err < 0) { > + dev_err(dev, "cannot assert reset: %d\n", err); > + goto disable_clk_lp; > + } > + } > + > + return 0; > + > +disable_clk_lp: > + clk_disable_unprepare(dsi->clk_lp); > +disable_clk: > + clk_disable_unprepare(dsi->clk); > +disable_vdd: > + regulator_disable(dsi->vdd); > +put_rpm: > + pm_runtime_put_sync(dev); > + return err; > +} > + > static const struct host1x_client_ops dsi_client_ops = { > .init = tegra_dsi_init, > .exit = tegra_dsi_exit, > + .suspend = tegra_dsi_runtime_suspend, > + .resume = tegra_dsi_runtime_resume, > }; > > static int tegra_dsi_setup_clocks(struct tegra_dsi *dsi) > @@ -1596,79 +1689,6 @@ static int tegra_dsi_remove(struct platform_device *pdev) > return 0; > } > > -#ifdef CONFIG_PM > -static int tegra_dsi_suspend(struct device *dev) > -{ > - struct tegra_dsi *dsi = dev_get_drvdata(dev); > - int err; > - > - if (dsi->rst) { > - err = reset_control_assert(dsi->rst); > - if (err < 0) { > - dev_err(dev, "failed to assert reset: %d\n", err); > - return err; > - } > - } > - > - usleep_range(1000, 2000); > - > - clk_disable_unprepare(dsi->clk_lp); > - clk_disable_unprepare(dsi->clk); > - > - regulator_disable(dsi->vdd); > - > - return 0; > -} > - > -static int tegra_dsi_resume(struct device *dev) > -{ > - struct tegra_dsi *dsi = dev_get_drvdata(dev); > - int err; > - > - err = regulator_enable(dsi->vdd); > - if (err < 0) { > - dev_err(dsi->dev, "failed to enable VDD supply: %d\n", err); > - return err; > - } > - > - err = clk_prepare_enable(dsi->clk); > - if (err < 0) { > - dev_err(dev, "cannot enable DSI clock: %d\n", err); > - goto disable_vdd; > - } > - > - err = clk_prepare_enable(dsi->clk_lp); > - if (err < 0) { > - dev_err(dev, "cannot enable low-power clock: %d\n", err); > - goto disable_clk; > - } > - > - usleep_range(1000, 2000); > - > - if (dsi->rst) { > - err = reset_control_deassert(dsi->rst); > - if (err < 0) { > - dev_err(dev, "cannot assert reset: %d\n", err); > - goto disable_clk_lp; > - } > - } > - > - return 0; > - > -disable_clk_lp: > - clk_disable_unprepare(dsi->clk_lp); > -disable_clk: > - clk_disable_unprepare(dsi->clk); > -disable_vdd: > - regulator_disable(dsi->vdd); > - return err; > -} > -#endif > - > -static const struct dev_pm_ops tegra_dsi_pm_ops = { > - SET_RUNTIME_PM_OPS(tegra_dsi_suspend, tegra_dsi_resume, NULL) > -}; > - > static const struct of_device_id tegra_dsi_of_match[] = { > { .compatible = "nvidia,tegra210-dsi", }, > { .compatible = "nvidia,tegra132-dsi", }, > @@ -1682,7 +1702,6 @@ struct platform_driver tegra_dsi_driver = { > .driver = { > .name = "tegra-dsi", > .of_match_table = tegra_dsi_of_match, > - .pm = &tegra_dsi_pm_ops, > }, > .probe = tegra_dsi_probe, > .remove = tegra_dsi_remove, > diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c > index 38bf1d16095f..cb504ec8f284 100644 > --- a/drivers/gpu/drm/tegra/hdmi.c > +++ b/drivers/gpu/drm/tegra/hdmi.c > @@ -1146,6 +1146,7 @@ static void tegra_hdmi_encoder_disable(struct drm_encoder *encoder) > struct tegra_dc *dc = to_tegra_dc(encoder->crtc); > struct tegra_hdmi *hdmi = to_hdmi(output); > u32 value; > + int err; > > /* > * The following accesses registers of the display controller, so make > @@ -1171,7 +1172,9 @@ static void tegra_hdmi_encoder_disable(struct drm_encoder *encoder) > tegra_hdmi_writel(hdmi, 0, HDMI_NV_PDISP_INT_ENABLE); > tegra_hdmi_writel(hdmi, 0, HDMI_NV_PDISP_INT_MASK); > > - pm_runtime_put(hdmi->dev); > + err = host1x_client_suspend(&hdmi->client); > + if (err < 0) > + dev_err(hdmi->dev, "failed to suspend: %d\n", err); > } > > static void tegra_hdmi_encoder_enable(struct drm_encoder *encoder) > @@ -1186,7 +1189,11 @@ static void tegra_hdmi_encoder_enable(struct drm_encoder *encoder) > u32 value; > int err; > > - pm_runtime_get_sync(hdmi->dev); > + err = host1x_client_resume(&hdmi->client); > + if (err < 0) { > + dev_err(hdmi->dev, "failed to resume: %d\n", err); > + return; > + } > > /* > * Enable and unmask the HDA codec SCRATCH0 register interrupt. This > @@ -1489,9 +1496,66 @@ static int tegra_hdmi_exit(struct host1x_client *client) > return 0; > } > > +static int tegra_hdmi_runtime_suspend(struct host1x_client *client) > +{ > + struct tegra_hdmi *hdmi = host1x_client_to_hdmi(client); > + struct device *dev = client->dev; > + int err; > + > + err = reset_control_assert(hdmi->rst); > + if (err < 0) { > + dev_err(dev, "failed to assert reset: %d\n", err); > + return err; > + } > + > + usleep_range(1000, 2000); > + > + clk_disable_unprepare(hdmi->clk); > + pm_runtime_put_sync(dev); > + > + return 0; > +} > + > +static int tegra_hdmi_runtime_resume(struct host1x_client *client) > +{ > + struct tegra_hdmi *hdmi = host1x_client_to_hdmi(client); > + struct device *dev = client->dev; > + int err; > + > + err = pm_runtime_get_sync(dev); > + if (err < 0) { > + dev_err(dev, "failed to get runtime PM: %d\n", err); > + return err; > + } > + > + err = clk_prepare_enable(hdmi->clk); > + if (err < 0) { > + dev_err(dev, "failed to enable clock: %d\n", err); > + goto put_rpm; > + } > + > + usleep_range(1000, 2000); > + > + err = reset_control_deassert(hdmi->rst); > + if (err < 0) { > + dev_err(dev, "failed to deassert reset: %d\n", err); > + goto disable_clk; > + } > + > + return 0; > + > +disable_clk: > + clk_disable_unprepare(hdmi->clk); > +put_rpm: > + pm_runtime_put_sync(dev); > + return err; > +} > + > static const struct host1x_client_ops hdmi_client_ops = { > .init = tegra_hdmi_init, > .exit = tegra_hdmi_exit, > + .suspend = tegra_hdmi_runtime_suspend, > + .resume = tegra_hdmi_runtime_resume, > }; > > static const struct tegra_hdmi_config tegra20_hdmi_config = { > @@ -1699,58 +1763,10 @@ static int tegra_hdmi_remove(struct platform_device *pdev) > return 0; > } > > -#ifdef CONFIG_PM > -static int tegra_hdmi_suspend(struct device *dev) > -{ > - struct tegra_hdmi *hdmi = dev_get_drvdata(dev); > - int err; > - > - err = reset_control_assert(hdmi->rst); > - if (err < 0) { > - dev_err(dev, "failed to assert reset: %d\n", err); > - return err; > - } > - > - usleep_range(1000, 2000); > - > - clk_disable_unprepare(hdmi->clk); > - > - return 0; > -} > - > -static int tegra_hdmi_resume(struct device *dev) > -{ > - struct tegra_hdmi *hdmi = dev_get_drvdata(dev); > - int err; > - > - err = clk_prepare_enable(hdmi->clk); > - if (err < 0) { > - dev_err(dev, "failed to enable clock: %d\n", err); > - return err; > - } > - > - usleep_range(1000, 2000); > - > - err = reset_control_deassert(hdmi->rst); > - if (err < 0) { > - dev_err(dev, "failed to deassert reset: %d\n", err); > - clk_disable_unprepare(hdmi->clk); > - return err; > - } > - > - return 0; > -} > -#endif > - > -static const struct dev_pm_ops tegra_hdmi_pm_ops = { > - SET_RUNTIME_PM_OPS(tegra_hdmi_suspend, tegra_hdmi_resume, NULL) > -}; > - > struct platform_driver tegra_hdmi_driver = { > .driver = { > .name = "tegra-hdmi", > .of_match_table = tegra_hdmi_of_match, > - .pm = &tegra_hdmi_pm_ops, > }, > .probe = tegra_hdmi_probe, > .remove = tegra_hdmi_remove, > diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c > index 5c7545ee5a5b..73e6fe9b833d 100644 > --- a/drivers/gpu/drm/tegra/hub.c > +++ b/drivers/gpu/drm/tegra/hub.c > @@ -105,17 +105,25 @@ static inline void tegra_plane_writel(struct tegra_plane *plane, u32 value, > > static int tegra_windowgroup_enable(struct tegra_windowgroup *wgrp) > { > + int err = 0; > + > mutex_lock(&wgrp->lock); > > if (wgrp->usecount == 0) { > - pm_runtime_get_sync(wgrp->parent); > + err = host1x_client_resume(wgrp->parent); > + if (err < 0) { > + dev_err(wgrp->parent->dev, "failed to resume: %d\n", err); > + goto unlock; > + } > + > reset_control_deassert(wgrp->rst); > } > > wgrp->usecount++; > - mutex_unlock(&wgrp->lock); > > - return 0; > +unlock: > + mutex_unlock(&wgrp->lock); > + return err; > } > > static void tegra_windowgroup_disable(struct tegra_windowgroup *wgrp) > @@ -131,7 +139,7 @@ static void tegra_windowgroup_disable(struct tegra_windowgroup *wgrp) > wgrp->index); > } > > - pm_runtime_put(wgrp->parent); > + host1x_client_suspend(wgrp->parent); > } > > wgrp->usecount--; > @@ -389,6 +397,7 @@ static void tegra_shared_plane_atomic_disable(struct drm_plane *plane, > struct tegra_plane *p = to_tegra_plane(plane); > struct tegra_dc *dc; > u32 value; > + int err; > > /* rien ne va plus */ > if (!old_state || !old_state->crtc) > @@ -396,6 +405,12 @@ static void tegra_shared_plane_atomic_disable(struct drm_plane *plane, > > dc = to_tegra_dc(old_state->crtc); > > + err = host1x_client_resume(&dc->client); > + if (err < 0) { > + dev_err(dc->dev, "failed to resume: %d\n", err); > + return; > + } > + > /* > * XXX Legacy helpers seem to sometimes call ->atomic_disable() even > * on planes that are already disabled. Make sure we fallback to the > @@ -404,15 +419,13 @@ static void tegra_shared_plane_atomic_disable(struct drm_plane *plane, > if (WARN_ON(p->dc == NULL)) > p->dc = dc; > > - pm_runtime_get_sync(dc->dev); > - > value = tegra_plane_readl(p, DC_WIN_WIN_OPTIONS); > value &= ~WIN_ENABLE; > tegra_plane_writel(p, value, DC_WIN_WIN_OPTIONS); > > tegra_dc_remove_shared_plane(dc, p); > > - pm_runtime_put(dc->dev); > + host1x_client_suspend(&dc->client); > } > > static void tegra_shared_plane_atomic_update(struct drm_plane *plane, > @@ -425,6 +438,7 @@ static void tegra_shared_plane_atomic_update(struct drm_plane *plane, > struct tegra_plane *p = to_tegra_plane(plane); > dma_addr_t base; > u32 value; > + int err; > > /* rien ne va plus */ > if (!plane->state->crtc || !plane->state->fb) > @@ -435,7 +449,11 @@ static void tegra_shared_plane_atomic_update(struct drm_plane *plane, > return; > } > > - pm_runtime_get_sync(dc->dev); > + err = host1x_client_resume(&dc->client); > + if (err < 0) { > + dev_err(dc->dev, "failed to resume: %d\n", err); > + return; > + } > > tegra_dc_assign_shared_plane(dc, p); > > @@ -525,7 +543,7 @@ static void tegra_shared_plane_atomic_update(struct drm_plane *plane, > value &= ~CONTROL_CSC_ENABLE; > tegra_plane_writel(p, value, DC_WIN_WINDOW_SET_CONTROL); > > - pm_runtime_put(dc->dev); > + host1x_client_suspend(&dc->client); > } > > static const struct drm_plane_helper_funcs tegra_shared_plane_helper_funcs = { > @@ -561,7 +579,7 @@ struct drm_plane *tegra_shared_plane_create(struct drm_device *drm, > plane->base.index = index; > > plane->wgrp = &hub->wgrps[wgrp]; > - plane->wgrp->parent = dc->dev; > + plane->wgrp->parent = &dc->client; > > p = &plane->base.base; > > @@ -666,8 +684,13 @@ int tegra_display_hub_atomic_check(struct drm_device *drm, > static void tegra_display_hub_update(struct tegra_dc *dc) > { > u32 value; > + int err; > > - pm_runtime_get_sync(dc->dev); > + err = host1x_client_resume(&dc->client); > + if (err < 0) { > + dev_err(dc->dev, "failed to resume: %d\n", err); > + return; > + } > > value = tegra_dc_readl(dc, DC_CMD_IHUB_COMMON_MISC_CTL); > value &= ~LATENCY_EVENT; > @@ -682,7 +705,7 @@ static void tegra_display_hub_update(struct tegra_dc *dc) > tegra_dc_writel(dc, COMMON_ACTREQ, DC_CMD_STATE_CONTROL); > tegra_dc_readl(dc, DC_CMD_STATE_CONTROL); > > - pm_runtime_put(dc->dev); > + host1x_client_suspend(&dc->client); > } > > void tegra_display_hub_atomic_commit(struct drm_device *drm, > @@ -742,9 +765,85 @@ static int tegra_display_hub_exit(struct host1x_client *client) > return 0; > } > > +static int tegra_display_hub_runtime_suspend(struct host1x_client *client) > +{ > + struct tegra_display_hub *hub = to_tegra_display_hub(client); > + struct device *dev = client->dev; > + unsigned int i = hub->num_heads; > + int err; > + > + err = reset_control_assert(hub->rst); > + if (err < 0) > + return err; > + > + while (i--) > + clk_disable_unprepare(hub->clk_heads[i]); > + > + clk_disable_unprepare(hub->clk_hub); > + clk_disable_unprepare(hub->clk_dsc); > + clk_disable_unprepare(hub->clk_disp); > + > + pm_runtime_put_sync(dev); > + > + return 0; > +} > + > +static int tegra_display_hub_runtime_resume(struct host1x_client *client) > +{ > + struct tegra_display_hub *hub = to_tegra_display_hub(client); > + struct device *dev = client->dev; > + unsigned int i; > + int err; > + > + err = pm_runtime_get_sync(dev); > + if (err < 0) { > + dev_err(dev, "failed to get runtime PM: %d\n", err); > + return err; > + } > + > + err = clk_prepare_enable(hub->clk_disp); > + if (err < 0) > + goto put_rpm; > + > + err = clk_prepare_enable(hub->clk_dsc); > + if (err < 0) > + goto disable_disp; > + > + err = clk_prepare_enable(hub->clk_hub); > + if (err < 0) > + goto disable_dsc; > + > + for (i = 0; i < hub->num_heads; i++) { > + err = clk_prepare_enable(hub->clk_heads[i]); > + if (err < 0) > + goto disable_heads; > + } > + > + err = reset_control_deassert(hub->rst); > + if (err < 0) > + goto disable_heads; > + > + return 0; > + > +disable_heads: > + while (i--) > + clk_disable_unprepare(hub->clk_heads[i]); > + > + clk_disable_unprepare(hub->clk_hub); > +disable_dsc: > + clk_disable_unprepare(hub->clk_dsc); > +disable_disp: > + clk_disable_unprepare(hub->clk_disp); > +put_rpm: > + pm_runtime_put_sync(dev); > + return err; > +} > + > static const struct host1x_client_ops tegra_display_hub_ops = { > .init = tegra_display_hub_init, > .exit = tegra_display_hub_exit, > + .suspend = tegra_display_hub_runtime_suspend, > + .resume = tegra_display_hub_runtime_resume, > }; > > static int tegra_display_hub_probe(struct platform_device *pdev) > @@ -861,6 +960,7 @@ static int tegra_display_hub_probe(struct platform_device *pdev) > static int tegra_display_hub_remove(struct platform_device *pdev) > { > struct tegra_display_hub *hub = platform_get_drvdata(pdev); > + unsigned int i; > int err; > > err = host1x_client_unregister(&hub->client); > @@ -869,78 +969,17 @@ static int tegra_display_hub_remove(struct platform_device *pdev) > err); > } > > - pm_runtime_disable(&pdev->dev); > - > - return err; > -} > - > -static int __maybe_unused tegra_display_hub_suspend(struct device *dev) > -{ > - struct tegra_display_hub *hub = dev_get_drvdata(dev); > - unsigned int i = hub->num_heads; > - int err; > - > - err = reset_control_assert(hub->rst); > - if (err < 0) > - return err; > - > - while (i--) > - clk_disable_unprepare(hub->clk_heads[i]); > - > - clk_disable_unprepare(hub->clk_hub); > - clk_disable_unprepare(hub->clk_dsc); > - clk_disable_unprepare(hub->clk_disp); > - > - return 0; > -} > - > -static int __maybe_unused tegra_display_hub_resume(struct device *dev) > -{ > - struct tegra_display_hub *hub = dev_get_drvdata(dev); > - unsigned int i; > - int err; > - > - err = clk_prepare_enable(hub->clk_disp); > - if (err < 0) > - return err; > - > - err = clk_prepare_enable(hub->clk_dsc); > - if (err < 0) > - goto disable_disp; > - > - err = clk_prepare_enable(hub->clk_hub); > - if (err < 0) > - goto disable_dsc; > + for (i = 0; i < hub->soc->num_wgrps; i++) { > + struct tegra_windowgroup *wgrp = &hub->wgrps[i]; > > - for (i = 0; i < hub->num_heads; i++) { > - err = clk_prepare_enable(hub->clk_heads[i]); > - if (err < 0) > - goto disable_heads; > + mutex_destroy(&wgrp->lock); > } > > - err = reset_control_deassert(hub->rst); > - if (err < 0) > - goto disable_heads; > - > - return 0; > - > -disable_heads: > - while (i--) > - clk_disable_unprepare(hub->clk_heads[i]); > + pm_runtime_disable(&pdev->dev); > > - clk_disable_unprepare(hub->clk_hub); > -disable_dsc: > - clk_disable_unprepare(hub->clk_dsc); > -disable_disp: > - clk_disable_unprepare(hub->clk_disp); > return err; > } > > -static const struct dev_pm_ops tegra_display_hub_pm_ops = { > - SET_RUNTIME_PM_OPS(tegra_display_hub_suspend, > - tegra_display_hub_resume, NULL) > -}; > - > static const struct tegra_display_hub_soc tegra186_display_hub = { > .num_wgrps = 6, > .supports_dsc = true, > @@ -968,7 +1007,6 @@ struct platform_driver tegra_display_hub_driver = { > .driver = { > .name = "tegra-display-hub", > .of_match_table = tegra_display_hub_of_match, > - .pm = &tegra_display_hub_pm_ops, > }, > .probe = tegra_display_hub_probe, > .remove = tegra_display_hub_remove, > diff --git a/drivers/gpu/drm/tegra/hub.h b/drivers/gpu/drm/tegra/hub.h > index 767a60d9313c..3efa1be07ff8 100644 > --- a/drivers/gpu/drm/tegra/hub.h > +++ b/drivers/gpu/drm/tegra/hub.h > @@ -17,7 +17,7 @@ struct tegra_windowgroup { > struct mutex lock; > > unsigned int index; > - struct device *parent; > + struct host1x_client *parent; > struct reset_control *rst; > }; > > diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c > index 956bf5d680ad..200d99e17afe 100644 > --- a/drivers/gpu/drm/tegra/sor.c > +++ b/drivers/gpu/drm/tegra/sor.c > @@ -2255,7 +2255,7 @@ static void tegra_sor_hdmi_disable(struct drm_encoder *encoder) > if (err < 0) > dev_err(sor->dev, "failed to power off I/O pad: %d\n", err); > > - pm_runtime_put(sor->dev); > + host1x_client_suspend(&sor->client); > } > > static void tegra_sor_hdmi_enable(struct drm_encoder *encoder) > @@ -2276,7 +2276,11 @@ static void tegra_sor_hdmi_enable(struct drm_encoder *encoder) > mode = &encoder->crtc->state->adjusted_mode; > pclk = mode->clock * 1000; > > - pm_runtime_get_sync(sor->dev); > + err = host1x_client_resume(&sor->client); > + if (err < 0) { > + dev_err(sor->dev, "failed to resume: %d\n", err); > + return; > + } > > /* switch to safe parent clock */ > err = tegra_sor_set_parent_clock(sor, sor->clk_safe); > @@ -2722,7 +2726,7 @@ static void tegra_sor_dp_disable(struct drm_encoder *encoder) > if (output->panel) > drm_panel_unprepare(output->panel); > > - pm_runtime_put(sor->dev); > + host1x_client_suspend(&sor->client); > } > > static void tegra_sor_dp_enable(struct drm_encoder *encoder) > @@ -2742,7 +2746,11 @@ static void tegra_sor_dp_enable(struct drm_encoder *encoder) > mode = &encoder->crtc->state->adjusted_mode; > info = &output->connector.display_info; > > - pm_runtime_get_sync(sor->dev); > + err = host1x_client_resume(&sor->client); > + if (err < 0) { > + dev_err(sor->dev, "failed to resume: %d\n", err); > + return; > + } > > /* switch to safe parent clock */ > err = tegra_sor_set_parent_clock(sor, sor->clk_safe); > @@ -3189,9 +3197,80 @@ static int tegra_sor_exit(struct host1x_client *client) > return 0; > } > > +static int tegra_sor_runtime_suspend(struct host1x_client *client) > +{ > + struct tegra_sor *sor = host1x_client_to_sor(client); > + struct device *dev = client->dev; > + int err; > + > + if (sor->rst) { > + err = reset_control_assert(sor->rst); > + if (err < 0) { > + dev_err(dev, "failed to assert reset: %d\n", err); > + return err; > + } > + > + reset_control_release(sor->rst); > + } > + > + usleep_range(1000, 2000); > + > + clk_disable_unprepare(sor->clk); > + pm_runtime_put_sync(dev); > + > + return 0; > +} > + > +static int tegra_sor_runtime_resume(struct host1x_client *client) > +{ > + struct tegra_sor *sor = host1x_client_to_sor(client); > + struct device *dev = client->dev; > + int err; > + > + err = pm_runtime_get_sync(dev); > + if (err < 0) { > + dev_err(dev, "failed to get runtime PM: %d\n", err); > + return err; > + } > + > + err = clk_prepare_enable(sor->clk); > + if (err < 0) { > + dev_err(dev, "failed to enable clock: %d\n", err); > + goto put_rpm; > + } > + > + usleep_range(1000, 2000); > + > + if (sor->rst) { > + err = reset_control_acquire(sor->rst); > + if (err < 0) { > + dev_err(dev, "failed to acquire reset: %d\n", err); > + goto disable_clk; > + } > + > + err = reset_control_deassert(sor->rst); > + if (err < 0) { > + dev_err(dev, "failed to deassert reset: %d\n", err); > + goto release_reset; > + } > + } > + > + return 0; > + > +release_reset: > + reset_control_release(sor->rst); > +disable_clk: > + clk_disable_unprepare(sor->clk); > +put_rpm: > + pm_runtime_put_sync(dev); > + return err; > +} > + > static const struct host1x_client_ops sor_client_ops = { > .init = tegra_sor_init, > .exit = tegra_sor_exit, > + .suspend = tegra_sor_runtime_suspend, > + .resume = tegra_sor_runtime_resume, > }; > > static const u8 tegra124_sor_xbar_cfg[5] = { > @@ -3842,10 +3921,9 @@ static int tegra_sor_probe(struct platform_device *pdev) > if (!sor->clk_pad) { > char *name; > > - err = pm_runtime_get_sync(&pdev->dev); > + err = host1x_client_resume(&sor->client); > if (err < 0) { > - dev_err(&pdev->dev, "failed to get runtime PM: %d\n", > - err); > + dev_err(sor->dev, "failed to resume: %d\n", err); > goto remove; > } > > @@ -3856,7 +3934,7 @@ static int tegra_sor_probe(struct platform_device *pdev) > } > > sor->clk_pad = tegra_clk_sor_pad_register(sor, name); > - pm_runtime_put(&pdev->dev); > + host1x_client_suspend(&sor->client); > } > > if (IS_ERR(sor->clk_pad)) { > @@ -3912,61 +3990,6 @@ static int tegra_sor_remove(struct platform_device *pdev) > return 0; > } > > -static int tegra_sor_runtime_suspend(struct device *dev) > -{ > - struct tegra_sor *sor = dev_get_drvdata(dev); > - int err; > - > - if (sor->rst) { > - err = reset_control_assert(sor->rst); > - if (err < 0) { > - dev_err(dev, "failed to assert reset: %d\n", err); > - return err; > - } > - > - reset_control_release(sor->rst); > - } > - > - usleep_range(1000, 2000); > - > - clk_disable_unprepare(sor->clk); > - > - return 0; > -} > - > -static int tegra_sor_runtime_resume(struct device *dev) > -{ > - struct tegra_sor *sor = dev_get_drvdata(dev); > - int err; > - > - err = clk_prepare_enable(sor->clk); > - if (err < 0) { > - dev_err(dev, "failed to enable clock: %d\n", err); > - return err; > - } > - > - usleep_range(1000, 2000); > - > - if (sor->rst) { > - err = reset_control_acquire(sor->rst); > - if (err < 0) { > - dev_err(dev, "failed to acquire reset: %d\n", err); > - clk_disable_unprepare(sor->clk); > - return err; > - } > - > - err = reset_control_deassert(sor->rst); > - if (err < 0) { > - dev_err(dev, "failed to deassert reset: %d\n", err); > - reset_control_release(sor->rst); > - clk_disable_unprepare(sor->clk); > - return err; > - } > - } > - > - return 0; > -} > - > static int tegra_sor_suspend(struct device *dev) > { > struct tegra_sor *sor = dev_get_drvdata(dev); > @@ -3974,8 +3997,9 @@ static int tegra_sor_suspend(struct device *dev) > > if (sor->hdmi_supply) { > err = regulator_disable(sor->hdmi_supply); > - if (err < 0) > + if (err < 0) { > return err; > + } > } > > return 0; > @@ -3996,8 +4020,6 @@ static int tegra_sor_resume(struct device *dev) > } > > static const struct dev_pm_ops tegra_sor_pm_ops = { > - SET_RUNTIME_PM_OPS(tegra_sor_runtime_suspend, tegra_sor_runtime_resume, > - NULL) > SET_SYSTEM_SLEEP_PM_OPS(tegra_sor_suspend, tegra_sor_resume) > }; > > diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c > index ade56b860cf9..678961ada17f 100644 > --- a/drivers/gpu/drm/tegra/vic.c > +++ b/drivers/gpu/drm/tegra/vic.c > @@ -52,48 +52,6 @@ static void vic_writel(struct vic *vic, u32 value, unsigned int offset) > writel(value, vic->regs + offset); > } > > -static int vic_runtime_resume(struct device *dev) > -{ > - struct vic *vic = dev_get_drvdata(dev); > - int err; > - > - err = clk_prepare_enable(vic->clk); > - if (err < 0) > - return err; > - > - usleep_range(10, 20); > - > - err = reset_control_deassert(vic->rst); > - if (err < 0) > - goto disable; > - > - usleep_range(10, 20); > - > - return 0; > - > -disable: > - clk_disable_unprepare(vic->clk); > - return err; > -} > - > -static int vic_runtime_suspend(struct device *dev) > -{ > - struct vic *vic = dev_get_drvdata(dev); > - int err; > - > - err = reset_control_assert(vic->rst); > - if (err < 0) > - return err; > - > - usleep_range(2000, 4000); > - > - clk_disable_unprepare(vic->clk); > - > - vic->booted = false; > - > - return 0; > -} > - > static int vic_boot(struct vic *vic) > { > #ifdef CONFIG_IOMMU_API > @@ -240,9 +198,62 @@ static int vic_exit(struct host1x_client *client) > return 0; > } > > +static int vic_runtime_suspend(struct host1x_client *client) > +{ > + struct tegra_drm_client *drm = host1x_to_drm_client(client); > + struct vic *vic = to_vic(drm); > + int err; > + > + err = reset_control_assert(vic->rst); > + if (err < 0) > + return err; > + > + usleep_range(2000, 4000); > + > + clk_disable_unprepare(vic->clk); > + pm_runtime_put_sync(vic->dev); > + > + vic->booted = false; > + > + return 0; > +} > + > +static int vic_runtime_resume(struct host1x_client *client) > +{ > + struct tegra_drm_client *drm = host1x_to_drm_client(client); > + struct vic *vic = to_vic(drm); > + int err; > + > + err = pm_runtime_get_sync(vic->dev); > + if (err < 0) > + return err; > + > + err = clk_prepare_enable(vic->clk); > + if (err < 0) > + goto put_rpm; > + > + usleep_range(10, 20); > + > + err = reset_control_deassert(vic->rst); > + if (err < 0) > + goto disable; > + > + usleep_range(10, 20); > + > + return 0; > + > +put_rpm: > + pm_runtime_put_sync(vic->dev); > +disable: > + clk_disable_unprepare(vic->clk); > + return err; > +} > + > static const struct host1x_client_ops vic_client_ops = { > .init = vic_init, > .exit = vic_exit, > + .suspend = vic_runtime_suspend, > + .resume = vic_runtime_resume, > }; > > static int vic_load_firmware(struct vic *vic) > @@ -314,38 +325,37 @@ static int vic_open_channel(struct tegra_drm_client *client, > struct vic *vic = to_vic(client); > int err; > > - err = pm_runtime_get_sync(vic->dev); > + err = host1x_client_resume(&client->base); > if (err < 0) > return err; > > err = vic_load_firmware(vic); > if (err < 0) > - goto rpm_put; > + goto suspend; > > err = vic_boot(vic); > if (err < 0) > - goto rpm_put; > + goto suspend; > > context->channel = host1x_channel_get(vic->channel); > if (!context->channel) { > err = -ENOMEM; > - goto rpm_put; > + goto suspend; > } > > return 0; > > -rpm_put: > - pm_runtime_put(vic->dev); > +suspend: > + host1x_client_suspend(&client->base); > return err; > } > > static void vic_close_channel(struct tegra_drm_context *context) > { > - struct vic *vic = to_vic(context->client); > + struct host1x_client *client = &context->client->base; > > host1x_channel_put(context->channel); > - > - pm_runtime_put(vic->dev); > + host1x_client_suspend(client); > } > > static const struct tegra_drm_client_ops vic_ops = { > @@ -472,16 +482,9 @@ static int vic_probe(struct platform_device *pdev) > } > > pm_runtime_enable(&pdev->dev); > - if (!pm_runtime_enabled(&pdev->dev)) { > - err = vic_runtime_resume(&pdev->dev); > - if (err < 0) > - goto unregister_client; > - } > > return 0; > > -unregister_client: > - host1x_client_unregister(&vic->client.base); > exit_falcon: > falcon_exit(&vic->falcon); > > @@ -493,6 +496,8 @@ static int vic_remove(struct platform_device *pdev) > struct vic *vic = platform_get_drvdata(pdev); > int err; > > + pm_runtime_disable(&pdev->dev); > + > err = host1x_client_unregister(&vic->client.base); > if (err < 0) { > dev_err(&pdev->dev, "failed to unregister host1x client: %d\n", > @@ -500,25 +505,15 @@ static int vic_remove(struct platform_device *pdev) > return err; > } > > - if (pm_runtime_enabled(&pdev->dev)) > - pm_runtime_disable(&pdev->dev); > - else > - vic_runtime_suspend(&pdev->dev); > - > falcon_exit(&vic->falcon); > > return 0; > } > > -static const struct dev_pm_ops vic_pm_ops = { > - SET_RUNTIME_PM_OPS(vic_runtime_suspend, vic_runtime_resume, NULL) > -}; > - > struct platform_driver tegra_vic_driver = { > .driver = { > .name = "tegra-vic", > .of_match_table = tegra_vic_of_match, > - .pm = &vic_pm_ops > }, > .probe = vic_probe, > .remove = vic_remove, > diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c > index 50d500345d04..6a995db51d6d 100644 > --- a/drivers/gpu/host1x/bus.c > +++ b/drivers/gpu/host1x/bus.c > @@ -710,6 +710,10 @@ int host1x_client_register(struct host1x_client *client) > struct host1x *host1x; > int err; > > + INIT_LIST_HEAD(&client->list); > + mutex_init(&client->lock); > + client->usecount = 0; > + > mutex_lock(&devices_lock); > > list_for_each_entry(host1x, &devices, list) { > @@ -768,3 +772,74 @@ int host1x_client_unregister(struct host1x_client *client) > return 0; > } > EXPORT_SYMBOL(host1x_client_unregister); > + > +int host1x_client_suspend(struct host1x_client *client) > +{ > + int err = 0; > + > + mutex_lock(&client->lock); > + > + if (client->usecount == 1) { > + if (client->ops && client->ops->suspend) { > + err = client->ops->suspend(client); > + if (err < 0) > + goto unlock; > + } > + } > + > + client->usecount--; > + dev_dbg(client->dev, "use count: %u\n", client->usecount); > + > + if (client->parent) { > + err = host1x_client_suspend(client->parent); > + if (err < 0) > + goto resume; > + } > + > + goto unlock; > + > +resume: > + if (client->usecount == 0) > + if (client->ops && client->ops->resume) > + client->ops->resume(client); > + > + client->usecount++; > +unlock: > + mutex_unlock(&client->lock); > + return err; > +} > +EXPORT_SYMBOL(host1x_client_suspend); > + > +int host1x_client_resume(struct host1x_client *client) > +{ > + int err = 0; > + > + mutex_lock(&client->lock); > + > + if (client->parent) { > + err = host1x_client_resume(client->parent); > + if (err < 0) > + goto unlock; > + } > + > + if (client->usecount == 0) { > + if (client->ops && client->ops->resume) { > + err = client->ops->resume(client); > + if (err < 0) > + goto suspend; > + } > + } > + > + client->usecount++; > + dev_dbg(client->dev, "use count: %u\n", client->usecount); > + > + goto unlock; > + > +suspend: > + if (client->parent) > + host1x_client_suspend(client->parent); > +unlock: > + mutex_unlock(&client->lock); > + return err; > +} > +EXPORT_SYMBOL(host1x_client_resume); > diff --git a/include/linux/host1x.h b/include/linux/host1x.h > index 470a193a9fed..0254ebcdc0a7 100644 > --- a/include/linux/host1x.h > +++ b/include/linux/host1x.h > @@ -24,10 +24,14 @@ struct iommu_group; > * struct host1x_client_ops - host1x client operations > * @init: host1x client initialization code > * @exit: host1x client tear down code > + * @suspend: host1x client suspend code > + * @resume: host1x client resume code > */ > struct host1x_client_ops { > int (*init)(struct host1x_client *client); > int (*exit)(struct host1x_client *client); > + int (*suspend)(struct host1x_client *client); > + int (*resume)(struct host1x_client *client); > }; > > /** > @@ -55,6 +59,10 @@ struct host1x_client { > > struct host1x_syncpt **syncpts; > unsigned int num_syncpts; > + > + struct host1x_client *parent; > + unsigned int usecount; > + struct mutex lock; > }; > > /* > @@ -309,6 +317,9 @@ int host1x_device_exit(struct host1x_device *device); > int host1x_client_register(struct host1x_client *client); > int host1x_client_unregister(struct host1x_client *client); > > +int host1x_client_suspend(struct host1x_client *client); > +int host1x_client_resume(struct host1x_client *client); > + > struct tegra_mipi_device; > > struct tegra_mipi_device *tegra_mipi_request(struct device *device); > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/tegra: Do not implement runtime PM 2019-12-04 8:37 ` Mikko Perttunen @ 2019-12-04 9:36 ` Thierry Reding 0 siblings, 0 replies; 5+ messages in thread From: Thierry Reding @ 2019-12-04 9:36 UTC (permalink / raw) To: Mikko Perttunen; +Cc: linux-tegra, Rafael J. Wysocki, dri-devel, linux-pm [-- Attachment #1: Type: text/plain, Size: 47949 bytes --] On Wed, Dec 04, 2019 at 10:37:04AM +0200, Mikko Perttunen wrote: > Is there any specific reason non-display engines like VIC cannot continue to > use runtime PM? I know being able to do 'echo on > power/control' for VIC > has been quite useful for debugging in the past. Right, I think it should be feasible to let VIC use runtime PM normally. We may need some additional code to suspend it during system sleep, but at runtime we should be able to keep this functionality in place. Thierry > On 3.12.2019 18.27, Thierry Reding wrote: > > From: Thierry Reding <treding@nvidia.com> > > > > The Tegra DRM driver heavily relies on the implementations for runtime > > suspend/resume to be called at specific times. Unfortunately, there are > > some cases where that doesn't work. One example is if the user disables > > runtime PM for a given subdevice. Another example is that the PM core > > acquires a reference to runtime PM during system sleep, effectively > > preventing devices from going into low power modes. This is intentional > > to avoid nasty race conditions, but it also causes system sleep to not > > function properly on all Tegra systems. > > > > Fix this by not implementing runtime PM at all. Instead, a minimal, > > reference-counted suspend/resume infrastructure is added to the host1x > > bus. This has the benefit that it can be used regardless of the system > > power state (or any transitions we might be in), or whether or not the > > user allows runtime PM. > > > > Atomic modesetting guarantees that these functions will end up being > > called at the right point in time, so the pitfalls for the more generic > > runtime PM do not apply here. > > > > Signed-off-by: Thierry Reding <treding@nvidia.com> > > --- > > drivers/gpu/drm/tegra/dc.c | 141 ++++++++++++++---------- > > drivers/gpu/drm/tegra/dpaux.c | 2 +- > > drivers/gpu/drm/tegra/drm.h | 2 + > > drivers/gpu/drm/tegra/dsi.c | 175 ++++++++++++++++-------------- > > drivers/gpu/drm/tegra/hdmi.c | 116 +++++++++++--------- > > drivers/gpu/drm/tegra/hub.c | 194 ++++++++++++++++++++-------------- > > drivers/gpu/drm/tegra/hub.h | 2 +- > > drivers/gpu/drm/tegra/sor.c | 154 +++++++++++++++------------ > > drivers/gpu/drm/tegra/vic.c | 131 +++++++++++------------ > > drivers/gpu/host1x/bus.c | 75 +++++++++++++ > > include/linux/host1x.h | 11 ++ > > 11 files changed, 604 insertions(+), 399 deletions(-) > > > > diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c > > index 2983eb33f2be..871046f3f469 100644 > > --- a/drivers/gpu/drm/tegra/dc.c > > +++ b/drivers/gpu/drm/tegra/dc.c > > @@ -1737,6 +1737,7 @@ static void tegra_crtc_atomic_disable(struct drm_crtc *crtc, > > { > > struct tegra_dc *dc = to_tegra_dc(crtc); > > u32 value; > > + int err; > > if (!tegra_dc_idle(dc)) { > > tegra_dc_stop(dc); > > @@ -1783,7 +1784,9 @@ static void tegra_crtc_atomic_disable(struct drm_crtc *crtc, > > spin_unlock_irq(&crtc->dev->event_lock); > > - pm_runtime_put_sync(dc->dev); > > + err = host1x_client_suspend(&dc->client); > > + if (err < 0) > > + dev_err(dc->dev, "failed to suspend: %d\n", err); > > } > > static void tegra_crtc_atomic_enable(struct drm_crtc *crtc, > > @@ -1793,8 +1796,13 @@ static void tegra_crtc_atomic_enable(struct drm_crtc *crtc, > > struct tegra_dc_state *state = to_dc_state(crtc->state); > > struct tegra_dc *dc = to_tegra_dc(crtc); > > u32 value; > > + int err; > > - pm_runtime_get_sync(dc->dev); > > + err = host1x_client_resume(&dc->client); > > + if (err < 0) { > > + dev_err(dc->dev, "failed to resume: %d\n", err); > > + return; > > + } > > /* initialize display controller */ > > if (dc->syncpt) { > > @@ -2022,6 +2030,15 @@ static int tegra_dc_init(struct host1x_client *client) > > if (!tegra_dc_has_window_groups(dc)) > > return 0; > > + /* > > + * Set the display hub as the host1x client parent for the display > > + * controller. This is needed for the runtime reference counting that > > + * ensures the display hub is always powered when any of the display > > + * controllers are. > > + */ > > + if (dc->soc->has_nvdisplay) > > + client->parent = &tegra->hub->client; > > + > > dc->syncpt = host1x_syncpt_request(client, flags); > > if (!dc->syncpt) > > dev_warn(dc->dev, "failed to allocate syncpoint\n"); > > @@ -2131,9 +2148,74 @@ static int tegra_dc_exit(struct host1x_client *client) > > return 0; > > } > > +static int tegra_dc_runtime_suspend(struct host1x_client *client) > > +{ > > + struct tegra_dc *dc = host1x_client_to_dc(client); > > + struct device *dev = client->dev; > > + int err; > > + > > + err = reset_control_assert(dc->rst); > > + if (err < 0) { > > + dev_err(dev, "failed to assert reset: %d\n", err); > > + return err; > > + } > > + > > + if (dc->soc->has_powergate) > > + tegra_powergate_power_off(dc->powergate); > > + > > + clk_disable_unprepare(dc->clk); > > + pm_runtime_put_sync(dev); > > + > > + return 0; > > +} > > + > > +static int tegra_dc_runtime_resume(struct host1x_client *client) > > +{ > > + struct tegra_dc *dc = host1x_client_to_dc(client); > > + struct device *dev = client->dev; > > + int err; > > + > > + err = pm_runtime_get_sync(dev); > > + if (err < 0) { > > + dev_err(dev, "failed to get runtime PM: %d\n", err); > > + return err; > > + } > > + > > + if (dc->soc->has_powergate) { > > + err = tegra_powergate_sequence_power_up(dc->powergate, dc->clk, > > + dc->rst); > > + if (err < 0) { > > + dev_err(dev, "failed to power partition: %d\n", err); > > + goto put_rpm; > > + } > > + } else { > > + err = clk_prepare_enable(dc->clk); > > + if (err < 0) { > > + dev_err(dev, "failed to enable clock: %d\n", err); > > + goto put_rpm; > > + } > > + > > + err = reset_control_deassert(dc->rst); > > + if (err < 0) { > > + dev_err(dev, "failed to deassert reset: %d\n", err); > > + goto disable_clk; > > + } > > + } > > + > > + return 0; > > + > > +disable_clk: > > + clk_disable_unprepare(dc->clk); > > +put_rpm: > > + pm_runtime_put_sync(dev); > > + return err; > > +} > > + > > static const struct host1x_client_ops dc_client_ops = { > > .init = tegra_dc_init, > > .exit = tegra_dc_exit, > > + .suspend = tegra_dc_runtime_suspend, > > + .resume = tegra_dc_runtime_resume, > > }; > > static const struct tegra_dc_soc_info tegra20_dc_soc_info = { > > @@ -2545,65 +2627,10 @@ static int tegra_dc_remove(struct platform_device *pdev) > > return 0; > > } > > -#ifdef CONFIG_PM > > -static int tegra_dc_suspend(struct device *dev) > > -{ > > - struct tegra_dc *dc = dev_get_drvdata(dev); > > - int err; > > - > > - err = reset_control_assert(dc->rst); > > - if (err < 0) { > > - dev_err(dev, "failed to assert reset: %d\n", err); > > - return err; > > - } > > - > > - if (dc->soc->has_powergate) > > - tegra_powergate_power_off(dc->powergate); > > - > > - clk_disable_unprepare(dc->clk); > > - > > - return 0; > > -} > > - > > -static int tegra_dc_resume(struct device *dev) > > -{ > > - struct tegra_dc *dc = dev_get_drvdata(dev); > > - int err; > > - > > - if (dc->soc->has_powergate) { > > - err = tegra_powergate_sequence_power_up(dc->powergate, dc->clk, > > - dc->rst); > > - if (err < 0) { > > - dev_err(dev, "failed to power partition: %d\n", err); > > - return err; > > - } > > - } else { > > - err = clk_prepare_enable(dc->clk); > > - if (err < 0) { > > - dev_err(dev, "failed to enable clock: %d\n", err); > > - return err; > > - } > > - > > - err = reset_control_deassert(dc->rst); > > - if (err < 0) { > > - dev_err(dev, "failed to deassert reset: %d\n", err); > > - return err; > > - } > > - } > > - > > - return 0; > > -} > > -#endif > > - > > -static const struct dev_pm_ops tegra_dc_pm_ops = { > > - SET_RUNTIME_PM_OPS(tegra_dc_suspend, tegra_dc_resume, NULL) > > -}; > > - > > struct platform_driver tegra_dc_driver = { > > .driver = { > > .name = "tegra-dc", > > .of_match_table = tegra_dc_of_match, > > - .pm = &tegra_dc_pm_ops, > > }, > > .probe = tegra_dc_probe, > > .remove = tegra_dc_remove, > > diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c > > index 622cdf1ad246..7dfb50f65067 100644 > > --- a/drivers/gpu/drm/tegra/dpaux.c > > +++ b/drivers/gpu/drm/tegra/dpaux.c > > @@ -588,7 +588,7 @@ static int tegra_dpaux_remove(struct platform_device *pdev) > > /* make sure pads are powered down when not in use */ > > tegra_dpaux_pad_power_down(dpaux); > > - pm_runtime_put(&pdev->dev); > > + pm_runtime_put_sync(&pdev->dev); > > pm_runtime_disable(&pdev->dev); > > drm_dp_aux_unregister(&dpaux->aux); > > diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h > > index d941553f7a3d..ed99b67deb29 100644 > > --- a/drivers/gpu/drm/tegra/drm.h > > +++ b/drivers/gpu/drm/tegra/drm.h > > @@ -144,6 +144,8 @@ int tegra_output_init(struct drm_device *drm, struct tegra_output *output); > > void tegra_output_exit(struct tegra_output *output); > > void tegra_output_find_possible_crtcs(struct tegra_output *output, > > struct drm_device *drm); > > +int tegra_output_suspend(struct tegra_output *output); > > +int tegra_output_resume(struct tegra_output *output); > > int tegra_output_connector_get_modes(struct drm_connector *connector); > > enum drm_connector_status > > diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c > > index ec475d022fa0..88b9d64c77bf 100644 > > --- a/drivers/gpu/drm/tegra/dsi.c > > +++ b/drivers/gpu/drm/tegra/dsi.c > > @@ -840,7 +840,9 @@ static void tegra_dsi_unprepare(struct tegra_dsi *dsi) > > dev_err(dsi->dev, "failed to disable MIPI calibration: %d\n", > > err); > > - pm_runtime_put(dsi->dev); > > + err = host1x_client_suspend(&dsi->client); > > + if (err < 0) > > + dev_err(dsi->dev, "failed to suspend: %d\n", err); > > } > > static void tegra_dsi_encoder_disable(struct drm_encoder *encoder) > > @@ -882,11 +884,15 @@ static void tegra_dsi_encoder_disable(struct drm_encoder *encoder) > > tegra_dsi_unprepare(dsi); > > } > > -static void tegra_dsi_prepare(struct tegra_dsi *dsi) > > +static int tegra_dsi_prepare(struct tegra_dsi *dsi) > > { > > int err; > > - pm_runtime_get_sync(dsi->dev); > > + err = host1x_client_resume(&dsi->client); > > + if (err < 0) { > > + dev_err(dsi->dev, "failed to resume: %d\n", err); > > + return err; > > + } > > err = tegra_mipi_enable(dsi->mipi); > > if (err < 0) > > @@ -899,6 +905,8 @@ static void tegra_dsi_prepare(struct tegra_dsi *dsi) > > if (dsi->slave) > > tegra_dsi_prepare(dsi->slave); > > + > > + return 0; > > } > > static void tegra_dsi_encoder_enable(struct drm_encoder *encoder) > > @@ -909,8 +917,13 @@ static void tegra_dsi_encoder_enable(struct drm_encoder *encoder) > > struct tegra_dsi *dsi = to_dsi(output); > > struct tegra_dsi_state *state; > > u32 value; > > + int err; > > - tegra_dsi_prepare(dsi); > > + err = tegra_dsi_prepare(dsi); > > + if (err < 0) { > > + dev_err(dsi->dev, "failed to prepare: %d\n", err); > > + return; > > + } > > state = tegra_dsi_get_state(dsi); > > @@ -1075,9 +1088,89 @@ static int tegra_dsi_exit(struct host1x_client *client) > > return 0; > > } > > +static int tegra_dsi_runtime_suspend(struct host1x_client *client) > > +{ > > + struct tegra_dsi *dsi = host1x_client_to_dsi(client); > > + struct device *dev = client->dev; > > + int err; > > + > > + if (dsi->rst) { > > + err = reset_control_assert(dsi->rst); > > + if (err < 0) { > > + dev_err(dev, "failed to assert reset: %d\n", err); > > + return err; > > + } > > + } > > + > > + usleep_range(1000, 2000); > > + > > + clk_disable_unprepare(dsi->clk_lp); > > + clk_disable_unprepare(dsi->clk); > > + > > + regulator_disable(dsi->vdd); > > + pm_runtime_put_sync(dev); > > + > > + return 0; > > +} > > + > > +static int tegra_dsi_runtime_resume(struct host1x_client *client) > > +{ > > + struct tegra_dsi *dsi = host1x_client_to_dsi(client); > > + struct device *dev = client->dev; > > + int err; > > + > > + err = pm_runtime_get_sync(dev); > > + if (err < 0) { > > + dev_err(dev, "failed to get runtime PM: %d\n", err); > > + return err; > > + } > > + > > + err = regulator_enable(dsi->vdd); > > + if (err < 0) { > > + dev_err(dev, "failed to enable VDD supply: %d\n", err); > > + goto put_rpm; > > + } > > + > > + err = clk_prepare_enable(dsi->clk); > > + if (err < 0) { > > + dev_err(dev, "cannot enable DSI clock: %d\n", err); > > + goto disable_vdd; > > + } > > + > > + err = clk_prepare_enable(dsi->clk_lp); > > + if (err < 0) { > > + dev_err(dev, "cannot enable low-power clock: %d\n", err); > > + goto disable_clk; > > + } > > + > > + usleep_range(1000, 2000); > > + > > + if (dsi->rst) { > > + err = reset_control_deassert(dsi->rst); > > + if (err < 0) { > > + dev_err(dev, "cannot assert reset: %d\n", err); > > + goto disable_clk_lp; > > + } > > + } > > + > > + return 0; > > + > > +disable_clk_lp: > > + clk_disable_unprepare(dsi->clk_lp); > > +disable_clk: > > + clk_disable_unprepare(dsi->clk); > > +disable_vdd: > > + regulator_disable(dsi->vdd); > > +put_rpm: > > + pm_runtime_put_sync(dev); > > + return err; > > +} > > + > > static const struct host1x_client_ops dsi_client_ops = { > > .init = tegra_dsi_init, > > .exit = tegra_dsi_exit, > > + .suspend = tegra_dsi_runtime_suspend, > > + .resume = tegra_dsi_runtime_resume, > > }; > > static int tegra_dsi_setup_clocks(struct tegra_dsi *dsi) > > @@ -1596,79 +1689,6 @@ static int tegra_dsi_remove(struct platform_device *pdev) > > return 0; > > } > > -#ifdef CONFIG_PM > > -static int tegra_dsi_suspend(struct device *dev) > > -{ > > - struct tegra_dsi *dsi = dev_get_drvdata(dev); > > - int err; > > - > > - if (dsi->rst) { > > - err = reset_control_assert(dsi->rst); > > - if (err < 0) { > > - dev_err(dev, "failed to assert reset: %d\n", err); > > - return err; > > - } > > - } > > - > > - usleep_range(1000, 2000); > > - > > - clk_disable_unprepare(dsi->clk_lp); > > - clk_disable_unprepare(dsi->clk); > > - > > - regulator_disable(dsi->vdd); > > - > > - return 0; > > -} > > - > > -static int tegra_dsi_resume(struct device *dev) > > -{ > > - struct tegra_dsi *dsi = dev_get_drvdata(dev); > > - int err; > > - > > - err = regulator_enable(dsi->vdd); > > - if (err < 0) { > > - dev_err(dsi->dev, "failed to enable VDD supply: %d\n", err); > > - return err; > > - } > > - > > - err = clk_prepare_enable(dsi->clk); > > - if (err < 0) { > > - dev_err(dev, "cannot enable DSI clock: %d\n", err); > > - goto disable_vdd; > > - } > > - > > - err = clk_prepare_enable(dsi->clk_lp); > > - if (err < 0) { > > - dev_err(dev, "cannot enable low-power clock: %d\n", err); > > - goto disable_clk; > > - } > > - > > - usleep_range(1000, 2000); > > - > > - if (dsi->rst) { > > - err = reset_control_deassert(dsi->rst); > > - if (err < 0) { > > - dev_err(dev, "cannot assert reset: %d\n", err); > > - goto disable_clk_lp; > > - } > > - } > > - > > - return 0; > > - > > -disable_clk_lp: > > - clk_disable_unprepare(dsi->clk_lp); > > -disable_clk: > > - clk_disable_unprepare(dsi->clk); > > -disable_vdd: > > - regulator_disable(dsi->vdd); > > - return err; > > -} > > -#endif > > - > > -static const struct dev_pm_ops tegra_dsi_pm_ops = { > > - SET_RUNTIME_PM_OPS(tegra_dsi_suspend, tegra_dsi_resume, NULL) > > -}; > > - > > static const struct of_device_id tegra_dsi_of_match[] = { > > { .compatible = "nvidia,tegra210-dsi", }, > > { .compatible = "nvidia,tegra132-dsi", }, > > @@ -1682,7 +1702,6 @@ struct platform_driver tegra_dsi_driver = { > > .driver = { > > .name = "tegra-dsi", > > .of_match_table = tegra_dsi_of_match, > > - .pm = &tegra_dsi_pm_ops, > > }, > > .probe = tegra_dsi_probe, > > .remove = tegra_dsi_remove, > > diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c > > index 38bf1d16095f..cb504ec8f284 100644 > > --- a/drivers/gpu/drm/tegra/hdmi.c > > +++ b/drivers/gpu/drm/tegra/hdmi.c > > @@ -1146,6 +1146,7 @@ static void tegra_hdmi_encoder_disable(struct drm_encoder *encoder) > > struct tegra_dc *dc = to_tegra_dc(encoder->crtc); > > struct tegra_hdmi *hdmi = to_hdmi(output); > > u32 value; > > + int err; > > /* > > * The following accesses registers of the display controller, so make > > @@ -1171,7 +1172,9 @@ static void tegra_hdmi_encoder_disable(struct drm_encoder *encoder) > > tegra_hdmi_writel(hdmi, 0, HDMI_NV_PDISP_INT_ENABLE); > > tegra_hdmi_writel(hdmi, 0, HDMI_NV_PDISP_INT_MASK); > > - pm_runtime_put(hdmi->dev); > > + err = host1x_client_suspend(&hdmi->client); > > + if (err < 0) > > + dev_err(hdmi->dev, "failed to suspend: %d\n", err); > > } > > static void tegra_hdmi_encoder_enable(struct drm_encoder *encoder) > > @@ -1186,7 +1189,11 @@ static void tegra_hdmi_encoder_enable(struct drm_encoder *encoder) > > u32 value; > > int err; > > - pm_runtime_get_sync(hdmi->dev); > > + err = host1x_client_resume(&hdmi->client); > > + if (err < 0) { > > + dev_err(hdmi->dev, "failed to resume: %d\n", err); > > + return; > > + } > > /* > > * Enable and unmask the HDA codec SCRATCH0 register interrupt. This > > @@ -1489,9 +1496,66 @@ static int tegra_hdmi_exit(struct host1x_client *client) > > return 0; > > } > > +static int tegra_hdmi_runtime_suspend(struct host1x_client *client) > > +{ > > + struct tegra_hdmi *hdmi = host1x_client_to_hdmi(client); > > + struct device *dev = client->dev; > > + int err; > > + > > + err = reset_control_assert(hdmi->rst); > > + if (err < 0) { > > + dev_err(dev, "failed to assert reset: %d\n", err); > > + return err; > > + } > > + > > + usleep_range(1000, 2000); > > + > > + clk_disable_unprepare(hdmi->clk); > > + pm_runtime_put_sync(dev); > > + > > + return 0; > > +} > > + > > +static int tegra_hdmi_runtime_resume(struct host1x_client *client) > > +{ > > + struct tegra_hdmi *hdmi = host1x_client_to_hdmi(client); > > + struct device *dev = client->dev; > > + int err; > > + > > + err = pm_runtime_get_sync(dev); > > + if (err < 0) { > > + dev_err(dev, "failed to get runtime PM: %d\n", err); > > + return err; > > + } > > + > > + err = clk_prepare_enable(hdmi->clk); > > + if (err < 0) { > > + dev_err(dev, "failed to enable clock: %d\n", err); > > + goto put_rpm; > > + } > > + > > + usleep_range(1000, 2000); > > + > > + err = reset_control_deassert(hdmi->rst); > > + if (err < 0) { > > + dev_err(dev, "failed to deassert reset: %d\n", err); > > + goto disable_clk; > > + } > > + > > + return 0; > > + > > +disable_clk: > > + clk_disable_unprepare(hdmi->clk); > > +put_rpm: > > + pm_runtime_put_sync(dev); > > + return err; > > +} > > + > > static const struct host1x_client_ops hdmi_client_ops = { > > .init = tegra_hdmi_init, > > .exit = tegra_hdmi_exit, > > + .suspend = tegra_hdmi_runtime_suspend, > > + .resume = tegra_hdmi_runtime_resume, > > }; > > static const struct tegra_hdmi_config tegra20_hdmi_config = { > > @@ -1699,58 +1763,10 @@ static int tegra_hdmi_remove(struct platform_device *pdev) > > return 0; > > } > > -#ifdef CONFIG_PM > > -static int tegra_hdmi_suspend(struct device *dev) > > -{ > > - struct tegra_hdmi *hdmi = dev_get_drvdata(dev); > > - int err; > > - > > - err = reset_control_assert(hdmi->rst); > > - if (err < 0) { > > - dev_err(dev, "failed to assert reset: %d\n", err); > > - return err; > > - } > > - > > - usleep_range(1000, 2000); > > - > > - clk_disable_unprepare(hdmi->clk); > > - > > - return 0; > > -} > > - > > -static int tegra_hdmi_resume(struct device *dev) > > -{ > > - struct tegra_hdmi *hdmi = dev_get_drvdata(dev); > > - int err; > > - > > - err = clk_prepare_enable(hdmi->clk); > > - if (err < 0) { > > - dev_err(dev, "failed to enable clock: %d\n", err); > > - return err; > > - } > > - > > - usleep_range(1000, 2000); > > - > > - err = reset_control_deassert(hdmi->rst); > > - if (err < 0) { > > - dev_err(dev, "failed to deassert reset: %d\n", err); > > - clk_disable_unprepare(hdmi->clk); > > - return err; > > - } > > - > > - return 0; > > -} > > -#endif > > - > > -static const struct dev_pm_ops tegra_hdmi_pm_ops = { > > - SET_RUNTIME_PM_OPS(tegra_hdmi_suspend, tegra_hdmi_resume, NULL) > > -}; > > - > > struct platform_driver tegra_hdmi_driver = { > > .driver = { > > .name = "tegra-hdmi", > > .of_match_table = tegra_hdmi_of_match, > > - .pm = &tegra_hdmi_pm_ops, > > }, > > .probe = tegra_hdmi_probe, > > .remove = tegra_hdmi_remove, > > diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c > > index 5c7545ee5a5b..73e6fe9b833d 100644 > > --- a/drivers/gpu/drm/tegra/hub.c > > +++ b/drivers/gpu/drm/tegra/hub.c > > @@ -105,17 +105,25 @@ static inline void tegra_plane_writel(struct tegra_plane *plane, u32 value, > > static int tegra_windowgroup_enable(struct tegra_windowgroup *wgrp) > > { > > + int err = 0; > > + > > mutex_lock(&wgrp->lock); > > if (wgrp->usecount == 0) { > > - pm_runtime_get_sync(wgrp->parent); > > + err = host1x_client_resume(wgrp->parent); > > + if (err < 0) { > > + dev_err(wgrp->parent->dev, "failed to resume: %d\n", err); > > + goto unlock; > > + } > > + > > reset_control_deassert(wgrp->rst); > > } > > wgrp->usecount++; > > - mutex_unlock(&wgrp->lock); > > - return 0; > > +unlock: > > + mutex_unlock(&wgrp->lock); > > + return err; > > } > > static void tegra_windowgroup_disable(struct tegra_windowgroup *wgrp) > > @@ -131,7 +139,7 @@ static void tegra_windowgroup_disable(struct tegra_windowgroup *wgrp) > > wgrp->index); > > } > > - pm_runtime_put(wgrp->parent); > > + host1x_client_suspend(wgrp->parent); > > } > > wgrp->usecount--; > > @@ -389,6 +397,7 @@ static void tegra_shared_plane_atomic_disable(struct drm_plane *plane, > > struct tegra_plane *p = to_tegra_plane(plane); > > struct tegra_dc *dc; > > u32 value; > > + int err; > > /* rien ne va plus */ > > if (!old_state || !old_state->crtc) > > @@ -396,6 +405,12 @@ static void tegra_shared_plane_atomic_disable(struct drm_plane *plane, > > dc = to_tegra_dc(old_state->crtc); > > + err = host1x_client_resume(&dc->client); > > + if (err < 0) { > > + dev_err(dc->dev, "failed to resume: %d\n", err); > > + return; > > + } > > + > > /* > > * XXX Legacy helpers seem to sometimes call ->atomic_disable() even > > * on planes that are already disabled. Make sure we fallback to the > > @@ -404,15 +419,13 @@ static void tegra_shared_plane_atomic_disable(struct drm_plane *plane, > > if (WARN_ON(p->dc == NULL)) > > p->dc = dc; > > - pm_runtime_get_sync(dc->dev); > > - > > value = tegra_plane_readl(p, DC_WIN_WIN_OPTIONS); > > value &= ~WIN_ENABLE; > > tegra_plane_writel(p, value, DC_WIN_WIN_OPTIONS); > > tegra_dc_remove_shared_plane(dc, p); > > - pm_runtime_put(dc->dev); > > + host1x_client_suspend(&dc->client); > > } > > static void tegra_shared_plane_atomic_update(struct drm_plane *plane, > > @@ -425,6 +438,7 @@ static void tegra_shared_plane_atomic_update(struct drm_plane *plane, > > struct tegra_plane *p = to_tegra_plane(plane); > > dma_addr_t base; > > u32 value; > > + int err; > > /* rien ne va plus */ > > if (!plane->state->crtc || !plane->state->fb) > > @@ -435,7 +449,11 @@ static void tegra_shared_plane_atomic_update(struct drm_plane *plane, > > return; > > } > > - pm_runtime_get_sync(dc->dev); > > + err = host1x_client_resume(&dc->client); > > + if (err < 0) { > > + dev_err(dc->dev, "failed to resume: %d\n", err); > > + return; > > + } > > tegra_dc_assign_shared_plane(dc, p); > > @@ -525,7 +543,7 @@ static void tegra_shared_plane_atomic_update(struct drm_plane *plane, > > value &= ~CONTROL_CSC_ENABLE; > > tegra_plane_writel(p, value, DC_WIN_WINDOW_SET_CONTROL); > > - pm_runtime_put(dc->dev); > > + host1x_client_suspend(&dc->client); > > } > > static const struct drm_plane_helper_funcs tegra_shared_plane_helper_funcs = { > > @@ -561,7 +579,7 @@ struct drm_plane *tegra_shared_plane_create(struct drm_device *drm, > > plane->base.index = index; > > plane->wgrp = &hub->wgrps[wgrp]; > > - plane->wgrp->parent = dc->dev; > > + plane->wgrp->parent = &dc->client; > > p = &plane->base.base; > > @@ -666,8 +684,13 @@ int tegra_display_hub_atomic_check(struct drm_device *drm, > > static void tegra_display_hub_update(struct tegra_dc *dc) > > { > > u32 value; > > + int err; > > - pm_runtime_get_sync(dc->dev); > > + err = host1x_client_resume(&dc->client); > > + if (err < 0) { > > + dev_err(dc->dev, "failed to resume: %d\n", err); > > + return; > > + } > > value = tegra_dc_readl(dc, DC_CMD_IHUB_COMMON_MISC_CTL); > > value &= ~LATENCY_EVENT; > > @@ -682,7 +705,7 @@ static void tegra_display_hub_update(struct tegra_dc *dc) > > tegra_dc_writel(dc, COMMON_ACTREQ, DC_CMD_STATE_CONTROL); > > tegra_dc_readl(dc, DC_CMD_STATE_CONTROL); > > - pm_runtime_put(dc->dev); > > + host1x_client_suspend(&dc->client); > > } > > void tegra_display_hub_atomic_commit(struct drm_device *drm, > > @@ -742,9 +765,85 @@ static int tegra_display_hub_exit(struct host1x_client *client) > > return 0; > > } > > +static int tegra_display_hub_runtime_suspend(struct host1x_client *client) > > +{ > > + struct tegra_display_hub *hub = to_tegra_display_hub(client); > > + struct device *dev = client->dev; > > + unsigned int i = hub->num_heads; > > + int err; > > + > > + err = reset_control_assert(hub->rst); > > + if (err < 0) > > + return err; > > + > > + while (i--) > > + clk_disable_unprepare(hub->clk_heads[i]); > > + > > + clk_disable_unprepare(hub->clk_hub); > > + clk_disable_unprepare(hub->clk_dsc); > > + clk_disable_unprepare(hub->clk_disp); > > + > > + pm_runtime_put_sync(dev); > > + > > + return 0; > > +} > > + > > +static int tegra_display_hub_runtime_resume(struct host1x_client *client) > > +{ > > + struct tegra_display_hub *hub = to_tegra_display_hub(client); > > + struct device *dev = client->dev; > > + unsigned int i; > > + int err; > > + > > + err = pm_runtime_get_sync(dev); > > + if (err < 0) { > > + dev_err(dev, "failed to get runtime PM: %d\n", err); > > + return err; > > + } > > + > > + err = clk_prepare_enable(hub->clk_disp); > > + if (err < 0) > > + goto put_rpm; > > + > > + err = clk_prepare_enable(hub->clk_dsc); > > + if (err < 0) > > + goto disable_disp; > > + > > + err = clk_prepare_enable(hub->clk_hub); > > + if (err < 0) > > + goto disable_dsc; > > + > > + for (i = 0; i < hub->num_heads; i++) { > > + err = clk_prepare_enable(hub->clk_heads[i]); > > + if (err < 0) > > + goto disable_heads; > > + } > > + > > + err = reset_control_deassert(hub->rst); > > + if (err < 0) > > + goto disable_heads; > > + > > + return 0; > > + > > +disable_heads: > > + while (i--) > > + clk_disable_unprepare(hub->clk_heads[i]); > > + > > + clk_disable_unprepare(hub->clk_hub); > > +disable_dsc: > > + clk_disable_unprepare(hub->clk_dsc); > > +disable_disp: > > + clk_disable_unprepare(hub->clk_disp); > > +put_rpm: > > + pm_runtime_put_sync(dev); > > + return err; > > +} > > + > > static const struct host1x_client_ops tegra_display_hub_ops = { > > .init = tegra_display_hub_init, > > .exit = tegra_display_hub_exit, > > + .suspend = tegra_display_hub_runtime_suspend, > > + .resume = tegra_display_hub_runtime_resume, > > }; > > static int tegra_display_hub_probe(struct platform_device *pdev) > > @@ -861,6 +960,7 @@ static int tegra_display_hub_probe(struct platform_device *pdev) > > static int tegra_display_hub_remove(struct platform_device *pdev) > > { > > struct tegra_display_hub *hub = platform_get_drvdata(pdev); > > + unsigned int i; > > int err; > > err = host1x_client_unregister(&hub->client); > > @@ -869,78 +969,17 @@ static int tegra_display_hub_remove(struct platform_device *pdev) > > err); > > } > > - pm_runtime_disable(&pdev->dev); > > - > > - return err; > > -} > > - > > -static int __maybe_unused tegra_display_hub_suspend(struct device *dev) > > -{ > > - struct tegra_display_hub *hub = dev_get_drvdata(dev); > > - unsigned int i = hub->num_heads; > > - int err; > > - > > - err = reset_control_assert(hub->rst); > > - if (err < 0) > > - return err; > > - > > - while (i--) > > - clk_disable_unprepare(hub->clk_heads[i]); > > - > > - clk_disable_unprepare(hub->clk_hub); > > - clk_disable_unprepare(hub->clk_dsc); > > - clk_disable_unprepare(hub->clk_disp); > > - > > - return 0; > > -} > > - > > -static int __maybe_unused tegra_display_hub_resume(struct device *dev) > > -{ > > - struct tegra_display_hub *hub = dev_get_drvdata(dev); > > - unsigned int i; > > - int err; > > - > > - err = clk_prepare_enable(hub->clk_disp); > > - if (err < 0) > > - return err; > > - > > - err = clk_prepare_enable(hub->clk_dsc); > > - if (err < 0) > > - goto disable_disp; > > - > > - err = clk_prepare_enable(hub->clk_hub); > > - if (err < 0) > > - goto disable_dsc; > > + for (i = 0; i < hub->soc->num_wgrps; i++) { > > + struct tegra_windowgroup *wgrp = &hub->wgrps[i]; > > - for (i = 0; i < hub->num_heads; i++) { > > - err = clk_prepare_enable(hub->clk_heads[i]); > > - if (err < 0) > > - goto disable_heads; > > + mutex_destroy(&wgrp->lock); > > } > > - err = reset_control_deassert(hub->rst); > > - if (err < 0) > > - goto disable_heads; > > - > > - return 0; > > - > > -disable_heads: > > - while (i--) > > - clk_disable_unprepare(hub->clk_heads[i]); > > + pm_runtime_disable(&pdev->dev); > > - clk_disable_unprepare(hub->clk_hub); > > -disable_dsc: > > - clk_disable_unprepare(hub->clk_dsc); > > -disable_disp: > > - clk_disable_unprepare(hub->clk_disp); > > return err; > > } > > -static const struct dev_pm_ops tegra_display_hub_pm_ops = { > > - SET_RUNTIME_PM_OPS(tegra_display_hub_suspend, > > - tegra_display_hub_resume, NULL) > > -}; > > - > > static const struct tegra_display_hub_soc tegra186_display_hub = { > > .num_wgrps = 6, > > .supports_dsc = true, > > @@ -968,7 +1007,6 @@ struct platform_driver tegra_display_hub_driver = { > > .driver = { > > .name = "tegra-display-hub", > > .of_match_table = tegra_display_hub_of_match, > > - .pm = &tegra_display_hub_pm_ops, > > }, > > .probe = tegra_display_hub_probe, > > .remove = tegra_display_hub_remove, > > diff --git a/drivers/gpu/drm/tegra/hub.h b/drivers/gpu/drm/tegra/hub.h > > index 767a60d9313c..3efa1be07ff8 100644 > > --- a/drivers/gpu/drm/tegra/hub.h > > +++ b/drivers/gpu/drm/tegra/hub.h > > @@ -17,7 +17,7 @@ struct tegra_windowgroup { > > struct mutex lock; > > unsigned int index; > > - struct device *parent; > > + struct host1x_client *parent; > > struct reset_control *rst; > > }; > > diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c > > index 956bf5d680ad..200d99e17afe 100644 > > --- a/drivers/gpu/drm/tegra/sor.c > > +++ b/drivers/gpu/drm/tegra/sor.c > > @@ -2255,7 +2255,7 @@ static void tegra_sor_hdmi_disable(struct drm_encoder *encoder) > > if (err < 0) > > dev_err(sor->dev, "failed to power off I/O pad: %d\n", err); > > - pm_runtime_put(sor->dev); > > + host1x_client_suspend(&sor->client); > > } > > static void tegra_sor_hdmi_enable(struct drm_encoder *encoder) > > @@ -2276,7 +2276,11 @@ static void tegra_sor_hdmi_enable(struct drm_encoder *encoder) > > mode = &encoder->crtc->state->adjusted_mode; > > pclk = mode->clock * 1000; > > - pm_runtime_get_sync(sor->dev); > > + err = host1x_client_resume(&sor->client); > > + if (err < 0) { > > + dev_err(sor->dev, "failed to resume: %d\n", err); > > + return; > > + } > > /* switch to safe parent clock */ > > err = tegra_sor_set_parent_clock(sor, sor->clk_safe); > > @@ -2722,7 +2726,7 @@ static void tegra_sor_dp_disable(struct drm_encoder *encoder) > > if (output->panel) > > drm_panel_unprepare(output->panel); > > - pm_runtime_put(sor->dev); > > + host1x_client_suspend(&sor->client); > > } > > static void tegra_sor_dp_enable(struct drm_encoder *encoder) > > @@ -2742,7 +2746,11 @@ static void tegra_sor_dp_enable(struct drm_encoder *encoder) > > mode = &encoder->crtc->state->adjusted_mode; > > info = &output->connector.display_info; > > - pm_runtime_get_sync(sor->dev); > > + err = host1x_client_resume(&sor->client); > > + if (err < 0) { > > + dev_err(sor->dev, "failed to resume: %d\n", err); > > + return; > > + } > > /* switch to safe parent clock */ > > err = tegra_sor_set_parent_clock(sor, sor->clk_safe); > > @@ -3189,9 +3197,80 @@ static int tegra_sor_exit(struct host1x_client *client) > > return 0; > > } > > +static int tegra_sor_runtime_suspend(struct host1x_client *client) > > +{ > > + struct tegra_sor *sor = host1x_client_to_sor(client); > > + struct device *dev = client->dev; > > + int err; > > + > > + if (sor->rst) { > > + err = reset_control_assert(sor->rst); > > + if (err < 0) { > > + dev_err(dev, "failed to assert reset: %d\n", err); > > + return err; > > + } > > + > > + reset_control_release(sor->rst); > > + } > > + > > + usleep_range(1000, 2000); > > + > > + clk_disable_unprepare(sor->clk); > > + pm_runtime_put_sync(dev); > > + > > + return 0; > > +} > > + > > +static int tegra_sor_runtime_resume(struct host1x_client *client) > > +{ > > + struct tegra_sor *sor = host1x_client_to_sor(client); > > + struct device *dev = client->dev; > > + int err; > > + > > + err = pm_runtime_get_sync(dev); > > + if (err < 0) { > > + dev_err(dev, "failed to get runtime PM: %d\n", err); > > + return err; > > + } > > + > > + err = clk_prepare_enable(sor->clk); > > + if (err < 0) { > > + dev_err(dev, "failed to enable clock: %d\n", err); > > + goto put_rpm; > > + } > > + > > + usleep_range(1000, 2000); > > + > > + if (sor->rst) { > > + err = reset_control_acquire(sor->rst); > > + if (err < 0) { > > + dev_err(dev, "failed to acquire reset: %d\n", err); > > + goto disable_clk; > > + } > > + > > + err = reset_control_deassert(sor->rst); > > + if (err < 0) { > > + dev_err(dev, "failed to deassert reset: %d\n", err); > > + goto release_reset; > > + } > > + } > > + > > + return 0; > > + > > +release_reset: > > + reset_control_release(sor->rst); > > +disable_clk: > > + clk_disable_unprepare(sor->clk); > > +put_rpm: > > + pm_runtime_put_sync(dev); > > + return err; > > +} > > + > > static const struct host1x_client_ops sor_client_ops = { > > .init = tegra_sor_init, > > .exit = tegra_sor_exit, > > + .suspend = tegra_sor_runtime_suspend, > > + .resume = tegra_sor_runtime_resume, > > }; > > static const u8 tegra124_sor_xbar_cfg[5] = { > > @@ -3842,10 +3921,9 @@ static int tegra_sor_probe(struct platform_device *pdev) > > if (!sor->clk_pad) { > > char *name; > > - err = pm_runtime_get_sync(&pdev->dev); > > + err = host1x_client_resume(&sor->client); > > if (err < 0) { > > - dev_err(&pdev->dev, "failed to get runtime PM: %d\n", > > - err); > > + dev_err(sor->dev, "failed to resume: %d\n", err); > > goto remove; > > } > > @@ -3856,7 +3934,7 @@ static int tegra_sor_probe(struct platform_device *pdev) > > } > > sor->clk_pad = tegra_clk_sor_pad_register(sor, name); > > - pm_runtime_put(&pdev->dev); > > + host1x_client_suspend(&sor->client); > > } > > if (IS_ERR(sor->clk_pad)) { > > @@ -3912,61 +3990,6 @@ static int tegra_sor_remove(struct platform_device *pdev) > > return 0; > > } > > -static int tegra_sor_runtime_suspend(struct device *dev) > > -{ > > - struct tegra_sor *sor = dev_get_drvdata(dev); > > - int err; > > - > > - if (sor->rst) { > > - err = reset_control_assert(sor->rst); > > - if (err < 0) { > > - dev_err(dev, "failed to assert reset: %d\n", err); > > - return err; > > - } > > - > > - reset_control_release(sor->rst); > > - } > > - > > - usleep_range(1000, 2000); > > - > > - clk_disable_unprepare(sor->clk); > > - > > - return 0; > > -} > > - > > -static int tegra_sor_runtime_resume(struct device *dev) > > -{ > > - struct tegra_sor *sor = dev_get_drvdata(dev); > > - int err; > > - > > - err = clk_prepare_enable(sor->clk); > > - if (err < 0) { > > - dev_err(dev, "failed to enable clock: %d\n", err); > > - return err; > > - } > > - > > - usleep_range(1000, 2000); > > - > > - if (sor->rst) { > > - err = reset_control_acquire(sor->rst); > > - if (err < 0) { > > - dev_err(dev, "failed to acquire reset: %d\n", err); > > - clk_disable_unprepare(sor->clk); > > - return err; > > - } > > - > > - err = reset_control_deassert(sor->rst); > > - if (err < 0) { > > - dev_err(dev, "failed to deassert reset: %d\n", err); > > - reset_control_release(sor->rst); > > - clk_disable_unprepare(sor->clk); > > - return err; > > - } > > - } > > - > > - return 0; > > -} > > - > > static int tegra_sor_suspend(struct device *dev) > > { > > struct tegra_sor *sor = dev_get_drvdata(dev); > > @@ -3974,8 +3997,9 @@ static int tegra_sor_suspend(struct device *dev) > > if (sor->hdmi_supply) { > > err = regulator_disable(sor->hdmi_supply); > > - if (err < 0) > > + if (err < 0) { > > return err; > > + } > > } > > return 0; > > @@ -3996,8 +4020,6 @@ static int tegra_sor_resume(struct device *dev) > > } > > static const struct dev_pm_ops tegra_sor_pm_ops = { > > - SET_RUNTIME_PM_OPS(tegra_sor_runtime_suspend, tegra_sor_runtime_resume, > > - NULL) > > SET_SYSTEM_SLEEP_PM_OPS(tegra_sor_suspend, tegra_sor_resume) > > }; > > diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c > > index ade56b860cf9..678961ada17f 100644 > > --- a/drivers/gpu/drm/tegra/vic.c > > +++ b/drivers/gpu/drm/tegra/vic.c > > @@ -52,48 +52,6 @@ static void vic_writel(struct vic *vic, u32 value, unsigned int offset) > > writel(value, vic->regs + offset); > > } > > -static int vic_runtime_resume(struct device *dev) > > -{ > > - struct vic *vic = dev_get_drvdata(dev); > > - int err; > > - > > - err = clk_prepare_enable(vic->clk); > > - if (err < 0) > > - return err; > > - > > - usleep_range(10, 20); > > - > > - err = reset_control_deassert(vic->rst); > > - if (err < 0) > > - goto disable; > > - > > - usleep_range(10, 20); > > - > > - return 0; > > - > > -disable: > > - clk_disable_unprepare(vic->clk); > > - return err; > > -} > > - > > -static int vic_runtime_suspend(struct device *dev) > > -{ > > - struct vic *vic = dev_get_drvdata(dev); > > - int err; > > - > > - err = reset_control_assert(vic->rst); > > - if (err < 0) > > - return err; > > - > > - usleep_range(2000, 4000); > > - > > - clk_disable_unprepare(vic->clk); > > - > > - vic->booted = false; > > - > > - return 0; > > -} > > - > > static int vic_boot(struct vic *vic) > > { > > #ifdef CONFIG_IOMMU_API > > @@ -240,9 +198,62 @@ static int vic_exit(struct host1x_client *client) > > return 0; > > } > > +static int vic_runtime_suspend(struct host1x_client *client) > > +{ > > + struct tegra_drm_client *drm = host1x_to_drm_client(client); > > + struct vic *vic = to_vic(drm); > > + int err; > > + > > + err = reset_control_assert(vic->rst); > > + if (err < 0) > > + return err; > > + > > + usleep_range(2000, 4000); > > + > > + clk_disable_unprepare(vic->clk); > > + pm_runtime_put_sync(vic->dev); > > + > > + vic->booted = false; > > + > > + return 0; > > +} > > + > > +static int vic_runtime_resume(struct host1x_client *client) > > +{ > > + struct tegra_drm_client *drm = host1x_to_drm_client(client); > > + struct vic *vic = to_vic(drm); > > + int err; > > + > > + err = pm_runtime_get_sync(vic->dev); > > + if (err < 0) > > + return err; > > + > > + err = clk_prepare_enable(vic->clk); > > + if (err < 0) > > + goto put_rpm; > > + > > + usleep_range(10, 20); > > + > > + err = reset_control_deassert(vic->rst); > > + if (err < 0) > > + goto disable; > > + > > + usleep_range(10, 20); > > + > > + return 0; > > + > > +put_rpm: > > + pm_runtime_put_sync(vic->dev); > > +disable: > > + clk_disable_unprepare(vic->clk); > > + return err; > > +} > > + > > static const struct host1x_client_ops vic_client_ops = { > > .init = vic_init, > > .exit = vic_exit, > > + .suspend = vic_runtime_suspend, > > + .resume = vic_runtime_resume, > > }; > > static int vic_load_firmware(struct vic *vic) > > @@ -314,38 +325,37 @@ static int vic_open_channel(struct tegra_drm_client *client, > > struct vic *vic = to_vic(client); > > int err; > > - err = pm_runtime_get_sync(vic->dev); > > + err = host1x_client_resume(&client->base); > > if (err < 0) > > return err; > > err = vic_load_firmware(vic); > > if (err < 0) > > - goto rpm_put; > > + goto suspend; > > err = vic_boot(vic); > > if (err < 0) > > - goto rpm_put; > > + goto suspend; > > context->channel = host1x_channel_get(vic->channel); > > if (!context->channel) { > > err = -ENOMEM; > > - goto rpm_put; > > + goto suspend; > > } > > return 0; > > -rpm_put: > > - pm_runtime_put(vic->dev); > > +suspend: > > + host1x_client_suspend(&client->base); > > return err; > > } > > static void vic_close_channel(struct tegra_drm_context *context) > > { > > - struct vic *vic = to_vic(context->client); > > + struct host1x_client *client = &context->client->base; > > host1x_channel_put(context->channel); > > - > > - pm_runtime_put(vic->dev); > > + host1x_client_suspend(client); > > } > > static const struct tegra_drm_client_ops vic_ops = { > > @@ -472,16 +482,9 @@ static int vic_probe(struct platform_device *pdev) > > } > > pm_runtime_enable(&pdev->dev); > > - if (!pm_runtime_enabled(&pdev->dev)) { > > - err = vic_runtime_resume(&pdev->dev); > > - if (err < 0) > > - goto unregister_client; > > - } > > return 0; > > -unregister_client: > > - host1x_client_unregister(&vic->client.base); > > exit_falcon: > > falcon_exit(&vic->falcon); > > @@ -493,6 +496,8 @@ static int vic_remove(struct platform_device *pdev) > > struct vic *vic = platform_get_drvdata(pdev); > > int err; > > + pm_runtime_disable(&pdev->dev); > > + > > err = host1x_client_unregister(&vic->client.base); > > if (err < 0) { > > dev_err(&pdev->dev, "failed to unregister host1x client: %d\n", > > @@ -500,25 +505,15 @@ static int vic_remove(struct platform_device *pdev) > > return err; > > } > > - if (pm_runtime_enabled(&pdev->dev)) > > - pm_runtime_disable(&pdev->dev); > > - else > > - vic_runtime_suspend(&pdev->dev); > > - > > falcon_exit(&vic->falcon); > > return 0; > > } > > -static const struct dev_pm_ops vic_pm_ops = { > > - SET_RUNTIME_PM_OPS(vic_runtime_suspend, vic_runtime_resume, NULL) > > -}; > > - > > struct platform_driver tegra_vic_driver = { > > .driver = { > > .name = "tegra-vic", > > .of_match_table = tegra_vic_of_match, > > - .pm = &vic_pm_ops > > }, > > .probe = vic_probe, > > .remove = vic_remove, > > diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c > > index 50d500345d04..6a995db51d6d 100644 > > --- a/drivers/gpu/host1x/bus.c > > +++ b/drivers/gpu/host1x/bus.c > > @@ -710,6 +710,10 @@ int host1x_client_register(struct host1x_client *client) > > struct host1x *host1x; > > int err; > > + INIT_LIST_HEAD(&client->list); > > + mutex_init(&client->lock); > > + client->usecount = 0; > > + > > mutex_lock(&devices_lock); > > list_for_each_entry(host1x, &devices, list) { > > @@ -768,3 +772,74 @@ int host1x_client_unregister(struct host1x_client *client) > > return 0; > > } > > EXPORT_SYMBOL(host1x_client_unregister); > > + > > +int host1x_client_suspend(struct host1x_client *client) > > +{ > > + int err = 0; > > + > > + mutex_lock(&client->lock); > > + > > + if (client->usecount == 1) { > > + if (client->ops && client->ops->suspend) { > > + err = client->ops->suspend(client); > > + if (err < 0) > > + goto unlock; > > + } > > + } > > + > > + client->usecount--; > > + dev_dbg(client->dev, "use count: %u\n", client->usecount); > > + > > + if (client->parent) { > > + err = host1x_client_suspend(client->parent); > > + if (err < 0) > > + goto resume; > > + } > > + > > + goto unlock; > > + > > +resume: > > + if (client->usecount == 0) > > + if (client->ops && client->ops->resume) > > + client->ops->resume(client); > > + > > + client->usecount++; > > +unlock: > > + mutex_unlock(&client->lock); > > + return err; > > +} > > +EXPORT_SYMBOL(host1x_client_suspend); > > + > > +int host1x_client_resume(struct host1x_client *client) > > +{ > > + int err = 0; > > + > > + mutex_lock(&client->lock); > > + > > + if (client->parent) { > > + err = host1x_client_resume(client->parent); > > + if (err < 0) > > + goto unlock; > > + } > > + > > + if (client->usecount == 0) { > > + if (client->ops && client->ops->resume) { > > + err = client->ops->resume(client); > > + if (err < 0) > > + goto suspend; > > + } > > + } > > + > > + client->usecount++; > > + dev_dbg(client->dev, "use count: %u\n", client->usecount); > > + > > + goto unlock; > > + > > +suspend: > > + if (client->parent) > > + host1x_client_suspend(client->parent); > > +unlock: > > + mutex_unlock(&client->lock); > > + return err; > > +} > > +EXPORT_SYMBOL(host1x_client_resume); > > diff --git a/include/linux/host1x.h b/include/linux/host1x.h > > index 470a193a9fed..0254ebcdc0a7 100644 > > --- a/include/linux/host1x.h > > +++ b/include/linux/host1x.h > > @@ -24,10 +24,14 @@ struct iommu_group; > > * struct host1x_client_ops - host1x client operations > > * @init: host1x client initialization code > > * @exit: host1x client tear down code > > + * @suspend: host1x client suspend code > > + * @resume: host1x client resume code > > */ > > struct host1x_client_ops { > > int (*init)(struct host1x_client *client); > > int (*exit)(struct host1x_client *client); > > + int (*suspend)(struct host1x_client *client); > > + int (*resume)(struct host1x_client *client); > > }; > > /** > > @@ -55,6 +59,10 @@ struct host1x_client { > > struct host1x_syncpt **syncpts; > > unsigned int num_syncpts; > > + > > + struct host1x_client *parent; > > + unsigned int usecount; > > + struct mutex lock; > > }; > > /* > > @@ -309,6 +317,9 @@ int host1x_device_exit(struct host1x_device *device); > > int host1x_client_register(struct host1x_client *client); > > int host1x_client_unregister(struct host1x_client *client); > > +int host1x_client_suspend(struct host1x_client *client); > > +int host1x_client_resume(struct host1x_client *client); > > + > > struct tegra_mipi_device; > > struct tegra_mipi_device *tegra_mipi_request(struct device *device); > > [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/tegra: Do not implement runtime PM 2019-12-03 16:27 ` [PATCH 2/2] drm/tegra: Do not implement runtime PM Thierry Reding 2019-12-04 8:37 ` Mikko Perttunen @ 2019-12-04 15:22 ` Dmitry Osipenko 1 sibling, 0 replies; 5+ messages in thread From: Dmitry Osipenko @ 2019-12-04 15:22 UTC (permalink / raw) To: Thierry Reding; +Cc: linux-tegra, Rafael J. Wysocki, dri-devel, linux-pm 03.12.2019 19:27, Thierry Reding пишет: > From: Thierry Reding <treding@nvidia.com> > > The Tegra DRM driver heavily relies on the implementations for runtime > suspend/resume to be called at specific times. Unfortunately, there are > some cases where that doesn't work. One example is if the user disables > runtime PM for a given subdevice. Another example is that the PM core > acquires a reference to runtime PM during system sleep, effectively > preventing devices from going into low power modes. This is intentional > to avoid nasty race conditions, but it also causes system sleep to not > function properly on all Tegra systems. > > Fix this by not implementing runtime PM at all. Instead, a minimal, > reference-counted suspend/resume infrastructure is added to the host1x > bus. This has the benefit that it can be used regardless of the system > power state (or any transitions we might be in), or whether or not the > user allows runtime PM. > > Atomic modesetting guarantees that these functions will end up being > called at the right point in time, so the pitfalls for the more generic > runtime PM do not apply here. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- Couldn't we just use pm_runtime_force_suspend/resume whenever it is necessary to enforce the suspend/resume? I briefly looked through the previous discussion and don't see why the forced suspend/resume isn't suitable. Please excuse me if I'm missing the point. Why planes/outputs need to care about resuming DC controller at all? Doesn't DRM core take care of enabling DC for us by enabling CRTC before planes/outputs are enabled? ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-12-04 15:22 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-12-03 16:27 [PATCH 1/2] gpu: host1x: Rename "parent" to "host" Thierry Reding 2019-12-03 16:27 ` [PATCH 2/2] drm/tegra: Do not implement runtime PM Thierry Reding 2019-12-04 8:37 ` Mikko Perttunen 2019-12-04 9:36 ` Thierry Reding 2019-12-04 15:22 ` Dmitry Osipenko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).