- patches needed to compile firegl on 2.6.12 kernel - commented out for now

  as I suspect these break things on < 2.6.12 kernels

Changed files:
    X11-driver-firegl-inter_module_get.patch -> 1.1
    X11-driver-firegl-pci_name.patch -> 1.1
    X11-driver-firegl.spec -> 1.97

diff --git a/X11-driver-firegl-inter_module_get.patch b/X11-driver-firegl-inter_module_get.patch
new file mode 100644 (file)
index 0000000..44a4744
--- /dev/null
+++ b/X11-driver-firegl-inter_module_get.patch
@@ -0,0 +1,24 @@
+diff -burN X11-driver-firegl-8.14.13.orig/lib/modules/fglrx/build_mod/firegl_public.c X11-driver-firegl-8.14.13/lib/modules/fglrx/build_mod/firegl_public.c
+--- X11-driver-firegl-8.14.13.orig/lib/modules/fglrx/build_mod/firegl_public.c 2005-07-27 13:16:10.000000000 +0000
++++ X11-driver-firegl-8.14.13/lib/modules/fglrx/build_mod/firegl_public.c      2005-07-27 13:49:31.000000000 +0000
+@@ -340,17 +340,17 @@
+ struct firegl_drm_stub_info_t *firegl_stub_pointer = NULL;
+ #define inter_module_put(x)
+ #define inter_module_unregister(x)
+-#define inter_module_get(x)             firegl_stub_pointer
++#define inter_module_get_request(x,y)             firegl_stub_pointer
+ #define inter_module_register(x,y,z)    do { firegl_stub_pointer = z; } while (0)
+ /* This is a kludge for backward compatibility that is only useful in DRM(stub_open) */
+ #define fops_put(fops)      MOD_DEC_USE_COUNT
+ #define fops_get(fops)      (fops); MOD_INC_USE_COUNT
+ #endif // LINUX_VERSION_CODE < 0x020400
+ 
+-#define DRM_MODULE_GET          (firegl_drm_stub_info_t *)inter_module_get("drm")
++#define DRM_MODULE_GET          (firegl_drm_stub_info_t *)inter_module_get_request("drm","drm")
+ #define DRM_MODULE_PUT          inter_module_put("drm")
+ 
+-#define DRM_AGP_MODULE_GET      (drm_agp_t *)inter_module_get("drm_agp")
++#define DRM_AGP_MODULE_GET      (drm_agp_t *)inter_module_get_request("drm_agp","drm_agp")
+ #define DRM_AGP_MODULE_PUT      inter_module_put("drm_agp")
+ 
+ unsigned long ATI_API_CALL __ke_cpu_to_le32(unsigned long _u)

