projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init', 'spi/topic/mpc512x...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
radeon
/
r100.c
diff --git
a/drivers/gpu/drm/radeon/r100.c
b/drivers/gpu/drm/radeon/r100.c
index
ef024ce
..
3cc78bb
100644
(file)
--- a/
drivers/gpu/drm/radeon/r100.c
+++ b/
drivers/gpu/drm/radeon/r100.c
@@
-3942,8
+3942,6
@@
int r100_resume(struct radeon_device *rdev)
/* Initialize surface registers */
radeon_surface_init(rdev);
- radeon_pm_resume(rdev);
-
rdev->accel_working = true;
r = r100_startup(rdev);
if (r) {