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_bios.c | |
| parent | 83f81ed5e3c33c94c80500316c37a7cbfc51f41f (diff) | |
| parent | a3ee42207aab77d93655a82fdcb32be38268b85f (diff) | |
Merge branch 'master' into randr-1.2 and fix conflicts
Diffstat (limited to 'src/radeon_bios.c')
| -rw-r--r-- | src/radeon_bios.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/radeon_bios.c b/src/radeon_bios.c index fa316a66..76e08192 100644 --- a/src/radeon_bios.c +++ b/src/radeon_bios.c @@ -181,6 +181,9 @@ Bool RADEONGetConnectorInfoFromBIOS (ScrnInfoPtr pScrn) case RADEON_GPIO_CRT2_DDC: pRADEONEnt->PortInfo[crtc]->DDCType = DDC_CRT2; break; + case RADEON_LCD_GPIO_MASK: + pRADEONEnt->PortInfo[crtc]->DDCType = DDC_LCD; + break; default: pRADEONEnt->PortInfo[crtc]->DDCType = DDC_NONE_DETECTED; break; @@ -295,7 +298,7 @@ Bool RADEONGetConnectorInfoFromBIOS (ScrnInfoPtr pScrn) if ((tmp0 = RADEON_BIOS16(tmp + 0x15))) { if ((tmp1 = RADEON_BIOS8(tmp0+2) & 0x07)) { pRADEONEnt->PortInfo[0]->DDCType = tmp1; - if (pRADEONEnt->PortInfo[0]->DDCType > DDC_CRT2) { + if (pRADEONEnt->PortInfo[0]->DDCType > DDC_LCD) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Unknown DDCType %d found\n", pRADEONEnt->PortInfo[0]->DDCType); |