diff --git a/X11-driver-firegl-pci_name.patch b/X11-driver-firegl-pci_name.patch
new file mode 100644 (file)
index 0000000..8d092c3
--- /dev/null
+++ b/X11-driver-firegl-pci_name.patch
@@ -0,0 +1,69 @@
+diff -burN X11-driver-firegl-8.14.13.orig/lib/modules/fglrx/build_mod/agpgart_be.c X11-driver-firegl-8.14.13/lib/modules/fglrx/build_mod/agpgart_be.c
+--- X11-driver-firegl-8.14.13.orig/lib/modules/fglrx/build_mod/agpgart_be.c    2005-07-27 13:16:10.000000000 +0000
++++ X11-driver-firegl-8.14.13/lib/modules/fglrx/build_mod/agpgart_be.c 2005-07-27 13:19:22.000000000 +0000
+@@ -7067,7 +7067,7 @@
+                       if ( agp_bridge.capndx )
+             {
+                               printk(KERN_INFO PFX "Detected HP ZX1 AGP "
+-                                     "chipset at %s\n", dev->slot_name);
++                                     "chipset at %s\n", pci_name(dev));
+                               agp_bridge.type = HP_ZX1;
+                               agp_bridge.dev = dev;
+                       /* fill in the mode register */
+@@ -7133,7 +7133,7 @@
+                 if( cap_ptr )
+                 {
+                               printk(KERN_INFO PFX "Detected a Via Apollo KT400 chipset in AGP v3 mode "
+-                                     "at %s\n", dev->slot_name);
++                                     "at %s\n", pci_name(dev));
+ 
+                     agp_bridge.type = VIA_APOLLO_KT400;
+                               agp_bridge.dev = dev;
+@@ -7153,12 +7153,12 @@
+                 if( cap_ptr )
+                 {
+                               printk(KERN_DEBUG PFX "Detected a Via Apollo KT400 chipset in AGP v2 compat mode "
+-                                     "at %s\n", dev->slot_name);
++                                     "at %s\n", pci_name(dev));
+                 }
+                 else
+                 {
+                               printk(KERN_ERR PFX "Detected a Via Apollo KT400 chipset but no AGPv2/v3 caps found "
+-                                     "at %s\n", dev->slot_name);
++                                     "at %s\n", pci_name(dev));
+                 }
+             }
+             break;
+@@ -7184,7 +7184,7 @@
+                 if( cap_ptr )
+                 {
+                     printk(KERN_INFO PFX "Detected a Via P4X400 chipset in AGP v3 mode "
+-                           "at %s\n", dev->slot_name);
++                           "at %s\n", pci_name(dev));
+ 
+                     agp_bridge.type = VIA_APOLLO_P4X400;
+                     agp_bridge.dev = dev;
+@@ -7204,7 +7204,7 @@
+                 if( cap_ptr )
+                 {
+                     printk(KERN_INFO PFX "Detected a Via P4X400 chipset with AGP v3.x caps in AGP v2 compatibility mode "
+-                           "at %s\n", dev->slot_name);
++                           "at %s\n", pci_name(dev));
+ 
+                     agp_bridge.type = VIA_APOLLO_P4X400;
+                     agp_bridge.dev = dev;
+@@ -7224,12 +7224,12 @@
+                 if( cap_ptr )
+                 {
+                     printk(KERN_DEBUG PFX "Detected a Via P4X400 chipset with AGP v2 caps in true AGP v2 mode "
+-                           "at %s\n", dev->slot_name);
++                           "at %s\n", pci_name(dev));
+                 }
+                 else
+                 {
+                     printk(KERN_ERR PFX "Detected a Via P4X400 chipset but no AGPv2/v3 caps found "
+-                           "at %s\n", dev->slot_name);
++                           "at %s\n", pci_name(dev));
+                 }
+             }
+             break;

diff --git a/X11-driver-firegl.spec b/X11-driver-firegl.spec
index f73bce63bc76fecf945e4ec568566a8f834ad03d..e2de895408e3f4d3aac780588f4bab4fa80dbd9d 100644 (file)
--- a/X11-driver-firegl.spec
+++ b/X11-driver-firegl.spec
@@ -45,6 +45,10 @@ Patch0:              firegl-panel.patch
 Patch1:                firegl-panel-ugliness.patch
 Patch2:                %{name}-kh.patch
 Patch3:                %{name}-viak8t.patch
+# needed to compile with linux kernel 2.6.12 or newer
+# NOTE: You have to uncommented these in %prep (I thinks these may brake build on < 2.6.12)
+Patch4:                %{name}-pci_name.patch
+Patch5:                %{name}-inter_module_get.patch
 URL:           http://www.ati.com/support/drivers/linux/radeon-linux.html
 BuildRequires: cpio
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
@@ -129,6 +133,8 @@ tar -xzf usr/src/ATI/fglrx_panel_sources.tgz -C panel_src
 %patch1 -p1
 %{?with_dist_kernel:%patch2 -p1}
 %patch3 -p1
+#%patch4 -p1
+#%patch5 -p1
 
 %build
 %if %{with kernel}