diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-01-19 12:32:05 -0500 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-01-19 12:32:05 -0500 |
| commit | 54156da8937c9f5f84b4215e239a61ecc7c29275 (patch) | |
| tree | 7fb1e07ebedc5fbd35a29f5d450dee538763efdb /drivers/gpu/drm/bridge | |
| parent | f7a71b0cf9e36c1b0edbfe89ce028a01164b864d (diff) | |
| parent | 4a6cc7a44e98a0460bd094b68c75f0705fdc450a (diff) | |
| download | linux-54156da8937c9f5f84b4215e239a61ecc7c29275.tar.gz linux-54156da8937c9f5f84b4215e239a61ecc7c29275.tar.bz2 linux-54156da8937c9f5f84b4215e239a61ecc7c29275.zip | |
Merge airlied/drm-next into drm-misc-next
It's been a while since we've backmerged drm-next. Dave just brought
back 4.15-rc8, so now's a good time to freshen things up around here.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/bridge')
| -rw-r--r-- | drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 263e8215b3de..b2756bc4225a 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -942,7 +942,9 @@ static int analogix_dp_get_modes(struct drm_connector *connector) return 0; } + pm_runtime_get_sync(dp->dev); edid = drm_get_edid(connector, &dp->aux.ddc); + pm_runtime_put(dp->dev); if (edid) { drm_mode_connector_update_edid_property(&dp->connector, edid); |