From 84450ea9221f32296c1f786a6aa126a08bb9756f Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Sat, 5 Feb 2011 14:05:48 -0500 Subject: UMS/DCE3.2: fix segfault atombios_pick_dig_encoder() needs to be called with a valid crtc assigned. Signed-off-by: Alex Deucher --- src/radeon_output.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/radeon_output.c') 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); -- cgit v1.2.3