diff options
| author | Lukas Wunner <lukas@wunner.de> | 2016-06-08 18:47:27 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-11-20 01:16:42 +0000 |
| commit | d7e3f23b042afd9babc9571538aeeadd18e685ce (patch) | |
| tree | d27d77fc0775bd498b65d468e8f1a73fff7a0ab7 /drivers/gpu/drm | |
| parent | 70f78252b7248e1342799e3404a440a6e791230f (diff) | |
| download | linux-stable-d7e3f23b042afd9babc9571538aeeadd18e685ce.tar.gz linux-stable-d7e3f23b042afd9babc9571538aeeadd18e685ce.tar.bz2 linux-stable-d7e3f23b042afd9babc9571538aeeadd18e685ce.zip | |
drm/radeon: Don't leak runtime pm ref on driver unload
commit 19de659cb7216eb1c04889bd1a248593f296e19f upstream.
radeon_driver_load_kms() calls pm_runtime_put_autosuspend() if
radeon_is_px(dev), but radeon_driver_unload_kms() calls
pm_runtime_get_sync() unconditionally. We therefore leak a runtime pm
ref whenever radeon is unloaded on a non-PX machine or if runpm=0. The
GPU will subsequently never runtime suspend after loading radeon again.
Fix by taking the runtime pm ref under the same condition that it was
released on driver load.
Fixes: 10ebc0bc0934 ("drm/radeon: add runtime PM support (v2)")
Cc: Dave Airlie <airlied@redhat.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/aaf71106c042126817aeca8b8e54ed468ab61ef7.1465392124.git.lukas@wunner.de
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_kms.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index b63094746b50..907ad15a8485 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -61,7 +61,9 @@ int radeon_driver_unload_kms(struct drm_device *dev) if (rdev->rmmio == NULL) goto done_free; - pm_runtime_get_sync(dev->dev); + if (radeon_is_px(dev)) { + pm_runtime_get_sync(dev->dev); + } radeon_acpi_fini(rdev); |