[Pkg-fglrx-devel] r1120 - in fglrx-driver/branches/experimental/debian: . patches

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-10-12 14:06:56 +0000 (Fri, 12 Oct 2012)
New Revision: 1120

Removed:
   fglrx-driver/branches/experimental/debian/patches/01-fglrx_kernel_3.5.0.diff
Modified:
   fglrx-driver/branches/experimental/debian/changelog
   fglrx-driver/branches/experimental/debian/patches/series
Log:
drop patch 01-fglrx_kernel_3.5.0, fixed upstream

Modified: fglrx-driver/branches/experimental/debian/changelog
===================================================================
--- fglrx-driver/branches/experimental/debian/changelog	2012-10-12 13:32:57 UTC (rev 1119)
+++ fglrx-driver/branches/experimental/debian/changelog	2012-10-12 14:06:56 UTC (rev 1120)
@@ -3,6 +3,7 @@
   * New upstream beta 12-9 (2012-09-26) (9.00).
   * debian/watch, debian/rules: Mangle upstream version to substitute dash
     with point, changing the versioning scheme from YY-MM to YY.MM.
+  * Drop patch 01-fglrx_kernel_3.5.0, fixed upstream.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Fri, 12 Oct 2012 14:56:47 +0200
 

Deleted: fglrx-driver/branches/experimental/debian/patches/01-fglrx_kernel_3.5.0.diff
===================================================================
--- fglrx-driver/branches/experimental/debian/patches/01-fglrx_kernel_3.5.0.diff	2012-10-12 13:32:57 UTC (rev 1119)
+++ fglrx-driver/branches/experimental/debian/patches/01-fglrx_kernel_3.5.0.diff	2012-10-12 14:06:56 UTC (rev 1120)
@@ -1,65 +0,0 @@
-From: "Hans-Frieder Vogt" <hfvogt at gmx.net>
-Subject: [PATCH] fglrx-modules-dkms / fglrx-modules-src: Linux 3.5 support
-Date: Sun, 22 Jul 2012 22:50:48 +0200
-
-Andreas,
-please find attached a patch to support linux 3.5 with the fglrx driver 12-6. Thanks for your effort in creating debian 
-packages of the ATI/AMD driver.
-
-Best regards,
-Hans-Frieder
-
-Patch for fglrx 12-6 kernel module source to support linux 3.5. Tested with various release candidates and with the final 
-version 3.5.
-
-Signed-off-by: Hans-Frieder Vogt <hfvogt at gmx.net>
-
- firegl_public.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-30 21:26:40.000000000 +0200
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-07-08 10:05:36.109924741 +0200
-@@ -2123,9 +2123,13 @@ unsigned long ATI_API_CALL KCL_MEM_Alloc
-     flags = MAP_SHARED;
-     prot  = PROT_READ|PROT_WRITE;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) 
-+    vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
-+#else
-     down_write(&current->mm->mmap_sem);
-     vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
-     up_write(&current->mm->mmap_sem);
-+#endif
-     if (IS_ERR(vaddr))
-        return 0;
-     else
-@@ -2136,18 +2140,27 @@ int ATI_API_CALL KCL_MEM_ReleaseLinearAd
- {
-     int retcode = 0;
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) 
-     down_write(&current->mm->mmap_sem);
-+#endif
- #ifdef FGL_LINUX_RHEL_MUNMAP_API
-     retcode = do_munmap(current->mm,
-                         addr,
-                         len,
-                         1);
- #else
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) 
-+    retcode = vm_munmap(addr,
-+                        len);
-+#else
-     retcode = do_munmap(current->mm,
-                         addr,
-                         len);
- #endif                        
-+#endif                        
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) 
-     up_write(&current->mm->mmap_sem);
-+#endif                        
-     return retcode;
- }
- 
-
-Hans-Frieder Vogt                       e-mail: hfvogt <at> gmx .dot. net

Modified: fglrx-driver/branches/experimental/debian/patches/series
===================================================================
--- fglrx-driver/branches/experimental/debian/patches/series	2012-10-12 13:32:57 UTC (rev 1119)
+++ fglrx-driver/branches/experimental/debian/patches/series	2012-10-12 14:06:56 UTC (rev 1120)
@@ -1,3 +1,2 @@
-01-fglrx_kernel_3.5.0.diff
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff