diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2012-02-24 09:35:39 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2012-02-24 09:39:59 -0500 |
| commit | 878454ae8d8e96dd27a19d0b30940d014c4cd7e2 (patch) | |
| tree | fe1cf0190154e366a4abe16a31d1668fb9cab6e2 | |
| parent | 688c8a54a00b01e73a11970ad2abe858f8c7c5c4 (diff) | |
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@xs4all.nl>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
| -rw-r--r-- | src/radeon_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c index ccde346e..5abd60e2 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; |