projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'regulator/topic/bcm590xx', 'regulator/topic/da9052...
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
radeon
/
r300.c
diff --git
a/drivers/gpu/drm/radeon/r300.c
b/drivers/gpu/drm/radeon/r300.c
index
7c63ef8
..
0b658b3
100644
(file)
--- a/
drivers/gpu/drm/radeon/r300.c
+++ b/
drivers/gpu/drm/radeon/r300.c
@@
-1430,8
+1430,6
@@
int r300_resume(struct radeon_device *rdev)
/* Initialize surface registers */
radeon_surface_init(rdev);
- radeon_pm_resume(rdev);
-
rdev->accel_working = true;
r = r300_startup(rdev);
if (r) {