diff options
| author | Alex Deucher <alex@samba.(none)> | 2007-12-17 20:07:07 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@samba.(none)> | 2007-12-17 20:07:07 -0500 |
| commit | cf685f37ec874f0aacd09e7c4eb0402c6daec1b0 (patch) | |
| tree | ef70e906789de556ea3885261b594ce1b31221e2 /src/radeon_dri.c | |
| parent | 2a134af01bc85de758ad83a85b23d1bba4a1a0f5 (diff) | |
| parent | 44d07c4ccce9acb5bd21a17acb082e91f7225764 (diff) | |
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
merge master and fix conflicts
Diffstat (limited to 'src/radeon_dri.c')
| -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 ac8d03c9..f1003d72 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)) || |