summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-04-12 16:32:04 -0400
committerAlex Deucher <alexdeucher@gmail.com>2010-04-12 16:32:04 -0400
commitc1b817c45477c21234abaaebe78feb7ea4fd92b1 (patch)
tree639cfef1a9a3aa17f24de351f740f29c1967905c /src
parent878814aeab7031ff6169fcaf2be869b7595c8699 (diff)
atom: disable TV encoder when VGA is in use
Switching between TV and VGA caused problems on some systems since the TV encoder was left enabled. Should fix fdo bug 25520.
Diffstat (limited to 'src')
-rw-r--r--src/atombios_output.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/atombios_output.c b/src/atombios_output.c
index 0a54657f..3e2d301d 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -1801,8 +1801,12 @@ atombios_output_mode_set(xf86OutputPtr output,
case ENCODER_OBJECT_ID_INTERNAL_DAC2:
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
atombios_output_dac_setup(output, ATOM_ENABLE);
- if (radeon_output->active_device & (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT))
- atombios_output_tv_setup(output, ATOM_ENABLE);
+ if (radeon_output->devices & (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT)) {
+ if (radeon_output->active_device & (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT))
+ atombios_output_tv_setup(output, ATOM_ENABLE);
+ else
+ atombios_output_tv_setup(output, ATOM_DISABLE);
+ }
break;
}
atombios_apply_output_quirks(output, adjusted_mode);