diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-01-26 03:47:32 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-01-26 03:47:32 -0500 |
| commit | 44d9ceacb1fa6e1859d5d8bd1c55405aea24ad85 (patch) | |
| tree | d2b29f68f3d9e163fe5576d2549dfb9c2cfbc50d | |
| parent | 0c24cbcea56c8f36374aca0f8ba849adfbf0ecfe (diff) | |
Fix legacy output setup
don't have assigned encoders at this point. Need to
eventually move this stuff to encoder dev_priv.
| -rw-r--r-- | src/radeon_output.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c index 345252d1..ff307708 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -2071,21 +2071,19 @@ void RADEONInitConnector(xf86OutputPtr output) ScrnInfoPtr pScrn = output->scrn; RADEONInfoPtr info = RADEONPTR(pScrn); RADEONOutputPrivatePtr radeon_output = output->driver_private; - radeon_encoder_ptr radeon_encoder = radeon_get_encoder(output); - - if (radeon_encoder == NULL) - return; radeon_output->rmx_type = RMX_OFF; if (!IS_AVIVO_VARIANT) { - if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DVO1) + /* XXX fix me - move to encoders */ + + if (radeon_output->devices & (ATOM_DEVICE_DFP2_SUPPORT)) RADEONGetExtTMDSInfo(output); - if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_TMDS1) + if (radeon_output->devices & (ATOM_DEVICE_DFP1_SUPPORT)) RADEONGetTMDSInfo(output); - if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC2) { + if (radeon_output->devices & (ATOM_DEVICE_CRT2_SUPPORT)) { if (xf86ReturnOptValBool(info->Options, OPTION_TVDAC_LOAD_DETECT, FALSE)) radeon_output->load_detection = 1; radeon_output->tv_on = FALSE; |