xf86-video-ati: Branch 'master' - 2 commits
Adam Jackson
ajax at kemper.freedesktop.org
Fri Mar 6 14:50:55 PST 2009
src/atombios_output.c | 5 ++++-
src/radeon_output.c | 13 ++++++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit d1add18f3d238c755f9875b5e5c211e4af742482
Author: root <root at benzylpiperazine.boston.devel.redhat.com>
Date: Fri Mar 6 17:53:59 2009 -0500
output: Filter out dual-link modes from DP->DVI connections
There's not enough pins on a DP->DVI connector for this to possibly work.
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 68bea21..fcf22ef 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -403,6 +403,13 @@ radeon_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
}
}
+ if (radeon_output->ConnectorType == CONNECTOR_DISPLAY_PORT &&
+ radeon_output->MonType == MT_DFP) {
+ /* DP to DVI converter, single-link only */
+ if (pMode->Clock > 165000)
+ return MODE_CLOCK_HIGH;
+ }
+
if (radeon_output->active_device & (ATOM_DEVICE_LCD_SUPPORT)) {
if (radeon_output->rmx_type == RMX_OFF) {
if (pMode->HDisplay != native_mode->PanelXRes ||
commit 04481bf450650d1ea5aadabc9213b899b0fe8119
Author: root <root at benzylpiperazine.boston.devel.redhat.com>
Date: Fri Mar 6 17:32:15 2009 -0500
atom: Enable DisplayPort source to DVI/HDMI sink
DP source to DP sink still doesn't work yet, of course.
diff --git a/src/atombios_output.c b/src/atombios_output.c
index 6d87c8e..613f729 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -430,7 +430,10 @@ atombios_get_encoder_mode(xf86OutputPtr output)
return ATOM_ENCODER_MODE_LVDS;
break;
case CONNECTOR_DISPLAY_PORT:
- return ATOM_ENCODER_MODE_DP;
+ if (radeon_output->MonType == MT_DP)
+ return ATOM_ENCODER_MODE_DP;
+ else
+ return atombios_maybe_hdmi_mode(output);
break;
case CONNECTOR_DVI_A:
case CONNECTOR_VGA:
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 0be7625..68bea21 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -255,7 +255,11 @@ radeon_ddc_connected(xf86OutputPtr output)
MonType = MT_DFP;
break;
case CONNECTOR_DISPLAY_PORT:
- MonType = MT_DP;
+ /*
+ * XXX wrong. need to infer based on whether we got DDC from I2C
+ * or AUXCH.
+ */
+ MonType = MT_DFP;
case CONNECTOR_DVI_I:
if (MonInfo->rawData[0x14] & 0x80) /* if it's digital and DVI */
MonType = MT_DFP;
More information about the xorg-commit
mailing list