diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-06-24 17:05:47 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2009-06-24 17:05:47 -0400 |
| commit | 96581746eea2f4e29a04f9266ec9649f25480424 (patch) | |
| tree | 284b2ee3b49daccf7a3a38ad4c9caa384388b2fb | |
| parent | 496adc4dc7cf53fc6acfecb1158f1491d5f36168 (diff) | |
atom: Fix phantom VGA connector when HDMI-B present.
HDMI-B is really a glorified DL-DVI connector, the analog pins work fine.
| -rw-r--r-- | src/radeon_atombios.c | 3 | ||||
| -rw-r--r-- | src/radeon_output.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c index 6375626d..e6542288 100644 --- a/src/radeon_atombios.c +++ b/src/radeon_atombios.c @@ -1644,8 +1644,7 @@ static void RADEONApplyATOMQuirks(ScrnInfoPtr pScrn, int index) /* some BIOSes seem to report DAC on HDMI - usually this is a board with * HDMI + VGA reporting as HDMI */ - if ((info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_A) || - (info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_B)) { + if (info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_A) { if (info->BiosConnector[index].devices & (ATOM_DEVICE_CRT_SUPPORT)) { info->BiosConnector[index].devices &= ~(ATOM_DEVICE_DFP_SUPPORT); info->BiosConnector[index].ConnectorType = CONNECTOR_VGA; diff --git a/src/radeon_output.c b/src/radeon_output.c index e453cc24..e307bf0e 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -234,7 +234,6 @@ radeon_ddc_connected(xf86OutputPtr output) break; case CONNECTOR_DVI_D: case CONNECTOR_HDMI_TYPE_A: - case CONNECTOR_HDMI_TYPE_B: if (radeon_output->shared_ddc) { if (MonInfo->rawData[0x14] & 0x80) /* if it's digital and DVI/HDMI/etc. */ MonType = MT_DFP; @@ -249,6 +248,7 @@ radeon_ddc_connected(xf86OutputPtr output) * or AUXCH. */ MonType = MT_DFP; + case CONNECTOR_HDMI_TYPE_B: case CONNECTOR_DVI_I: if (MonInfo->rawData[0x14] & 0x80) /* if it's digital and DVI */ MonType = MT_DFP; |