summaryrefslogtreecommitdiff
path: root/src/radeon_output.c
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2011-02-05 14:05:48 -0500
committerAlex Deucher <alexdeucher@gmail.com>2011-02-05 14:05:48 -0500
commit84450ea9221f32296c1f786a6aa126a08bb9756f (patch)
treed1596b35db0fa8d9ed6f3cecfeaf78835749b1c7 /src/radeon_output.c
parenta27b5dbd9fba689f1814c0888d1b7459b6c6b1a1 (diff)
UMS/DCE3.2: fix segfault
atombios_pick_dig_encoder() needs to be called with a valid crtc assigned. Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Diffstat (limited to 'src/radeon_output.c')
-rw-r--r--src/radeon_output.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 877d711b..f6438705 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -120,6 +120,8 @@ static void
radeon_bios_output_crtc(xf86OutputPtr output);
static void
radeon_bios_output_lock(xf86OutputPtr output, Bool lock);
+extern void
+atombios_pick_dig_encoder(xf86OutputPtr output);
void RADEONPrintPortMap(ScrnInfoPtr pScrn)
{
@@ -731,6 +733,8 @@ radeon_mode_prepare(xf86OutputPtr output)
}
radeon_bios_output_lock(output, TRUE);
+ if (IS_AVIVO_VARIANT)
+ atombios_pick_dig_encoder(output);
radeon_dpms(output, DPMSModeOff);
radeon_crtc_dpms(output->crtc, DPMSModeOff);