rpms/xorg-x11-drv-ati/F-9 r128-bios-size.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.91, 1.92

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16617

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	r128-bios-size.patch 
Log Message:
* Thu Apr 24 2008 Dave Airlie <airlied at redhat.com> 6.8.0-11
- fix r128 bios size issue (#439022)


r128-bios-size.patch:

--- NEW FILE r128-bios-size.patch ---
diff -up xf86-video-ati-6.8.0/src/r128_driver.c.bios_size xf86-video-ati-6.8.0/src/r128_driver.c
--- xf86-video-ati-6.8.0/src/r128_driver.c.bios_size	2008-04-24 16:12:13.000000000 +1000
+++ xf86-video-ati-6.8.0/src/r128_driver.c	2008-04-24 16:12:16.000000000 +1000
@@ -490,7 +490,8 @@ static Bool R128GetBIOSParameters(ScrnIn
 			(info->VBIOS[(v) + 3] << 24))
 
 #ifdef XSERVER_LIBPCIACCESS
-    info->VBIOS = xalloc(info->PciInfo->rom_size);
+    int size = info->PciInfo->rom_size > R128_VBIOS_SIZE ? info->PciInfo->rom_size : R128_VBIOS_SIZE;
+    info->VBIOS = xalloc(size);
 #else
     info->VBIOS = xalloc(R128_VBIOS_SIZE);
 #endif


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-9/xorg-x11-drv-ati.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- xorg-x11-drv-ati.spec	6 Apr 2008 07:14:38 -0000	1.91
+++ xorg-x11-drv-ati.spec	24 Apr 2008 06:15:55 -0000	1.92
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.8.0
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -22,6 +22,7 @@
 Patch4:     radeon-6.7.196-faster-ddc.patch
 
 # Rage 128 patches (100-199)
+Patch100: r128-bios-size.patch
 
 # mach64 patches (200-299)
 Patch200: mach64-ia64-pagesize.patch
@@ -49,6 +50,7 @@
 %patch2 -p1 -b .git2
 %patch4 -p1 -b .ddc
 
+%patch100 -p1 -b .r128-bios
 %patch200 -p1 -b .mach64-ia64
 
 %build
@@ -89,6 +91,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Apr 24 2008 Dave Airlie <airlied at redhat.com> 6.8.0-11
+- fix r128 bios size issue (#439022)
+
 * Sun Apr 06 2008 Dave Airlie <airlied at redhat.com> 6.8.0-10
 - attempt to fix VT switch and X restart hangs