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_output.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_output.c')
| -rw-r--r-- | src/radeon_output.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c index 02c96aef..519626fb 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -741,6 +741,8 @@ void RADEONConnectorFindMonitor(ScrnInfoPtr pScrn, xf86OutputPtr output) } } +#ifndef __powerpc__ + static RADEONMonitorType RADEONDetectLidStatus(ScrnInfoPtr pScrn) { @@ -780,6 +782,8 @@ RADEONDetectLidStatus(ScrnInfoPtr pScrn) return MonType; } +#endif /* __powerpc__ */ + static RADEONMonitorType RADEONPortCheckNonDDC(ScrnInfoPtr pScrn, xf86OutputPtr output) { RADEONOutputPrivatePtr radeon_output = output->driver_private; @@ -1047,7 +1051,10 @@ static void RADEONInitLVDSRegisters(xf86OutputPtr output, RADEONSavePtr save, save->lvds_gen_cntl = info->SavedReg->lvds_gen_cntl; save->lvds_gen_cntl |= RADEON_LVDS_DISPLAY_DIS; - save->lvds_gen_cntl &= ~(RADEON_LVDS_ON | RADEON_LVDS_BLON); + save->lvds_gen_cntl &= ~(RADEON_LVDS_ON | + RADEON_LVDS_BLON | + RADEON_LVDS_EN | + RADEON_LVDS_RST_FM); if (IS_R300_VARIANT) save->lvds_pll_cntl &= ~(R300_LVDS_SRC_SEL_MASK); @@ -3384,6 +3391,14 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn) } } + /* clear the enable masks */ + info->output_crt1 = 0; + info->output_crt2 = 0; + info->output_dfp1 = 0; + info->output_dfp2 = 0; + info->output_lcd1 = 0; + info->output_tv1 = 0; + for (i = 0 ; i < RADEON_MAX_BIOS_CONNECTOR; i++) { if (info->BiosConnector[i].valid) { RADEONOutputPrivatePtr radeon_output = xnfcalloc(sizeof(RADEONOutputPrivateRec), 1); |