commit d34186d66916e7f513936a9ab3113f2f40deff9d
Author: Jan Rękorajski <[email protected]>
Date: Sun Jul 15 22:37:56 2012 +0200
Updated to 12.6 BETA legacy driver
Kernel 3.4 is now supported
Xserver 1.12 (ABI 12) is now supported
kernel-3.4.patch | 24 ------------------
xorg-driver-video-fglrx-WARN.patch | 42 --------------------------------
xorg-driver-video-fglrx-kernel-fpu.patch | 21 +++++++++++++++-
xorg-driver-video-fglrx-legacy-12.x.spec | 24 +++++++++---------
4 files changed, 31 insertions(+), 80 deletions(-)
---
diff --git a/xorg-driver-video-fglrx-kernel-fpu.patch
b/xorg-driver-video-fglrx-kernel-fpu.patch
index d9fb9bc..39132e7 100644
--- a/xorg-driver-video-fglrx-kernel-fpu.patch
+++ b/xorg-driver-video-fglrx-kernel-fpu.patch
@@ -1,18 +1,37 @@
--- 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,16 +5791,7 @@
+@@ -5791,35 +5791,7 @@
*/
void ATI_API_CALL KCL_fpu_begin(void)
{
-#ifdef CONFIG_X86_64
kernel_fpu_begin();
-#else
+-#ifdef TS_USEDFPU
- struct thread_info *cur_task = current_thread_info();
- preempt_disable();
- if (cur_task->status & TS_USEDFPU)
- __save_init_fpu(cur_task->task);
- else
- clts();
+-#else
+- /* TS_USEDFPU is removed in kernel 3.3+ and 3.2.8+ with the commit below:
+- *
https://github.com/torvalds/linux/commit/f94edacf998516ac9d849f7bc6949a703977a7f3
+- */
+- struct task_struct *cur_task = current;
+- preempt_disable();
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
+- /* The thread structure is changed with the commit below for kernel 3.3:
+- *
https://github.com/torvalds/linux/commit/7e16838d94b566a17b65231073d179bc04d590c8
+- */
+- if (cur_task->thread.fpu.has_fpu)
+-#else
+- if (cur_task->thread.has_fpu)
+-#endif
+- __save_init_fpu(cur_task);
+- else
+- clts();
+-#endif
-#endif
}
diff --git a/xorg-driver-video-fglrx-legacy-12.x.spec
b/xorg-driver-video-fglrx-legacy-12.x.spec
index f45fd4e..503eed6 100644
--- a/xorg-driver-video-fglrx-legacy-12.x.spec
+++ b/xorg-driver-video-fglrx-legacy-12.x.spec
@@ -28,19 +28,20 @@
%define arch_dir x86_64
%endif
-%define rel 1
+%define rel 0.1
%define pname xorg-driver-video-fglrx-legacy-12.x
Summary: Linux Drivers for AMD graphics accelerators
Summary(pl.UTF-8): Sterowniki do akceleratorów graficznych AMD
Name: %{pname}%{_alt_kernel}
-Version: 12.4
+Version: 12.6
Release: %{rel}
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: e57d65cb9c9fa470d6d80072d5ab2785
+#Source0: http://www2.ati.com/drivers/linux/amd-driver-installer-%(echo
%{version} | tr . -)-x86.x86_64.run
+Source0:
http://www2.ati.com/drivers/legacy/amd-driver-installer-%{version}-legacy-x86.x86_64.zip
+# Source0-md5: 36d5a91d60673b26705e9ac2df952daf
Source1: atieventsd.init
Source2: atieventsd.sysconfig
Source3: gl.pc.in
@@ -52,16 +53,14 @@ Patch2:
xorg-driver-video-fglrx-x86genericarch.patch
Patch3: xorg-driver-video-fglrx-desktop.patch
Patch4: xorg-driver-video-fglrx-nofinger.patch
Patch5: xorg-driver-video-fglrx-GPL-only.patch
-Patch6: xorg-driver-video-fglrx-WARN.patch
-Patch7: xorg-driver-video-fglrx-kernel-fpu.patch
-Patch8: kernel-3.4.patch
+Patch6: xorg-driver-video-fglrx-kernel-fpu.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) <= 11.0
+Requires: xorg-xserver-server(videodrv-abi) <= 12.0
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
Suggests: kernel-video-firegl
Provides: xorg-driver-video
@@ -184,9 +183,10 @@ AMD kernel module for FireGL support.
Moduł jądra oferujący wsparcie dla AMD FireGL.
%prep
-%setup -q -c -T
+#%setup -q -c -T
+%setup -q -c
-sh %{SOURCE0} --extract .
+sh amd-driver-installer-%{version}-legacy-x86.x86_64.run --extract .
cp -p arch/%{arch_dir}/lib/modules/fglrx/build_mod/*
common/lib/modules/fglrx/build_mod
@@ -198,9 +198,7 @@ cp -p arch/%{arch_dir}/lib/modules/fglrx/build_mod/*
common/lib/modules/fglrx/bu
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p0
-%patch8 -p1
+%patch6 -p0
install -d common{%{_prefix}/{%{_lib},bin,sbin},/etc}
cp -a %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir}
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
