diff options
| author | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2008-03-26 18:35:21 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2008-03-26 18:35:21 -0400 |
| commit | de2f609ff0004ef8b74727bfebc2c74fb91205ea (patch) | |
| tree | 17fdd573649fb61e1b3f3f3b3e747318962ac7bf | |
| parent | 75884c257bc2bcfa5b498a77d4c403f09face036 (diff) | |
AVIVO: no need to call PreinitXv() on AVIVO chips as they have no overlay
| -rw-r--r-- | src/radeon_driver.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index c3c7c777..0183aa32 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -2339,7 +2339,7 @@ static Bool RADEONPreInitXv(ScrnInfoPtr pScrn) } bios_header=info->VBIOS[0x48]; - bios_header+=(((int)info->VBIOS[0x49]+0)<<8); + bios_header+=(((int)info->VBIOS[0x49]+0)<<8); mm_table=info->VBIOS[bios_header+0x38]; if(mm_table==0) @@ -2770,14 +2770,16 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) if (!RADEONPreInitAccel(pScrn)) goto fail; - if (!RADEONPreInitXv(pScrn)) goto fail; + if (!IS_AVIVO_VARIANT) { + if (!RADEONPreInitXv(pScrn)) goto fail; + } if (!xf86RandR12PreInit (pScrn)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "RandR initialization failure\n"); goto fail; - } - + } + if (pScrn->modes == NULL) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No modes.\n"); goto fail; |