diff options
| author | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-15 00:36:05 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-15 00:36:05 -0400 |
| commit | 9ed00e959fcdab2739a7e64ca1e303a6faf28f15 (patch) | |
| tree | 9084f8104489f701780c01bf2d63743247766c1b /src/radeon_output.c | |
| parent | 5106c8fe5f74865cac8b00937739a4efde9fc254 (diff) | |
RADEON: Lots of small fixes
- remove extra crtc2_base set
- remove some debugging code
- clean up RestoreMode()
- make sure a DDC reg gets assigned for LCD_DDC
- make sure we adjust the right frame in AdjustFrame()
- rename RADEONMapControllers() to RADEONPrintPortMap() to
reflect what it actually does now
- make i2c bus name match the DDC port
- remove or comment out un-needed code
Diffstat (limited to 'src/radeon_output.c')
| -rw-r--r-- | src/radeon_output.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c index e9e1aea..3052c36 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -126,7 +126,7 @@ const char *OutputType[10] = { static RADEONMonitorType RADEONPortCheckNonDDC(ScrnInfoPtr pScrn, xf86OutputPtr output); -Bool RADEONMapControllers(ScrnInfoPtr pScrn) +void RADEONPrintPortMap(ScrnInfoPtr pScrn) { RADEONInfoPtr info = RADEONPTR(pScrn); RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); @@ -136,9 +136,6 @@ Bool RADEONMapControllers(ScrnInfoPtr pScrn) xf86OutputPtr output; int o; - pRADEONEnt->Controller[0]->binding = 1; - pRADEONEnt->Controller[1]->binding = 1; - for (o = 0; o < xf86_config->num_output; o++) { output = xf86_config->output[o]; radeon_output = output->driver_private; @@ -156,7 +153,6 @@ Bool RADEONMapControllers(ScrnInfoPtr pScrn) } - return TRUE; } /* Primary Head (DVI or Laptop Int. panel)*/ @@ -433,13 +429,14 @@ void RADEONInitConnector(xf86OutputPtr output) ScrnInfoPtr pScrn = output->scrn; RADEONOutputPrivatePtr radeon_output = output->driver_private; int DDCReg = 0; - char* name = OutputType[radeon_output->type]; + char* name = (char*) DDCTypeName[radeon_output->DDCType]; switch(radeon_output->DDCType) { case DDC_MONID: DDCReg = RADEON_GPIO_MONID; break; case DDC_DVI : DDCReg = RADEON_GPIO_DVI_DDC; break; - case DDC_VGA: DDCReg = RADEON_GPIO_VGA_DDC; break; - case DDC_CRT2: DDCReg = RADEON_GPIO_CRT2_DDC; break; + case DDC_VGA : DDCReg = RADEON_GPIO_VGA_DDC; break; + case DDC_CRT2 : DDCReg = RADEON_GPIO_CRT2_DDC; break; + case DDC_LCD : DDCReg = RADEON_LCD_GPIO_MASK; break; default: break; } @@ -455,7 +452,7 @@ void RADEONInitConnector(xf86OutputPtr output) if (radeon_output->type == OUTPUT_DVI) { RADEONGetTMDSInfo(output); - // FIXME + // FIXME -- this should be done in detect or getmodes /*if (i == 0) RADEONGetHardCodedEDIDFromBIOS(output);*/ |