SOURCES: X11-driver-firegl-intermodule.patch (NEW), X11-driver-fir...

[baggins]

Author: baggins                      Date: Mon Apr 24 12:12:19 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- patches from Debian for kernel 2.6.16

---- Files affected:
SOURCES:
   X11-driver-firegl-intermodule.patch (NONE -> 1.1)  (NEW), X11-driver-firegl-noiommu.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/X11-driver-firegl-intermodule.patch
diff -u /dev/null SOURCES/X11-driver-firegl-intermodule.patch:1.1
--- /dev/null	Mon Apr 24 14:12:19 2006
+++ SOURCES/X11-driver-firegl-intermodule.patch	Mon Apr 24 14:12:12 2006
@@ -0,0 +1,19 @@
+--- X11-driver-firegl-8.23.7/common/lib/modules/fglrx/build_mod/firegl_public.c-orig	2006-02-23 14:54:16.386740016 -0600
++++ X11-driver-firegl-8.23.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2006-02-23 14:56:38.054203288 -0600
+@@ -361,13 +361,15 @@
+ } firegl_drm_stub_info_t;
+ static firegl_drm_stub_info_t firegl_stub_info;
+ 
+-#if LINUX_VERSION_CODE < 0x020400
++#if LINUX_VERSION_CODE > 0x02060F
+ struct firegl_drm_stub_info_t *firegl_stub_pointer = NULL;
+ #define inter_module_put(x)
+ #define inter_module_unregister(x)
+ #define inter_module_get_request(x,y)   firegl_stub_pointer
+ #define inter_module_register(x,y,z)    do { firegl_stub_pointer = z; } while (0)
++#endif
+ /* This is a kludge for backward compatibility that is only useful in DRM(stub_open) */
++#if LINUX_VERSION_CODE < 0x020400
+ #define fops_put(fops)      MOD_DEC_USE_COUNT
+ #define fops_get(fops)      (fops); MOD_INC_USE_COUNT
+ #endif // LINUX_VERSION_CODE < 0x020400

================================================================
Index: SOURCES/X11-driver-firegl-noiommu.patch
diff -u /dev/null SOURCES/X11-driver-firegl-noiommu.patch:1.1
--- /dev/null	Mon Apr 24 14:12:19 2006
+++ SOURCES/X11-driver-firegl-noiommu.patch	Mon Apr 24 14:12:12 2006
@@ -0,0 +1,11 @@
+--- X11-driver-firegl-8.23.7/common/lib/modules/fglrx/build_mod/firegl_public.c.orig	2006-03-21 15:32:05.000000000 +0100
++++ X11-driver-firegl-8.23.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2006-03-21 15:38:06.000000000 +0100
+@@ -2353,7 +2353,7 @@
+ 
+ int ATI_API_CALL __ke_no_iommu(void)
+ {
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+ #ifdef CONFIG_GART_IOMMU
+     return no_iommu;
+ #else /* !CONFIG_GART_IOMMU */
================================================================