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

Commit 5ba15878 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-4.19' of git://github.com/skeggsb/linux into drm-fixes 



runtime refcount fix for mst connectors.

Signed-off-by: default avatarDave 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
parents 0238df64 e46368cf

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