Merge tag 'drm-fixes-2018-10-12-1' of git://anongit.freedesktop.org/drm/drm

Dave writes:
  "drm fixes for 4.19-rc8

   single nouveau runtime reference and mst change"

* tag 'drm-fixes-2018-10-12-1' of git://anongit.freedesktop.org/drm/drm:
  drm/nouveau/drm/nouveau: Grab runtime PM ref in nv50_mstc_detect()

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