projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
radeon
/
rs400.c
diff --git
a/drivers/gpu/drm/radeon/rs400.c
b/drivers/gpu/drm/radeon/rs400.c
index
b5c2369
..
130d5cc
100644
(file)
--- a/
drivers/gpu/drm/radeon/rs400.c
+++ b/
drivers/gpu/drm/radeon/rs400.c
@@
-474,8
+474,6
@@
int rs400_resume(struct radeon_device *rdev)
/* Initialize surface registers */
radeon_surface_init(rdev);
- radeon_pm_resume(rdev);
-
rdev->accel_working = true;
r = rs400_startup(rdev);
if (r) {