diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-03-21 21:36:57 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-06-02 10:01:32 +1000 |
| commit | bc81ca7e324f6876191c1edb21aeb37542eed8a6 (patch) | |
| tree | 366e0320b7bb05f2e731b964be83dbce204dd5a5 | |
| parent | 015a5129874582161c867c1f00d1f9b730ded9a3 (diff) | |
rename I2C to DVO
| -rw-r--r-- | src/i830.h | 8 | ||||
| -rw-r--r-- | src/i830_driver.c | 14 | ||||
| -rw-r--r-- | src/i830_i2c.c | 2 | ||||
| -rw-r--r-- | src/i830_sdvo.c | 1 |
4 files changed, 10 insertions, 15 deletions
@@ -230,10 +230,10 @@ typedef struct _I830SaveRec { #define I830_OUTPUT_LVDS 4 #define I830_OUTPUT_TVOUT 5 -#define I830_I2C_CHIP_NONE 0 -#define I830_I2C_CHIP_LVDS 1 -#define I830_I2C_CHIP_TMDS 2 -#define I830_I2C_CHIP_TVOUT 4 +#define I830_DVO_CHIP_NONE 0 +#define I830_DVO_CHIP_LVDS 1 +#define I830_DVO_CHIP_TMDS 2 +#define I830_DVO_CHIP_TVOUT 4 #define I830_OUTPUT_PIPE_NC 0 #define I830_OUTPUT_PIPE_A 1 diff --git a/src/i830_driver.c b/src/i830_driver.c index 5ffb7417..3defa90b 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1046,16 +1046,16 @@ GetDisplayDevices(ScrnInfoPtr pScrn) { switch(pI830->output[i].i2c_drv->type) { - case I830_I2C_CHIP_LVDS: + case I830_DVO_CHIP_LVDS: ret |= PIPE_LFP; break; - case I830_I2C_CHIP_TMDS: + case I830_DVO_CHIP_TMDS: ret |= PIPE_DFP; break; - case I830_I2C_CHIP_TVOUT: + case I830_DVO_CHIP_TVOUT: ret |= PIPE_TV; break; - case I830_I2C_CHIP_NONE: + case I830_DVO_CHIP_NONE: default: break; } @@ -2280,22 +2280,18 @@ I830SetupOutputBusses(ScrnInfoPtr pScrn) case PCI_CHIP_845_G: case PCI_CHIP_I855_GM: case PCI_CHIP_I865_G: - /* i865 has a single analog*/ pI830->num_outputs = 2; pI830->output[1].type = I830_OUTPUT_DVO; I830I2CInit(pScrn, &pI830->output[1].pDDCBus, GPIOD, "DVODDC_D"); I830I2CInit(pScrn, &pI830->output[1].pI2CBus, GPIOE, "DVOI2C_E"); break; case PCI_CHIP_I915_G: - /* has 2 SDVOs */ case PCI_CHIP_E7221_G: case PCI_CHIP_I915_GM: /* has some LVDS + tv-out */ case PCI_CHIP_I945_G: - /* has 2 SDVOs */ case PCI_CHIP_I945_GM: - /* be careful there is some hardcoding of SDVO to output 1 - need to revisit PIPE mappings */ + /* SDVO ports have a single control bus */ pI830->num_outputs = 2; pI830->output[1].type = I830_OUTPUT_SDVO; I830I2CInit(pScrn, &pI830->output[1].pI2CBus, GPIOE, "SDVOCTRL_E"); diff --git a/src/i830_i2c.c b/src/i830_i2c.c index 8d0e9132..b13e3d4b 100644 --- a/src/i830_i2c.c +++ b/src/i830_i2c.c @@ -57,7 +57,7 @@ static const char *SIL164Symbols[] = { /* driver list */ struct _I830DVODriver i830_dvo_drivers[] = - { I830_I2C_CHIP_TMDS, "sil164", "SIL164VidOutput", (SIL164_ADDR_1<<1), SIL164Symbols, NULL , NULL, NULL}; + { I830_DVO_CHIP_TMDS, "sil164", "SIL164VidOutput", (SIL164_ADDR_1<<1), SIL164Symbols, NULL , NULL, NULL}; diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c index 18fc185b..e6ee342d 100644 --- a/src/i830_sdvo.c +++ b/src/i830_sdvo.c @@ -565,7 +565,6 @@ I830SDVOPreSetMode(I830SDVOPtr s, DisplayModePtr mode) } - Bool I830SDVOPostSetMode(I830SDVOPtr s, DisplayModePtr mode) { |