projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'topic/drm-misc-2016-07-14' of git://anongit.freedesktop.org/drm-intel...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_device.c
diff --git
a/drivers/gpu/drm/radeon/radeon_device.c
b/drivers/gpu/drm/radeon/radeon_device.c
index
21c44b2
..
a00dd2f
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_device.c
+++ b/
drivers/gpu/drm/radeon/radeon_device.c
@@
-30,6
+30,7
@@
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include <drm/radeon_drm.h>
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include <drm/radeon_drm.h>
+#include <linux/pm_runtime.h>
#include <linux/vgaarb.h>
#include <linux/vga_switcheroo.h>
#include <linux/efi.h>
#include <linux/vgaarb.h>
#include <linux/vga_switcheroo.h>
#include <linux/efi.h>
@@
-1526,6
+1527,9
@@
int radeon_device_init(struct radeon_device *rdev,
return 0;
failed:
return 0;
failed:
+ /* balance pm_runtime_get_sync() in radeon_driver_unload_kms() */
+ if (radeon_is_px(ddev))
+ pm_runtime_put_noidle(ddev->dev);
if (runtime)
vga_switcheroo_fini_domain_pm_ops(rdev->dev);
return r;
if (runtime)
vga_switcheroo_fini_domain_pm_ops(rdev->dev);
return r;