diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-12-15 00:50:10 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-12-15 00:50:10 +0100 |
| commit | b653e5a628bfa4dfb168e96f93f41eb910f409fb (patch) | |
| tree | 2e4784f091b9d1134535f670eada60e21e2e3eb5 | |
| parent | 6229825fa5d6715569098afbb21a40f7a2e7e6be (diff) | |
radeon: Default to 1x again with non-v3 AGP cards.
Seems more reliable in general than what was set up by firmware - fingers
crossed...
| -rw-r--r-- | src/radeon_dri.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/radeon_dri.c b/src/radeon_dri.c index 618334ea..3190451a 100644 --- a/src/radeon_dri.c +++ b/src/radeon_dri.c @@ -726,18 +726,9 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen) pcie-agp rialto bridge chip - use the one from bridge which must match */ CARD32 agp_status = (INREG(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode; Bool is_v3 = (agp_status & RADEON_AGPv3_MODE); - unsigned int defaultMode; - MessageType from; - - if (is_v3) { - defaultMode = (agp_status & RADEON_AGPv3_8X_MODE) ? 8 : 4; - } else { - if (agp_status & RADEON_AGP_4X_MODE) defaultMode = 4; - else if (agp_status & RADEON_AGP_2X_MODE) defaultMode = 2; - else defaultMode = 1; - } - - from = X_DEFAULT; + unsigned int defaultMode = is_v3 ? + ((agp_status & RADEON_AGPv3_8X_MODE) ? 8 : 4) : 1; + MessageType from = X_DEFAULT; if (xf86GetOptValInteger(info->Options, OPTION_AGP_MODE, &info->agpMode)) { if ((info->agpMode < (is_v3 ? 4 : 1)) || |