Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62d2e531 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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()
parents c789174b 5ba15878

drivers/gpu/drm/nouveau/dispnv50/disp.c

+14 −1
Original line number Original line Diff line number Diff line
@@ -900,9 +900,22 @@ static enum drm_connector_status 
nv50_mstc_detect(struct drm_connector *connector, bool force)

nv50_mstc_detect(struct drm_connector *connector, bool force)

{

{

	struct nv50_mstc *mstc = nv50_mstc(connector);

	struct nv50_mstc *mstc = nv50_mstc(connector);

	enum drm_connector_status conn_status;

	int ret;



	if (!mstc->port)

	if (!mstc->port)

		return connector_status_disconnected;

		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

static void