xf86-video-ati: Branch 'master'
Alex Deucher
agd5f at kemper.freedesktop.org
Thu Oct 11 16:10:55 PDT 2007
src/radeon_modes.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
diff-tree 1148d332f52f3780897aae3fcd5d6a67687c42cd (from 905b19df33d6f912336b65895e97775ffec07728)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date: Thu Oct 11 19:09:45 2007 -0400
RADEON: fix potential crash in mode handling
diff --git a/src/radeon_modes.c b/src/radeon_modes.c
index 6252ea0..e01c1e1 100644
--- a/src/radeon_modes.c
+++ b/src/radeon_modes.c
@@ -224,11 +224,13 @@ RADEONProbeOutputModes(xf86OutputPtr out
if (output->status == XF86OutputStatusConnected) {
if (radeon_output->type == OUTPUT_DVI || radeon_output->type == OUTPUT_VGA) {
- edid_mon = xf86OutputGetEDID (output, radeon_output->pI2CBus);
- xf86OutputSetEDID (output, edid_mon);
+ if (output->MonInfo) {
+ edid_mon = xf86OutputGetEDID (output, radeon_output->pI2CBus);
+ xf86OutputSetEDID (output, edid_mon);
- modes = xf86OutputGetEDIDModes (output);
- return modes;
+ modes = xf86OutputGetEDIDModes (output);
+ return modes;
+ }
}
if (radeon_output->type == OUTPUT_STV || radeon_output->type == OUTPUT_CTV) {
modes = RADEONTVModes(output);
More information about the xorg-commit
mailing list