diff options
| author | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2008-01-04 20:16:19 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2008-01-04 20:16:19 -0500 |
| commit | b8e8db4675d07e45782de0d7c67ee0fd85eaedb3 (patch) | |
| tree | 4306f25f63f08acd7d772f474bdf6a02d30afc9d /src | |
| parent | 3ba7f393d0669df36848715799de8affc10a5534 (diff) | |
RADEON: fix tvdac load detection at server start up
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon_output.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c index c1a0ba8..d2c6e2b 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -794,12 +794,7 @@ radeon_create_resources(xf86OutputPtr output) "RRConfigureOutputProperty error, %d\n", err); } - if (radeon_output->DACType == DAC_PRIMARY) - data = 1; /* primary dac, only drives vga */ - /*else if (radeon_output->DACType == DAC_TVDAC && - info->tvdac_use_count < 2) - data = 1;*/ /* only one output with tvdac */ - else if (xf86ReturnOptValBool(info->Options, OPTION_TVDAC_LOAD_DETECT, FALSE)) + if (radeon_output->load_detection) data = 1; /* user forces on tv dac load detection */ else data = 0; /* shared tvdac between vga/dvi/tv */ @@ -1722,6 +1717,9 @@ void RADEONInitConnector(xf86OutputPtr output) /*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 */ |