6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Includes changes contributed by Liang, Kan <
[email protected]>:
- G41 support patches
- DRM_CAS in libdrm type error can cause deadlock and hang the glxgears.
Includes changes contributed by Martin Bochnig <
[email protected]>:
- Make SUNWxorg-mesa package platform-clean
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, and/or sell copies of the Software, and to permit persons
# to whom the Software is furnished to do so, provided that the above
# copyright notice(s) and this permission notice appear in all copies of
# the Software and that both the above copyright notice(s) and this
# permission notice appear in supporting documentation.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
# Except as contained in this notice, the name of a copyright holder
# shall not be used in advertising or otherwise to promote the sale, use
# or other dealings in this Software without prior written authorization
# of the copyright holder.
Redo the patch for Xorg 1.5. The patch is helpful only for nv driver.
--- hw/xfree86/modes/xf86EdidModes.c.orig Fri Dec 5 15:42:03 2008
+++ hw/xfree86/modes/xf86EdidModes.c Fri Dec 12 15:40:54 2008
@@ -622,6 +622,20 @@
&det_mon->section.d_timings,
preferred,
quirks);
+
+ if (Mode && (DDC->features.input_type == 0) &&
+ (((Mode->HDisplay * 5 / 4) & ~0x07) > Mode->HTotal)) {
+ struct detailed_timings *dt = &DDC->det_mon[i].section.d_timings;
+ DisplayModeRec *cvtmode;
+
+ cvtmode = xf86CVTMode(dt->h_active, dt->v_active,
+ (double) xf86ModeVRefresh(Mode), TRUE, FALSE);
+ memcpy(Mode, cvtmode, sizeof(DisplayModeRec));
+ Mode->type = M_T_DRIVER;
+ if (preferred)
+ Mode->type |= M_T_PREFERRED;
+ }
+
preferred = FALSE;
Modes = xf86ModesAdd(Modes, Mode);
break;