diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-07-11 07:46:55 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-07-11 07:46:55 -0300 |
| commit | 27d3c1285087ff6741551be8272c438ec8d56b80 (patch) | |
| tree | 6501a7745fa0094875c895bf45dba9900058bd9b | |
| parent | 1b86fc15ba6d04e393d6e65753f2013963d407f3 (diff) | |
Revert "drm/bridge: Add missing pm_runtime_put_sync"
This reverts commit ff13c90d7f7ab606b37be6d15140d19013d6736c.
| -rw-r--r-- | drivers/gpu/drm/bridge/nwl-dsi.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/gpu/drm/bridge/nwl-dsi.c b/drivers/gpu/drm/bridge/nwl-dsi.c index 691039aba87f..6e484d836cfe 100644 --- a/drivers/gpu/drm/bridge/nwl-dsi.c +++ b/drivers/gpu/drm/bridge/nwl-dsi.c @@ -861,19 +861,18 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge, memcpy(&dsi->mode, adjusted_mode, sizeof(dsi->mode)); drm_mode_debug_printmodeline(adjusted_mode); - if (pm_runtime_resume_and_get(dev) < 0) - return; + pm_runtime_get_sync(dev); if (clk_prepare_enable(dsi->lcdif_clk) < 0) - goto runtime_put; + return; if (clk_prepare_enable(dsi->core_clk) < 0) - goto runtime_put; + return; /* Step 1 from DSI reset-out instructions */ ret = reset_control_deassert(dsi->rst_pclk); if (ret < 0) { DRM_DEV_ERROR(dev, "Failed to deassert PCLK: %d\n", ret); - goto runtime_put; + return; } /* Step 2 from DSI reset-out instructions */ @@ -883,18 +882,13 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge, ret = reset_control_deassert(dsi->rst_esc); if (ret < 0) { DRM_DEV_ERROR(dev, "Failed to deassert ESC: %d\n", ret); - goto runtime_put; + return; } ret = reset_control_deassert(dsi->rst_byte); if (ret < 0) { DRM_DEV_ERROR(dev, "Failed to deassert BYTE: %d\n", ret); - goto runtime_put; + return; } - - return; - -runtime_put: - pm_runtime_put_sync(dev); } static void |