packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx-kernel-fpu.patch, ...

Sun Jul 1 17:09:50 CEST 2012

Author: baggins                      Date: Sun Jul  1 15:09:50 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 12.6
- BIG FAT WARNING: As of 12.6 the support for Radeon HD 2xxx/3xxx/4xxx has been
  dropped, look for xorg-driver-video-fglrx-legacy-12.x package if you have such a card
- WARN redefinition fixed upstream
- updated kernel-fpu patch
- supports xserver 1.12 (ABI 12)

---- Files affected:
packages/xorg-driver-video-fglrx:
   xorg-driver-video-fglrx-kernel-fpu.patch (1.1 -> 1.2) , xorg-driver-video-fglrx.spec (1.290 -> 1.291) , xorg-driver-video-fglrx-WARN.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-kernel-fpu.patch
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-kernel-fpu.patch:1.1 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-kernel-fpu.patch:1.2

--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-kernel-fpu.patch:1.1	Sat Jan 21 22:26:47 2012
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-kernel-fpu.patch	Sun Jul  1 17:09:45 2012
@@ -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
  }
  

================================================================
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.290 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.291
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.290	Sun Jul  1 16:24:19 2012
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec	Sun Jul  1 17:09:45 2012
@@ -29,12 +29,12 @@
 %define		arch_dir	x86_64
 %endif
 
-%define		rel		10
+%define		rel		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.4
+Version:	12.6
 Release:	%{rel}
 Epoch:		1
 License:	AMD Binary (parts are GPL)
@@ -42,7 +42,7 @@
 # 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-md5:	6bd4f0875202390ed7122696db29be77
 Source1:	atieventsd.init
 Source2:	atieventsd.sysconfig
 Source3:	gl.pc.in
@@ -54,7 +54,6 @@
 Patch3:		%{pname}-desktop.patch
 Patch4:		%{pname}-nofinger.patch
 Patch5:		%{pname}-GPL-only.patch
-Patch6:		%{pname}-WARN.patch
 Patch7:		%{pname}-kernel-fpu.patch
 Patch8:		kernel-3.4.patch
 URL:		http://ati.amd.com/support/drivers/linux/linux-radeon.html
@@ -63,7 +62,7 @@
 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:	%{pname}-config
 Suggests:	kernel-video-firegl
@@ -83,15 +82,16 @@
 %define		no_install_post_check_so	1
 
 %description
-Display driver files for the ATI Radeon 8500, 9700, Mobility M9 and
-the FireGL 8700/8800, E1, Z1/X1 graphics accelerators. This package
-provides 2D display drivers and hardware accelerated OpenGL.
+AMD display driver which allows for hardware accelerated rendering
+with ATI Mobility, FireGL and Desktop GPUs. Some of the Desktop and
+Mobility GPUs supported are the Radeon HD 5xxx series to the
+Radeon HD 7xxx series.
 
 %description -l pl.UTF-8
-Sterowniki do kart graficznych ATI Radeon 8500, 9700, Mobility M9 oraz
-graficznych akceleratorów FireGL 8700/8800, E1, Z1/X1. Pakiet
-dostarcza sterowniki obsługujące wyświetlanie 2D oraz sprzętowo
-akcelerowany OpenGL.
+Sterownik AMD umożliwiający sprzętowo akcelerowany rendering do kart
+graficznych ATI Mobility, FireGL i Desktopowych. Niektóre ze
+wspieranych Desktopowych i Mobilnych kart to Radeon HD 5xxx do
+Radeon HD 7xxx.
 
 %package libs
 Summary:	OpenGL (GL and GLX) ATI/AMD libraries
@@ -200,7 +200,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p0
 %patch8 -p1
 
@@ -401,6 +400,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.291  2012/07/01 15:09:45  baggins
+- updated to 12.6
+- BIG FAT WARNING: As of 12.6 the support for Radeon HD 2xxx/3xxx/4xxx has been
+  dropped, look for xorg-driver-video-fglrx-legacy-12.x package if you have such a card
+- WARN redefinition fixed upstream
+- updated kernel-fpu patch
+- supports xserver 1.12 (ABI 12)
+
 Revision 1.290  2012/07/01 14:24:19  baggins
 - rel 10
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-kernel-fpu.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.290&r2=1.291

