[Pkg-fglrx-devel] r498 - in fglrx-driver/trunk/debian: . patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2010-10-31 10:47:19 +0000 (Sun, 31 Oct 2010)
New Revision: 498

Added:
   fglrx-driver/trunk/debian/patches/02-dkms-arch_compat.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
- Remove merged patch 04-dkms-compat_alloc_user_space-rename, but add
  02-dkms-arch_compat.diff, because the AMD fix does not work if you build
  the module with dkms.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-10-31 10:08:58 UTC (rev 497)
+++ fglrx-driver/trunk/debian/changelog	2010-10-31 10:47:19 UTC (rev 498)
@@ -1,7 +1,9 @@
 fglrx-driver (1:10-10-1) UNRELEASED; urgency=low
 
   * New upstream release.
-    - Remove merged patch 04-dkms-compat_alloc_user_space-rename.
+    - Remove merged patch 04-dkms-compat_alloc_user_space-rename, but add
+      02-dkms-arch_compat.diff, because the AMD fix does not work if you build
+      the module with dkms.
     - amdcccle does not complain anymore about the InputClass section.
       Closes: #590456
   * Add patch 04-2.6.36-support.diff from Balázs Hámorszky for adding Linux
@@ -11,7 +13,7 @@
     files.
     Closes: #601326
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 31 Oct 2010 11:07:30 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 31 Oct 2010 11:45:58 +0100
 
 fglrx-driver (1:10-9-3) unstable; urgency=high
 

Added: fglrx-driver/trunk/debian/patches/02-dkms-arch_compat.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/02-dkms-arch_compat.diff	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/02-dkms-arch_compat.diff	2010-10-31 10:47:19 UTC (rev 498)
@@ -0,0 +1,14 @@
+# The fix from AMD does not work properly, if you are building fglrx without make.sh (like with dkms).
+# Fix it again..
+
+diff -Naur fglrx-driver-10-10.orig/common/lib/modules/fglrx/build_mod/2.6.x/Makefile fglrx-driver-10-10/common/lib/modules/fglrx/build_mod/2.6.x/Makefile
+--- fglrx-driver-10-10.orig/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2010-10-19 23:41:18.000000000 +0200
++++ fglrx-driver-10-10/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2010-10-31 11:43:24.000000000 +0100
+@@ -66,6 +66,7 @@
+                 -DFGL_GART_RESERVED_SLOT \
+                 -DFGL_LINUX253P1_VMA_API \
+                 -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
++                -DCOMPAT_ALLOC_USER_SPACE=$(shell if grep -q compat_alloc_user_space /lib/modules/$(KERNELRELEASE)/build/Module.symvers ; then echo arch_compat_alloc_user_space ; else echo compat_alloc_user_space ; fi) \
+ 
+ ifeq ($(KERNELRELEASE),)
+ # on first call from remote location we get into this path

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2010-10-31 10:08:58 UTC (rev 497)
+++ fglrx-driver/trunk/debian/patches/series	2010-10-31 10:47:19 UTC (rev 498)
@@ -1,3 +1,4 @@
 01-CONFIG_X86_XEN.diff
+02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff
 04-2.6.36-support.diff