git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v2.6.35-rc6' into drm-radeon-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
radeon
/
rs400.c
diff --git
a/drivers/gpu/drm/radeon/rs400.c
b/drivers/gpu/drm/radeon/rs400.c
index f454c9a5e7f22269a9ffe0618d87f1a74e05f276..037b93a1b373172ed0f60291c95f47f725182bac 100644
(file)
--- a/
drivers/gpu/drm/radeon/rs400.c
+++ b/
drivers/gpu/drm/radeon/rs400.c
@@
-483,6
+483,8
@@
int rs400_init(struct radeon_device *rdev)
/* Initialize surface registers */
radeon_surface_init(rdev);
/* TODO: disable VGA need to use VGA request */
/* Initialize surface registers */
radeon_surface_init(rdev);
/* TODO: disable VGA need to use VGA request */
+ /* restore some register to sane defaults */
+ r100_restore_sanity(rdev);
/* BIOS*/
if (!radeon_get_bios(rdev)) {
if (ASIC_IS_AVIVO(rdev))
/* BIOS*/
if (!radeon_get_bios(rdev)) {
if (ASIC_IS_AVIVO(rdev))