diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-10-08 08:37:56 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-10-08 08:37:59 +0200 |
| commit | 5ba15878f23c4bafb95afa0dabe9d08d89520259 (patch) | |
| tree | 01e5489d6be31ac96103e110244c716fa78f82b0 /drivers/gpu | |
| parent | Linux 4.19-rc7 (diff) | |
| parent | drm/nouveau/drm/nouveau: Grab runtime PM ref in nv50_mstc_detect() (diff) | |
| download | linux-5ba15878f23c4bafb95afa0dabe9d08d89520259.tar.xz linux-5ba15878f23c4bafb95afa0dabe9d08d89520259.zip | |
Merge branch 'linux-4.19' of git://github.com/skeggsb/linux into drm-fixes
runtime refcount fix for mst connectors.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <bskeggs@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CABDvA=nydWjs26=TZHqistLXjCwm-vHmrisbP6K=FMZ5gW1wnQ@mail.gmail.com
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/disp.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 5691dfa1db6f..041e7daf8a33 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -900,9 +900,22 @@ static enum drm_connector_status nv50_mstc_detect(struct drm_connector *connector, bool force) { struct nv50_mstc *mstc = nv50_mstc(connector); + enum drm_connector_status conn_status; + int ret; + if (!mstc->port) return connector_status_disconnected; - return drm_dp_mst_detect_port(connector, mstc->port->mgr, mstc->port); + + ret = pm_runtime_get_sync(connector->dev->dev); + if (ret < 0 && ret != -EACCES) + return connector_status_disconnected; + + conn_status = drm_dp_mst_detect_port(connector, mstc->port->mgr, + mstc->port); + + pm_runtime_mark_last_busy(connector->dev->dev); + pm_runtime_put_autosuspend(connector->dev->dev); + return conn_status; } static void |