summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@samba.(none)>2007-12-17 20:07:32 -0500
committerAlex Deucher <alex@samba.(none)>2007-12-17 20:07:32 -0500
commit19b9d3708852b7efe2b05249c8359dadb924dd94 (patch)
tree53312bccb63fb43d446a40a4801e5d09762418f4
parentcf685f37ec874f0aacd09e7c4eb0402c6daec1b0 (diff)
parent29706ca585ebd9b7b3521521a17016322e9ecccb (diff)
Merge branch 'atombios-support' of git+ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
-rw-r--r--src/radeon_driver.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index a9756faf..3eecedb0 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3939,8 +3939,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
RADEONInitVideo(pScreen);
}
- if (!shadowSetup(pScreen)) {
- return FALSE;
+ if (info->r600_shadow_fb == TRUE) {
+ if (!shadowSetup(pScreen)) {
+ return FALSE;
+ }
}
/* Provide SaveScreen & wrap BlockHandler and CloseScreen */