xf86-video-ati: Branch 'master'
Alex Deucher
agd5f at kemper.freedesktop.org
Fri Feb 24 06:42:01 PST 2012
src/radeon_output.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 878454ae8d8e96dd27a19d0b30940d014c4cd7e2
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Fri Feb 24 09:35:39 2012 -0500
Fix ConnectorTable crash in radeon_output.c
The sam440ep PPC board requires a ConnectorTable xorg.conf option, but putting
in that option causes the radeon driver to crash. I finally traced it to a
copy-and-paste bug in radeon_output.c as a result of a major rework in commit
82f12e5a40c1fbcb91910a0f8b725c34fff02aae.
The actual crash occurred in RADEONPrintPortMap().
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
diff --git a/src/radeon_output.c b/src/radeon_output.c
index ccde346..5abd60e 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -3002,9 +3002,9 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
info->BiosConnector[i].devices |= ATOM_DEVICE_CRT2_SUPPORT;
if (!radeon_add_encoder(pScrn,
radeon_get_encoder_id_from_supported_device(pScrn,
- ATOM_DEVICE_CRT1_SUPPORT,
+ ATOM_DEVICE_CRT2_SUPPORT,
2),
- ATOM_DEVICE_CRT1_SUPPORT))
+ ATOM_DEVICE_CRT2_SUPPORT))
return FALSE;
info->BiosConnector[i].load_detection = FALSE;
break;
More information about the xorg-commit
mailing list