diff options
| author | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-08 18:41:25 +0200 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-08 18:41:25 +0200 |
| commit | 76670f665ebec7cdf40a04bf9379cb3ad4417507 (patch) | |
| tree | d108b86148b961e95ab44879f3eb024e5dfe5977 /src/radeon_modes.c | |
| parent | 83f81ed5e3c33c94c80500316c37a7cbfc51f41f (diff) | |
| parent | a3ee42207aab77d93655a82fdcb32be38268b85f (diff) | |
Merge branch 'master' into randr-1.2 and fix conflicts
Diffstat (limited to 'src/radeon_modes.c')
| -rw-r--r-- | src/radeon_modes.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/radeon_modes.c b/src/radeon_modes.c index 064b1aeb..4d7251f1 100644 --- a/src/radeon_modes.c +++ b/src/radeon_modes.c @@ -76,7 +76,6 @@ void RADEONSetPitch (ScrnInfoPtr pScrn) pScrn->displayWidth = dummy; } - /* This is used only when no mode is specified for FP and no ddc is * available. We force it to native mode, if possible. */ @@ -191,7 +190,7 @@ int RADEONValidateFPModes(ScrnInfoPtr pScrn, char **ppModeName, DisplayModePtr * if (last) last->next = new; last = new; - if (!first) first = new; + if (!first) first = new; pScrn->display->virtualX = pScrn->virtualX = MAX(pScrn->virtualX, width); @@ -237,11 +236,8 @@ int RADEONValidateFPModes(ScrnInfoPtr pScrn, char **ppModeName, DisplayModePtr * new->type |= M_T_DEFAULT; - new->next = NULL; - new->prev = last; - if (last) last->next = new; - last = new; + last = new; if (!first) first = new; } } @@ -309,7 +305,7 @@ RADEONProbeOutputModes(xf86OutputPtr output) if (modes == NULL) { MonRec fixed_mon; - + RADEONValidateFPModes(pScrn, pScrn->display->modes, &modes); } } @@ -322,4 +318,3 @@ RADEONProbeOutputModes(xf86OutputPtr output) return modes; } - |