diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-01-28 01:28:52 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2010-02-01 12:07:26 -0500 |
| commit | c05cad56b69d239fa2e69905d15f4f08b9db4c55 (patch) | |
| tree | ce7b1eede125772840195be0a4e4970e249c8d7d /src/radeon_output.c | |
| parent | ed63e1b1abe8810b5da6b4140892337eef08a9ea (diff) | |
evergreen: add base asic support
Diffstat (limited to 'src/radeon_output.c')
| -rw-r--r-- | src/radeon_output.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c index 3a18302a..3bc2f003 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -920,6 +920,10 @@ radeon_bios_output_crtc(xf86OutputPtr output) xf86CrtcPtr crtc = output->crtc; RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private; + /* no need to update crtc routing scratch regs on DCE4 */ + if (IS_DCE4_VARIANT) + return; + if (info->IsAtomBios) { if (radeon_output->active_device & ATOM_DEVICE_TV1_SUPPORT) { save->bios_3_scratch &= ~ATOM_S3_TV1_CRTC_ACTIVE; @@ -2992,10 +2996,14 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn) return FALSE; } output->driver_private = radeon_output; - output->possible_crtcs = 1; - /* crtc2 can drive LVDS, it just doesn't have RMX */ - if (!(radeon_output->devices & (ATOM_DEVICE_LCD_SUPPORT))) - output->possible_crtcs |= 2; + if (IS_DCE4_VARIANT) { + output->possible_crtcs = 0x3f; + } else { + output->possible_crtcs = 1; + /* crtc2 can drive LVDS, it just doesn't have RMX */ + if (!(radeon_output->devices & (ATOM_DEVICE_LCD_SUPPORT))) + output->possible_crtcs |= 2; + } /* we can clone the DACs, and probably TV-out, but I'm not sure it's worth the trouble */ |