Skip to content

Commit f3d5d7c

Browse files
committed
drm/msm: Don't use autosuspend for display
No functional change, as we only actually enable autosuspend for the GPU device. But lets not encourage thinking that autosuspend is a good idea for anything display related. Signed-off-by: Rob Clark <[email protected]> Reviewed-by: Stephen Boyd <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]> Signed-off-by: Rob Clark <[email protected]>
1 parent c176055 commit f3d5d7c

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

drivers/gpu/drm/msm/dsi/dsi_host.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2020,7 +2020,7 @@ void msm_dsi_host_xfer_restore(struct mipi_dsi_host *host,
20202020
/* TODO: unvote for bus bandwidth */
20212021

20222022
cfg_hnd->ops->link_clk_disable(msm_host);
2023-
pm_runtime_put_autosuspend(&msm_host->pdev->dev);
2023+
pm_runtime_put(&msm_host->pdev->dev);
20242024
}
20252025

20262026
int msm_dsi_host_cmd_tx(struct mipi_dsi_host *host,
@@ -2252,7 +2252,7 @@ int msm_dsi_host_enable(struct mipi_dsi_host *host)
22522252
*/
22532253
/* if (msm_panel->mode == MSM_DSI_CMD_MODE) {
22542254
* dsi_link_clk_disable(msm_host);
2255-
* pm_runtime_put_autosuspend(&msm_host->pdev->dev);
2255+
* pm_runtime_put(&msm_host->pdev->dev);
22562256
* }
22572257
*/
22582258
msm_host->enabled = true;
@@ -2344,7 +2344,7 @@ int msm_dsi_host_power_on(struct mipi_dsi_host *host,
23442344

23452345
fail_disable_clk:
23462346
cfg_hnd->ops->link_clk_disable(msm_host);
2347-
pm_runtime_put_autosuspend(&msm_host->pdev->dev);
2347+
pm_runtime_put(&msm_host->pdev->dev);
23482348
fail_disable_reg:
23492349
dsi_host_regulator_disable(msm_host);
23502350
unlock_ret:
@@ -2371,7 +2371,7 @@ int msm_dsi_host_power_off(struct mipi_dsi_host *host)
23712371
pinctrl_pm_select_sleep_state(&msm_host->pdev->dev);
23722372

23732373
cfg_hnd->ops->link_clk_disable(msm_host);
2374-
pm_runtime_put_autosuspend(&msm_host->pdev->dev);
2374+
pm_runtime_put(&msm_host->pdev->dev);
23752375

23762376
dsi_host_regulator_disable(msm_host);
23772377

drivers/gpu/drm/msm/dsi/phy/dsi_phy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ static int dsi_phy_enable_resource(struct msm_dsi_phy *phy)
602602
static void dsi_phy_disable_resource(struct msm_dsi_phy *phy)
603603
{
604604
clk_disable_unprepare(phy->ahb_clk);
605-
pm_runtime_put_autosuspend(&phy->pdev->dev);
605+
pm_runtime_put(&phy->pdev->dev);
606606
}
607607

608608
static const struct of_device_id dsi_phy_dt_match[] = {

drivers/gpu/drm/msm/hdmi/hdmi_bridge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static void power_off(struct drm_bridge *bridge)
6969
if (ret)
7070
DRM_DEV_ERROR(dev->dev, "failed to disable pwr regulator: %d\n", ret);
7171

72-
pm_runtime_put_autosuspend(&hdmi->pdev->dev);
72+
pm_runtime_put(&hdmi->pdev->dev);
7373
}
7474

7575
#define AVI_IFRAME_LINE_NUMBER 1

drivers/gpu/drm/msm/hdmi/hdmi_hpd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ void msm_hdmi_hpd_disable(struct hdmi_bridge *hdmi_bridge)
205205
msm_hdmi_set_mode(hdmi, false);
206206

207207
enable_hpd_clocks(hdmi, false);
208-
pm_runtime_put_autosuspend(dev);
208+
pm_runtime_put(dev);
209209

210210
ret = gpio_config(hdmi, false);
211211
if (ret)
@@ -260,7 +260,7 @@ static enum drm_connector_status detect_reg(struct hdmi *hdmi)
260260
hpd_int_status = hdmi_read(hdmi, REG_HDMI_HPD_INT_STATUS);
261261

262262
enable_hpd_clocks(hdmi, false);
263-
pm_runtime_put_autosuspend(&hdmi->pdev->dev);
263+
pm_runtime_put(&hdmi->pdev->dev);
264264

265265
return (hpd_int_status & HDMI_HPD_INT_STATUS_CABLE_DETECTED) ?
266266
connector_status_connected : connector_status_disconnected;

0 commit comments

Comments
 (0)