diff options
| author | Alex Deucher <alex@botch2.(none)> | 2007-09-22 15:51:23 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2007-09-22 15:51:23 -0400 |
| commit | 81114af1cdddc0b10d076f2e38c7a00c1223cc48 (patch) | |
| tree | b88ee95d54ac94a88c7fd4612d8ee82adfc79598 | |
| parent | 6c482e453bc8156886294d0c1b8f3f1b3dcf4b36 (diff) | |
RADEON: preliminary support for mac mini
Option "MacModel" "mini"
may not be 100% correct yet
| -rw-r--r-- | man/radeon.man | 6 | ||||
| -rw-r--r-- | src/radeon.h | 3 | ||||
| -rw-r--r-- | src/radeon_output.c | 15 |
3 files changed, 21 insertions, 3 deletions
diff --git a/man/radeon.man b/man/radeon.man index 8217262a..35dd7010 100644 --- a/man/radeon.man +++ b/man/radeon.man @@ -404,9 +404,11 @@ Used to specify Mac models for connector tables and quirks. Only valid .br ibook \-\- ibooks .br -powerbook-duallink \-\- Powerbooks with dual link DVI +powerbook-duallink \-\- Powerbooks with external DVI .br -powerbook \-\- Powerbooks with single link DVI +powerbook \-\- Powerbooks with integrated DVI +.br +mini \-\- Mac Mini .br The default value is .B undefined. diff --git a/src/radeon.h b/src/radeon.h index 4c586f6c..cec06e97 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -429,7 +429,8 @@ typedef enum { typedef enum { RADEON_MAC_IBOOK = 0x00000001, RADEON_MAC_POWERBOOK_DL = 0x00000002, - RADEON_MAC_POWERBOOK = 0x00000004 + RADEON_MAC_POWERBOOK = 0x00000004, + RADEON_MAC_MINI = 0x00000008 } RADEONMacModel; #endif diff --git a/src/radeon_output.c b/src/radeon_output.c index 3e58d416..346fdc4c 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -2544,6 +2544,19 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn) info->BiosConnector[2].DDCType = DDC_NONE_DETECTED; info->BiosConnector[2].valid = TRUE; return TRUE; + case RADEON_MAC_MINI: + info->BiosConnector[0].DDCType = DDC_CRT2; + info->BiosConnector[0].DACType = DAC_TVDAC; + info->BiosConnector[0].TMDSType = TMDS_EXT; + info->BiosConnector[0].ConnectorType = CONNECTOR_DVI_I; + info->BiosConnector[0].valid = TRUE; + + info->BiosConnector[1].ConnectorType = CONNECTOR_STV; + info->BiosConnector[1].DACType = DAC_TVDAC; + info->BiosConnector[1].TMDSType = TMDS_NONE; + info->BiosConnector[1].DDCType = DDC_NONE_DETECTED; + info->BiosConnector[1].valid = TRUE; + return TRUE; default: return FALSE; } @@ -2689,6 +2702,8 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn) info->MacModel = RADEON_MAC_POWERBOOK_DL; else if (!strncmp("powerbook", optstr, strlen("powerbook"))) info->MacModel = RADEON_MAC_POWERBOOK; + else if (!strncmp("mini", optstr, strlen("mini"))) + info->MacModel = RADEON_MAC_MINI; else { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Invalid Mac Model: %s\n", optstr); return FALSE; |