xf86-video-ati: Branch 'master'
Alex Deucher
agd5f at kemper.freedesktop.org
Thu Nov 26 09:47:07 PST 2009
src/atombios_output.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 971e463b2cfdc1ba1c78a24fb439d33dd9155dfc
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Nov 26 12:45:15 2009 -0500
dce3: CV1/TV1OutputControl tables didn't go away until dce3.2
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
diff --git a/src/atombios_output.c b/src/atombios_output.c
index af6d68c..c9f1dfa 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -1256,19 +1256,22 @@ atombios_output_dpms(xf86OutputPtr output, int mode)
break;
case ENCODER_OBJECT_ID_INTERNAL_DAC1:
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
- if (!IS_DCE3_VARIANT) {
+ if (IS_DCE32_VARIANT)
+ index = GetIndexIntoMasterTable(COMMAND, DAC1OutputControl);
+ else {
if (radeon_output->active_device & (ATOM_DEVICE_TV_SUPPORT))
index = GetIndexIntoMasterTable(COMMAND, TV1OutputControl);
else if (radeon_output->active_device & (ATOM_DEVICE_CV_SUPPORT))
index = GetIndexIntoMasterTable(COMMAND, CV1OutputControl);
else
index = GetIndexIntoMasterTable(COMMAND, DAC1OutputControl);
- } else
- index = GetIndexIntoMasterTable(COMMAND, DAC1OutputControl);
+ }
break;
case ENCODER_OBJECT_ID_INTERNAL_DAC2:
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
- if (!IS_DCE3_VARIANT) {
+ if (IS_DCE32_VARIANT)
+ index = GetIndexIntoMasterTable(COMMAND, DAC2OutputControl);
+ else {
if (radeon_output->active_device & (ATOM_DEVICE_TV_SUPPORT))
index = GetIndexIntoMasterTable(COMMAND, TV1OutputControl);
else if (radeon_output->active_device & (ATOM_DEVICE_CV_SUPPORT))
@@ -1276,8 +1279,6 @@ atombios_output_dpms(xf86OutputPtr output, int mode)
else
index = GetIndexIntoMasterTable(COMMAND, DAC2OutputControl);
}
- else
- index = GetIndexIntoMasterTable(COMMAND, DAC2OutputControl);
break;
}
More information about the xorg-commit
mailing list