Updated to 12.8

Kernel 3.4 is now supported upstream
Xserver ABI 12.1 is safe

diff --git a/kernel-3.4.patch b/kernel-3.4.patch
deleted file mode 100644 (file)
index 3d4e53d..0000000
--- a/kernel-3.4.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c       2012-05-26 18:33:25.044695179 +0200
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c       2012-05-26 18:28:39.692699095 +0200
-@@ -4154,7 +4154,7 @@
- {
-     unsigned int p;
-     KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init);
--    for_each_cpu_mask(p, cpu_possible_map)
-+    for_each_possible_cpu(p)
-     {
-         KCL_DEBUG1(FN_FIREGL_KAS,"Setting initial execution level for CPU # %d\n", p);
-         preempt_disable();
---- a/common/lib/modules/fglrx/build_mod/kcl_ioctl.c   2012-05-26 19:11:03.402987821 +0200
-+++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c   2012-05-26 19:13:00.273986422 +0200
-@@ -217,6 +217,10 @@
-  *  \param size [in] Number of bytes to allocate
-  *  \return Pointer to allocated memory
-  */
-+#ifndef CONFIG_X86_X32
-+DEFINE_PER_CPU(unsigned long, old_rsp);
-+#endif
-+
- void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
- {
-     void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
\ No newline at end of file

diff --git a/xorg-driver-video-fglrx-kernel-fpu.patch b/xorg-driver-video-fglrx-kernel-fpu.patch
index 39132e7bcd8fd616b2cc01ab84bf1e2a25a14feb..ef05d37abb950ef6d3093e8f86b251165f600846 100644 (file)
--- a/xorg-driver-video-fglrx-kernel-fpu.patch
+++ b/xorg-driver-video-fglrx-kernel-fpu.patch
@@ -1,6 +1,6 @@
 --- common/lib/modules/fglrx/build_mod/firegl_public.c.orig    2012-01-21 21:44:22.000000000 +0100
 +++ common/lib/modules/fglrx/build_mod/firegl_public.c 2012-01-21 22:21:45.126304477 +0100
-@@ -5791,35 +5791,7 @@
+@@ -5791,36 +5791,7 @@
   */
  void ATI_API_CALL KCL_fpu_begin(void)
  {
@@ -8,10 +8,11 @@
      kernel_fpu_begin();
 -#else
 -#ifdef TS_USEDFPU
--    struct thread_info *cur_task = current_thread_info();
+-    struct thread_info *cur_thread = current_thread_info();
+-    struct task_struct *cur_task = get_current();
 -    preempt_disable();
--    if (cur_task->status & TS_USEDFPU)
--        __save_init_fpu(cur_task->task);
+-    if (cur_thread->status & TS_USEDFPU)
+-        __save_init_fpu(cur_task);
 -    else
 -        clts();
 -#else

diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index 856433f9d0af95eeec204971f4c1b2fc53b57587..2922810d5095eb9245c662a351744d7deffee21a 100644 (file)
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -28,20 +28,22 @@
 %define                arch_dir        x86_64
 %endif
 
-%define                rel             3
+%define                intver          8.982
+
+%define                rel             0.1
 %define                pname           xorg-driver-video-fglrx
 Summary:       Linux Drivers for AMD/ATI graphics accelerators
 Summary(pl.UTF-8):     Sterowniki do akceleratorów graficznych AMD/ATI
 Name:          %{pname}%{_alt_kernel}
-Version:       12.6
+Version:       12.8
 Release:       %{rel}
 Epoch:         1
 License:       AMD Binary (parts are GPL)
 Group:         X11
 # Download http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx?type=2.4.1&product=2.4.1.3.42&lang=English
 # or go to http://support.amd.com/ click through "download drivers", desktop -> radeon hd -> 4xxx -> linux
-Source0:       http://www2.ati.com/drivers/linux/amd-driver-installer-%(echo %{version} | tr . -)-x86.x86_64.run
-# Source0-md5: 6bd4f0875202390ed7122696db29be77
+Source0:       http://www2.ati.com/drivers/linux/amd-driver-installer-%(echo %{version} | tr . -)-x86.x86_64.zip
+# Source0-md5: 41c5478322b13be6909eeb46412a3aa0
 Source1:       atieventsd.init
 Source2:       atieventsd.sysconfig
 Source3:       gl.pc.in
@@ -54,14 +56,13 @@ Patch3:             %{pname}-desktop.patch
 Patch4:                %{pname}-nofinger.patch
 Patch5:                %{pname}-GPL-only.patch
 Patch7:                %{pname}-kernel-fpu.patch
-Patch8:                kernel-3.4.patch
 URL:           http://ati.amd.com/support/drivers/linux/linux-radeon.html
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires: rpmbuild(macros) >= 1.379
 BuildRequires: sed >= 4.0
 Requires:      %{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:      xorg-xserver-server
-Requires:      xorg-xserver-server(videodrv-abi) <= 12.0
+Requires:      xorg-xserver-server(videodrv-abi) <= 12.1
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
 Suggests:      kernel-video-firegl
 Provides:      xorg-driver-video
@@ -184,9 +185,11 @@ ATI kernel module for FireGL support.
 Moduł jądra oferujący wsparcie dla ATI FireGL.
 
 %prep
-%setup -q -c -T
+#%setup -q -c -T
+%setup -q -c
 
-sh %{SOURCE0} --extract .
+#sh %{SOURCE0} --extract .
+sh amd-driver-installer-%{intver}-x86.x86_64.run --extract .
 
 cp -p arch/%{arch_dir}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/build_mod
 
@@ -199,7 +202,6 @@ cp -p arch/%{arch_dir}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/bu
 %patch4 -p1
 %patch5 -p1
 %patch7 -p0
-%patch8 -p1
 
 install -d common{%{_prefix}/{%{_lib},bin,sbin},/etc}
 cp -a %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir}