summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <alex@cube.(none)>2008-03-11 13:38:29 -0400
committerAlex Deucher <alex@cube.(none)>2008-03-11 13:38:29 -0400
commit552615ccc5360baafb8bb41698c1ca27816fd4b2 (patch)
tree49b674cd7bd46b3b40773416731056828c5b04b9 /src
parent78b10487cf222c96f8944ba25e2ea970506b3535 (diff)
ATOMBIOS: enable load detection by default on both DACs
Load detection is reliable with atom, so enable it by default on both DACA and DACB, rather than just DACA.
Diffstat (limited to 'src')
-rw-r--r--src/radeon_output.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c
index cee3ca96..0fbfdef5 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -2177,16 +2177,17 @@ void RADEONInitConnector(xf86OutputPtr output)
RADEONInfoPtr info = RADEONPTR(pScrn);
RADEONOutputPrivatePtr radeon_output = output->driver_private;
- if (radeon_output->DACType == DAC_PRIMARY)
+ if (info->IsAtomBios &&
+ ((radeon_output->DACType == DAC_PRIMARY) ||
+ (radeon_output->DACType == DAC_TVDAC)))
+ radeon_output->load_detection = 1;
+ else if (radeon_output->DACType == DAC_PRIMARY)
radeon_output->load_detection = 1; /* primary dac, only drives vga */
- /*else if (radeon_output->DACType == DAC_TVDAC &&
- info->tvdac_use_count < 2)
- radeon_output->load_detection = 1;*/ /* only one output with tvdac */
else if ((radeon_output->DACType == DAC_TVDAC) &&
(xf86ReturnOptValBool(info->Options, OPTION_TVDAC_LOAD_DETECT, FALSE)))
radeon_output->load_detection = 1; /* shared tvdac between vga/dvi/tv */
else
- radeon_output->load_detection = 0; /* shared tvdac between vga/dvi/tv */
+ radeon_output->load_detection = 0;
if (radeon_output->type == OUTPUT_LVDS) {
radeon_output->rmx_type = RMX_FULL;