diff options
| author | Dinghao Liu <dinghao.liu@zju.edu.cn> | 2020-05-20 18:47:48 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-01 13:14:45 +0200 |
| commit | 39096c0f5c1ec9a3f9840ee315251493a607a57b (patch) | |
| tree | 1c9e4897c1ed3be4b64a88ebe5adb243813d0531 | |
| parent | 12f61a929604a7e4aee4632ea73e81fab564f703 (diff) | |
| download | linux-stable-39096c0f5c1ec9a3f9840ee315251493a607a57b.tar.gz linux-stable-39096c0f5c1ec9a3f9840ee315251493a607a57b.tar.bz2 linux-stable-39096c0f5c1ec9a3f9840ee315251493a607a57b.zip | |
drm/nouveau/dispnv50: fix runtime pm imbalance on error
[ Upstream commit dc455f4c888365595c0a13da445e092422d55b8d ]
pm_runtime_get_sync() increments the runtime PM usage counter even
the call returns an error code. Thus a pairing decrement is needed
on the error handling path to keep the counter balanced.
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index e06ea8c8184c..1bb0a9f6fa73 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -909,8 +909,10 @@ nv50_mstc_detect(struct drm_connector *connector, bool force) return connector_status_disconnected; ret = pm_runtime_get_sync(connector->dev->dev); - if (ret < 0 && ret != -EACCES) + if (ret < 0 && ret != -EACCES) { + pm_runtime_put_autosuspend(connector->dev->dev); return connector_status_disconnected; + } conn_status = drm_dp_mst_detect_port(connector, mstc->port->mgr, mstc->port); |