summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPi-Hsun Shih <pihsun@chromium.org>2021-05-20 14:44:52 +0800
committerRobert Foss <robert.foss@linaro.org>2021-05-20 12:27:20 +0200
commit3203e497eb769cdf3b2f835bdc92083fee2796a9 (patch)
treeb9673f7ea38c628fd4f8d6a2c2b0f659f1e6c3d6
parent07775fc13878cbc2e9cda5ffac7c7289adee91cb (diff)
downloadlinux-stable-3203e497eb769cdf3b2f835bdc92083fee2796a9.tar.gz
linux-stable-3203e497eb769cdf3b2f835bdc92083fee2796a9.tar.bz2
linux-stable-3203e497eb769cdf3b2f835bdc92083fee2796a9.zip
drm/bridge: anx7625: Synchronously run runtime suspend.
Originally when using pm_runtime_put, there's a chance that the runtime suspend hook will be run after the following anx7625_bridge_mode_set call, resulting in the display_timing_valid field to be cleared, and the following power on fail. Change all pm_runtime_put to pm_runtime_put_sync, so all power off operations are guaranteed to be done after the call returns. Fixes: 60487584a79a ("drm/bridge: anx7625: refactor power control to use runtime PM framework") Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org> Tested-by: Tzung-Bi Shih <tzungbi@google.com> Reviewed-by: Robert Foss <robert.foss@linaro.org> Signed-off-by: Robert Foss <robert.foss@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20210520064508.3121211-1-pihsun@chromium.org
-rw-r--r--drivers/gpu/drm/bridge/analogix/anx7625.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
index 29493cc2d300..7519b7a0f29d 100644
--- a/drivers/gpu/drm/bridge/analogix/anx7625.c
+++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
@@ -1255,7 +1255,7 @@ static struct edid *anx7625_get_edid(struct anx7625_data *ctx)
pm_runtime_get_sync(dev);
edid_num = sp_tx_edid_read(ctx, p_edid->edid_raw_data);
- pm_runtime_put(dev);
+ pm_runtime_put_sync(dev);
if (edid_num < 1) {
DRM_DEV_ERROR(dev, "Fail to read EDID: %d\n", edid_num);
@@ -1573,7 +1573,7 @@ static void anx7625_bridge_disable(struct drm_bridge *bridge)
anx7625_dp_stop(ctx);
- pm_runtime_put(dev);
+ pm_runtime_put_sync(dev);
}
static enum drm_connector_status