From 471cbe83e45f54af4244c4637bb6a8fd1efde47c Mon Sep 17 00:00:00 2001 From: root Date: Sat, 27 Mar 2010 13:22:52 +0100 Subject: [PATCH] Added ati closed source drivers. --- x11-drivers/ati-drivers/Manifest | 32 + .../ati-drivers/ati-drivers-8.501-r10.ebuild | 443 +++++ .../0001-Linux-2.6.25.x-kernels-support.patch | 27 + ...-return-with-a-value-in-function-ret.patch | 11 + ...nux-2.6.26.x-kernels-firegl_public.c.patch | 1726 +++++++++++++++++ ...nux-2.6.26.x-kernels-firegl_public.h.patch | 38 + x11-drivers/ati-drivers/files/09ati | 3 + .../files/8.37.6/fix-ioctl-for-2.6.22.patch | 17 + .../files/8.40.4/ati-drivers-2.6.23.patch | 41 + .../8.40.4/ati-drivers-8.40.4-warnings.patch | 90 + .../8.433/ati-powermode-opt-path-1.patch | 33 + .../8.443.1/ati-powermode-opt-path-2.patch | 40 + .../8.452/ati-powermode-opt-path-2.patch | 42 + .../8.455.2/ati-powermode-opt-path-2.patch | 42 + .../8.471.3/ati-powermode-opt-path-2.patch | 42 + .../8.476/ati-powermode-opt-path-2.patch | 42 + .../8.532/ati-powermode-opt-path-2.patch | 42 + .../files/8.542/ati-drivers-2.6.27.patch | 97 + .../files/8.552/ati-drivers-xen-8.552.patch | 62 + .../files/8.573/ati-drivers-xen-8.552.patch | 62 + .../8.573/ati-powermode-opt-path-2.patch | 42 + .../files/8.582/ati-drivers-xen-8.552.patch | 62 + .../8.582/ati-powermode-opt-path-2.patch | 42 + .../files/ati-drivers-2.6.19.patch | 67 + .../files/ati-drivers-2.6.20.patch | 73 + .../files/ati-drivers-8.35.5-2.6.19.patch | 33 + .../files/ati-drivers-8.35.5-2.6.20.patch | 11 + .../files/ati-powermode-opt-path.patch | 22 + .../ati-drivers/files/ati-powermode.sh.patch | 32 + x11-drivers/ati-drivers/files/atieventsd.init | 20 + x11-drivers/ati-drivers/files/atieventsd.rc6 | 22 + x11-drivers/ati-drivers/files/libGL.la.in | 32 + 32 files changed, 3390 insertions(+) create mode 100644 x11-drivers/ati-drivers/Manifest create mode 100644 x11-drivers/ati-drivers/ati-drivers-8.501-r10.ebuild create mode 100644 x11-drivers/ati-drivers/files/0001-Linux-2.6.25.x-kernels-support.patch create mode 100644 x11-drivers/ati-drivers/files/0003-GCC-complains-return-with-a-value-in-function-ret.patch create mode 100644 x11-drivers/ati-drivers/files/0004-Linux-2.6.26.x-kernels-firegl_public.c.patch create mode 100644 x11-drivers/ati-drivers/files/0005-Linux-2.6.26.x-kernels-firegl_public.h.patch create mode 100644 x11-drivers/ati-drivers/files/09ati create mode 100644 x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch create mode 100644 x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch create mode 100644 x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch create mode 100644 x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch create mode 100644 x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch create mode 100644 x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch create mode 100644 x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch create mode 100644 x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch create mode 100644 x11-drivers/ati-drivers/files/8.476/ati-powermode-opt-path-2.patch create mode 100644 x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch create mode 100644 x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch create mode 100644 x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch create mode 100644 x11-drivers/ati-drivers/files/8.573/ati-drivers-xen-8.552.patch create mode 100644 x11-drivers/ati-drivers/files/8.573/ati-powermode-opt-path-2.patch create mode 100644 x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch create mode 100644 x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch create mode 100644 x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch create mode 100644 x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch create mode 100644 x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch create mode 100644 x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch create mode 100644 x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch create mode 100644 x11-drivers/ati-drivers/files/ati-powermode.sh.patch create mode 100644 x11-drivers/ati-drivers/files/atieventsd.init create mode 100644 x11-drivers/ati-drivers/files/atieventsd.rc6 create mode 100644 x11-drivers/ati-drivers/files/libGL.la.in diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest new file mode 100644 index 0000000..8e53238 --- /dev/null +++ b/x11-drivers/ati-drivers/Manifest @@ -0,0 +1,32 @@ +AUX 0001-Linux-2.6.25.x-kernels-support.patch 848 RMD160 d0b7ebec8d149e66a94daae533b31dd082efe9ff SHA1 8a6d89d2f773978210d7e1125d148b853e939cbf SHA256 6d9615902f6ba156229f8fff6edaaa84eb4a16704df6f9e27242b1a18c78331e +AUX 0003-GCC-complains-return-with-a-value-in-function-ret.patch 400 RMD160 a71bc58a54efc3a768207c2c1e2d0e04c6fc2ebe SHA1 a22ebc52a6ccfa2ec25b47a860abe4633328f044 SHA256 11c4a2ce3c73dd41fa62793df4c4ac30d614a96703f33cd848f8d5d40da8331b +AUX 0004-Linux-2.6.26.x-kernels-firegl_public.c.patch 55494 RMD160 a3b3c5672a093c316ff739515c1a19e41caf938b SHA1 8cfa106c290069000e4c5e42e8af0febd439babd SHA256 df40f7fd29e78cab6104f068a5fac822b3cda42cb6416b14a516269d3c061999 +AUX 0005-Linux-2.6.26.x-kernels-firegl_public.h.patch 1787 RMD160 16cbc0c1b30d78affd76aae2498f90e6d778f26e SHA1 6e81c4d18710f069e2da6c340ff56ec7372fe559 SHA256 68ccd85f72abfd6b04578a864e1673fbea3d73a862a715b4f4d996e6ff795ccf +AUX 09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 SHA1 01cac55ba02710dbd7d71737dd64dbec2cc081fd SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134 +AUX 8.37.6/fix-ioctl-for-2.6.22.patch 487 RMD160 93e739f8b832529a999ecca2e6a0d447a2ced42f SHA1 5a7e0416be0957d3ed46d0f16cdb25bd1a68359d SHA256 c3df802a987974109db9d439932e88a2cdfa37a37c1a284a56b7b100a3de8f23 +AUX 8.40.4/ati-drivers-2.6.23.patch 1497 RMD160 3bcd335769ee98b2119fc62784d091000115a5bd SHA1 9328ece148ad52c048805b9c2c3a3bf0937b6d16 SHA256 6ea6385e602b9659ca01ef1d53cb53ca955f2396a2d8cc914355d3bb2a590d88 +AUX 8.40.4/ati-drivers-8.40.4-warnings.patch 3262 RMD160 158206cf638fd0f2ee34e8ff02e6a399933f844d SHA1 7b47d4d89ff80e930cd2fc66f513dbaf66de07d5 SHA256 45caca456493c23a6475bbec63df26a33ead8de59bf52e3c06c4433740dc5261 +AUX 8.433/ati-powermode-opt-path-1.patch 1139 RMD160 b42a87eba428241428cee3467156a7c80b601b17 SHA1 7fa50f72453fe4501af40c8178b748aa39c599c9 SHA256 bdbcf9e8ec4a16868c1c1889cd2a4db2f00e5a6778ea6751fc1a1a75ead1f788 +AUX 8.443.1/ati-powermode-opt-path-2.patch 1493 RMD160 6d1275d8800d6703caaca78705eb1864e1142f82 SHA1 9c1df16348da5e3c32303342eeb31ee66f2a3487 SHA256 d8b11aa4974bfc58cc0550eaf988faad32a8b13cc7a92d222481802de2c71465 +AUX 8.452/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 +AUX 8.455.2/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 +AUX 8.471.3/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 +AUX 8.476/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 +AUX 8.532/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 +AUX 8.542/ati-drivers-2.6.27.patch 2930 RMD160 a6c51cc1c9096bfc0453477c195aa54881867995 SHA1 8b229af3a1b0fc625605336f5c8985be72b4360f SHA256 b1130d675b93c7a9dc9c014157ee4ead16d375fd73ee02f6a620018111642e26 +AUX 8.552/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58 +AUX 8.573/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58 +AUX 8.573/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 +AUX 8.582/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58 +AUX 8.582/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 +AUX ati-drivers-2.6.19.patch 3158 RMD160 b9b3af8169f4b0e7cf655f0da9b8dcb7946b204e SHA1 13d009989f24f5c568b156a128adcd8402f47c9a SHA256 278e5d2bbddf1b5956485698684f50609371c6ef1c432fd436c85ee3345e24f6 +AUX ati-drivers-2.6.20.patch 2386 RMD160 8b563155a63ba8d9639fa3b89719b8da49b2c8a3 SHA1 3714fa58e8ead0287d593cf0ed011e22327a5e71 SHA256 12b56122216a2fdba9f52e9939bf33f7d0c262417923ea9596c70337d44dd9f8 +AUX ati-drivers-8.35.5-2.6.19.patch 913 RMD160 511ef4e6eb7fcfa8db5419c05d160c6b538f9bc8 SHA1 adcd3860d1b0877779e85695053cda36511b4c71 SHA256 5c2b1ba7e291e118f37a87e3a653d0a654ee4e95a46c9e3d723ecef72aba1f01 +AUX ati-drivers-8.35.5-2.6.20.patch 333 RMD160 b9ef336b8dd4874854910d8eb62bc15f9ab066bd SHA1 8261034f3e539251adb0ca5b1da880e3f1231559 SHA256 cd4abde649ede2d03b5faa115acc567fcff85b6db39f19ba70d25e194e8973a6 +AUX ati-powermode-opt-path.patch 826 RMD160 450b5c9ecd7f4c123ce12f855b287e6b97e6ad23 SHA1 80725f60def6bd968157f09474c00722865b1f27 SHA256 e1d6dbe2e73c8ed575b2f9188e707fcb90f808d0fbdb686067c16f853662c208 +AUX ati-powermode.sh.patch 1142 RMD160 b81cdd4d2a49c2f7b04f7e00e4391b4e0ad67a40 SHA1 eef7f658474ca8e9e66ee1955a851782eba4dd0e SHA256 050602d5e0656961c0b16a75b470a7327a9e8b16f7d0ae3228341b3a8dcc9289 +AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3 +AUX atieventsd.rc6 590 RMD160 fbf8aba7ada36aed666d506d6b0f7146e1b2f4ad SHA1 b2b457a4122f0a3a5db785df46880351d795fb25 SHA256 a00aa241e53b21872218bd247bfdb6292a075d9ef641f36198d8f4e399cc025e +AUX libGL.la.in 749 RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 SHA1 be41cc2eb1754a44134a95475be5f0cb894e24bc SHA256 a7b4b58b1311f8e1caf83222cb020dfbc48e2881a8deef21eddefa23b3992f13 +DIST ati-driver-installer-8-6-x86.x86_64.run 60476860 RMD160 87ae6e046e5c5cd69e8a43060b129602e876305a SHA1 7dddb509d44466d6c88c024c92272d8d2ae4c99d SHA256 a573b2a34b334b281382344af8e49e41db7286128ac368d8588a9852e5c00e8e +EBUILD ati-drivers-8.501-r10.ebuild 15000 RMD160 5f4966cd3fc11207c6d86b3eb6066b7f3416368b SHA1 a7378b2a88a4a8ecbacf202ba162200247b06459 SHA256 5738fcc09cb296cdc2c81c54cb508b819c121acfd70d64fafe3249f1ea13a9f0 diff --git a/x11-drivers/ati-drivers/ati-drivers-8.501-r10.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.501-r10.ebuild new file mode 100644 index 0000000..f32c94c --- /dev/null +++ b/x11-drivers/ati-drivers/ati-drivers-8.501-r10.ebuild @@ -0,0 +1,443 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.501.ebuild,v 1.3 2008/07/09 22:33:19 opfer Exp $ + +IUSE="acpi debug" + +inherit eutils multilib linux-mod toolchain-funcs versionator + +DESCRIPTION="Ati precompiled drivers for recent chipsets" +HOMEPAGE="http://www.ati.com" +ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/" +SRC_URI="${ATI_URL}/ati-driver-installer-8-6-x86.x86_64.run" + +LICENSE="AMD GPL-2 QPL-1.0 as-is" +KEYWORDS="~amd64 x86" + +# The portage dep is for COLON_SEPARATED support in env-update. +# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update. +RDEPEND="x11-base/xorg-server + !x11-apps/ati-drivers-extra + >=app-admin/eselect-1.0.9 + app-admin/eselect-opengl + amd64? ( app-emulation/emul-linux-x86-xlibs ) + acpi? ( + x11-apps/xauth + sys-power/acpid + ) + x11-libs/libXrandr + >=sys-apps/portage-2.1.1-r1" + +DEPEND="${RDEPEND} + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto + x11-proto/inputproto" + +EMULTILIB_PKG="true" + +QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so + usr/lib/opengl/ati/lib/libGL.so.1.2 + opt/bin/amdcccle" +QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so + usr/lib32/dri/fglrx_dri.so + usr/lib64/opengl/ati/lib/libGL.so.1.2 + usr/lib32/opengl/ati/lib/libGL.so.1.2 + opt/bin/amdcccle" +QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so + usr/lib/xorg/modules/drivers/fglrx_drv.so + usr/lib/opengl/ati/lib/libGL.so.1.2 + usr/lib/xorg/modules/glesx.so + usr/lib/xorg/modules/amdxmm.so" +QA_TEXTRELS_amd64=" + usr/lib64/opengl/ati/lib/libGL.so.1.2 + usr/lib32/opengl/ati/lib/libGL.so.1.2 + usr/lib64/dri/fglrx_dri.so + usr/lib32/dri/fglrx_dri.so + usr/lib32/xorg/modules/glesx.so + usr/lib64/xorg/modules/glesx.so" + +S="${WORKDIR}" + +pkg_setup() { + + # Define module dir. + MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod" + + #check kernel and sets up KV_OBJ + MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)" + BUILD_TARGETS="kmod_build" + linux-mod_pkg_setup + BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}" + + if ! kernel_is 2 6; then + eerror "Need a 2.6 kernel to compile against!" + die "Need a 2.6 kernel to compile against!" + fi + + if kernel_is ge 2 6 25 && linux_chkconfig_present PREEMPT_RCU; then + die "${P} is not compatible RCU Preemption, please disable it" + fi + + if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then + eerror "${P} requires support for pci_find_slot." + die "${P} requires support for pci_find_slot." + fi + + if ! linux_chkconfig_present MTRR; then + ewarn "You don't have MTRR support enabled, the direct rendering will not work." + fi + + if linux_chkconfig_builtin DRM; then + ewarn "You have DRM support enabled builtin, the direct rendering will not work." + fi + + if ! linux_chkconfig_present AGP && \ + ! linux_chkconfig_present PCIEPORTBUS; then + ewarn "You need AGP and/or PCI Express support for direct rendering to work." + fi + + if linux_chkconfig_present PARAVIRT; then + eerror "The current ati-drivers don't compile when having" + eerror "paravirtualization active due to GPL symbol export" + eerror "restrictions." + eerror "Please disable it:" + eerror " CONFIG_PARAVIRT=n" + eerror "in /usr/src/linux/.config or" + eerror " Processor type and features -->" + eerror " [ ] Paravirtualization support (EXPERIMENTAL)" + eerror "in 'menuconfig'" + die "CONFIG_PARAVIRT enabled" + fi + + # Only support xorg-server >=1.1 + BASE_DIR="${S}/x710" + + # This is used like $(get_libdir) for paths in ati's package. + if use amd64 ; then + BASE_DIR="${BASE_DIR}_64a" + PKG_LIBDIR=lib64 + ARCH_DIR="${S}/arch/x86_64" + else + PKG_LIBDIR=lib + ARCH_DIR="${S}/arch/x86" + fi +} + +src_unpack() { + #Switching to a standard way to extract the files since otherwise no signature file + #would be created + local src="${DISTDIR}/${A}" + sh "${src}" --extract "${S}" 2&>1 /dev/null + + #patches needed for kernel 2.6.26 + epatch "${FILESDIR}"/0001-Linux-2.6.25.x-kernels-support.patch + epatch "${FILESDIR}"/0003-GCC-complains-return-with-a-value-in-function-ret.patch + epatch "${FILESDIR}"/0004-Linux-2.6.26.x-kernels-firegl_public.c.patch + epatch "${FILESDIR}"/0005-Linux-2.6.26.x-kernels-firegl_public.h.patch + + # These are the userspace utilities that we also have source for. + # We rebuild these later. + rm \ + "${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \ + "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \ + || die "bin rm failed" + + if use debug; then + # Enable debug mode in the Source Code. + sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \ + "${MODULE_DIR}/firegl_public.c" \ + || die "Failed to enable debug output." + fi + + if use acpi; then + sed -i \ + -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \ + -e "s:/var/lib/gdm/:/var/gdm/:" \ + "${S}/common/etc/ati/authatieventsd.sh" \ + || die "sed failed." + + # Since "who" is in coreutils, we're using that one instead of "finger". + sed -i -e 's:finger:who:' \ + "${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \ + || die "Replacing 'finger' with 'who' failed." + # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and + # add funktion to detect default state. + epatch "${FILESDIR}"/8.476/ati-powermode-opt-path-2.patch + fi + + pushd ${MODULE_DIR} >/dev/null + ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \ + || die "symlinking precompiled core failed" + + convert_to_m 2.6.x/Makefile || die "convert_to_m failed" + + # When built with ati's make.sh it defines a bunch of macros if + # certain .config values are set, falling back to less reliable + # detection methods if linux/autoconf.h is not available. We + # simply use the linux/autoconf.h settings directly, bypassing the + # detection script. + sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed" + sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \ + || die "MODVERSIONS sed failed" + popd >/dev/null + + mkdir extra || die "mkdir failed" + cd extra + unpack ./../common/usr/src/ati/fglrx_sample_source.tgz + sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \ + lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed" + # Add a category. + mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed" + cd .. +} + +src_compile() { + linux-mod_src_compile + + einfo "Building fgl_glxgears" + cd "${S}"/extra/fgl_glxgears + # These extra libs/utils either have an Imakefile that does not + # work very well without tweaking or a Makefile ignoring CFLAGS + # and the like. We bypass those. + + # The -DUSE_GLU is needed to compile using nvidia headers + # according to a comment in ati-drivers-extra-8.33.6.ebuild. + "$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ + -I"${S}"/common/usr/include fgl_glxgears.c \ + -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed" + + einfo "Building fglrx_gamma lib" + cd "${S}"/extra/lib/fglrx_gamma + "$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \ + -DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \ + -lXext || die "fglrx_gamma lib build failed" + ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed" + ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed" + + einfo "Building fglrx_gamma util" + cd "${S}"/extra/programs/fglrx_gamma + "$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \ + -I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \ + fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \ + || die "fglrx_gamma util build failed" + +} + +src_install() { + linux-mod_src_install + + # We can do two things here, and neither of them is very nice. + + # For direct rendering libGL has to be able to load one or more + # dri modules (files ending in _dri.so, like fglrx_dri.so). + # Gentoo's mesa looks for these files in the location specified by + # LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded + # location /usr/$(get_libdir)/dri. Ati's libGL does the same + # thing, but the hardcoded location is /usr/X11R6/lib/modules/dri + # on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64 + # 64bit. So we can either put the .so files in that (unusual, + # compared to "normal" mesa libGL) location or set + # LIBGL_DRIVERS_PATH. We currently do the latter. See also bug + # 101539. + + # The problem with this approach is that LIBGL_DRIVERS_PATH + # *overrides* the default hardcoded location, it does not extend + # it. So if ati-drivers is merged but a non-ati libGL is selected + # and its hardcoded path does not match our LIBGL_DRIVERS_PATH + # (because it changed in a newer mesa or because it was compiled + # for a different set of multilib abis than we are) stuff breaks. + + # We create one file per ABI to work with "native" multilib, see + # below. + + echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep" + doenvd "${T}/03ati-colon-sep" + + # All libraries that we have a 32 bit and 64 bit version of on + # amd64 are installed in src_install-libs. Everything else + # (including libraries only available in native 64bit on amd64) + # goes in here. + + # There used to be some code here that tried to detect running + # under a "native multilib" portage ((precursor of) + # http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it + # should just work (only doing some duplicate work). --marienz + if has_multilib_profile; then + local OABI=${ABI} + for ABI in $(get_install_abis); do + src_install-libs + done + ABI=${OABI} + unset OABI + else + src_install-libs + fi + + # This is sorted by the order the files occur in the source tree. + + # X modules. + exeinto /usr/$(get_libdir)/xorg/modules/drivers + doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so + exeinto /usr/$(get_libdir)/xorg/modules/linux + doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so + exeinto /usr/$(get_libdir)/xorg/modules + doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so,amdxmm.so} + + # Arch-specific files. + # (s)bin. + into /opt + if use acpi; then + dosbin "${ARCH_DIR}"/usr/sbin/atieventsd + fi + # We cleaned out the compilable stuff in src_unpack + dobin "${ARCH_DIR}"/usr/X11R6/bin/* + + # lib. + exeinto /usr/$(get_libdir) + # Everything except for the libGL.so installed in src_install-libs. + doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \ + -maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*') + insinto /usr/$(get_libdir) + doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \ + -maxdepth 1 -type f -not -name '*.so*') + + # Common files. + # etc. + insinto /etc/ati + # Everything except for the authatieventsd.sh script. + doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default} + if use acpi; then + doins common/etc/ati/authatieventsd.sh + fi + + # include. + insinto /usr + doins -r common/usr/include + insinto /usr/include/X11/extensions + doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h + + # Just the atigetsysteminfo.sh script. + into /usr + dosbin common/usr/sbin/* + + # data files for the control panel. + insinto /usr/share + doins -r common/usr/share/ati + insinto /usr/share/pixmaps + doins common/usr/share/icons/ccc_{large,small}.xpm + make_desktop_entry amdcccle 'ATI Catalyst Control Center' \ + ccc_large System + + # doc. + dohtml -r common/usr/share/doc/fglrx + + if use acpi; then + doman common/usr/share/man/man8/atieventsd.8 + + pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null + + exeinto /etc/acpi + doexe ati-powermode.sh + insinto /etc/acpi/events + doins events/* + + popd >/dev/null + fi + + # Done with the "source" tree. Install tools we rebuilt: + dobin extra/fgl_glxgears/fgl_glxgears + newdoc extra/fgl_glxgears/README README.fgl_glxgears + + dolib extra/lib/fglrx_gamma/*so* + newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma + + dobin extra/programs/fglrx_gamma/fglrx_xgamma + doman extra/programs/fglrx_gamma/fglrx_xgamma.1 + newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma + + # Gentoo-specific stuff: + if use acpi; then + newinitd "${FILESDIR}"/atieventsd.init atieventsd \ + || die "Failed to install atieventsd.init.d" + echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf + newconfd "${T}"/atieventsd.conf atieventsd + fi +} + +src_install-libs() { + if [[ "${ABI}" == "amd64" ]]; then + local pkglibdir=lib64 + local MY_ARCH_DIR="${S}/arch/x86_64" + else + local pkglibdir=lib + local MY_ARCH_DIR="${S}/arch/x86" + fi + einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system" + + local ATI_ROOT=/usr/$(get_libdir)/opengl/ati + # To make sure we do not miss a spot when these change. + local libmajor=1 libminor=2 + local libver=${libmajor}.${libminor} + + # The GLX libraries + # (yes, this really is "lib" even on amd64/multilib --marienz) + exeinto ${ATI_ROOT}/lib + doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver} + dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} + dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so + + # Same as the xorg implementation (eselect opengl does not fall + # back to xorg-x11 if we omit this symlink, meaning no glx). + dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions + + # DRI modules, installed into the path used by recent versions of mesa. + exeinto /usr/$(get_libdir)/dri + doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so + + # Make up a libGL.la. Ati does not provide one, but mesa does. If + # a (libtool-based) libfoo is built with libGL.la present a + # reference to it is put into libfoo.la, and compiling + # (libtool-based) things that link too libfoo.la will complain if + # libGL.la disappears. So if we do not make up a libGL.la + # switching between mesa and ati becomes painful. + local revision=$(printf '%d%02d%02d' $(get_version_components)) + sed -e "s:\${libmajor}:${libmajor}:g" \ + -e "s:\${libminor}:${libminor}:g" \ + -e "s:\${libdir}:$(get_libdir):g" \ + -e "s:\${revision}:${revision}:g" \ + "${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \ + || die "sed failed to make libGL.la" + + local envname="${T}"/04ati-dri-path + if [[ -n ${ABI} ]]; then + envname="${envname}-${ABI}" + fi + echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}" + doenvd "${envname}" +} + +pkg_postinst() { + /usr/bin/eselect opengl set --use-old ati + + elog "To switch to ATI OpenGL, run \"eselect opengl set ati\"" + elog "To change your xorg.conf you can use the bundled \"aticonfig\"" + elog + elog "If you experience unexplained segmentation faults and kernel crashes" + elog "with this driver and multi-threaded applications such as wine," + elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2." + elog + elog "You will have to source /etc/profile (or logout and back in) for dri" + elog "to work, unless you previously had ati-drivers installed." + + # Workaroud screen corruption + ewarn "If you experience screen corruption with this driver, try putting" + ewarn ' Option "XAANoOffscreenPixmaps" "true"' + ewarn "in the Device Section of /etc/X11/xorg.conf." + + linux-mod_pkg_postinst +} + +pkg_postrm() { + linux-mod_pkg_postrm + /usr/bin/eselect opengl set --use-old xorg-x11 +} diff --git a/x11-drivers/ati-drivers/files/0001-Linux-2.6.25.x-kernels-support.patch b/x11-drivers/ati-drivers/files/0001-Linux-2.6.25.x-kernels-support.patch new file mode 100644 index 0000000..74c34b0 --- /dev/null +++ b/x11-drivers/ati-drivers/files/0001-Linux-2.6.25.x-kernels-support.patch @@ -0,0 +1,27 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c ++++ common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -4956,8 +4956,9 @@ static unsigned long kasSetExecutionLevel(unsigned long level) + { + unsigned long orig_level; + +- orig_level = __get_cpu_var(kasExecutionLevel); ++ orig_level = get_cpu_var(kasExecutionLevel); + __get_cpu_var(kasExecutionLevel) = level; ++ put_cpu_var(kasExecutionLevel); + + return orig_level; + } +@@ -4969,7 +4970,12 @@ static unsigned long kasSetExecutionLevel(unsigned long level) + */ + static unsigned long kas_GetExecutionLevel(void) + { +- return __get_cpu_var(kasExecutionLevel); ++ unsigned long orig_level; ++ ++ orig_level = get_cpu_var(kasExecutionLevel); ++ put_cpu_var(kasExecutionLevel); ++ ++ return orig_level; + } + + /** \brief Type definition for kas_spin_lock() parameter */ diff --git a/x11-drivers/ati-drivers/files/0003-GCC-complains-return-with-a-value-in-function-ret.patch b/x11-drivers/ati-drivers/files/0003-GCC-complains-return-with-a-value-in-function-ret.patch new file mode 100644 index 0000000..93b78ed --- /dev/null +++ b/x11-drivers/ati-drivers/files/0003-GCC-complains-return-with-a-value-in-function-ret.patch @@ -0,0 +1,11 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c ++++ common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -3190,7 +3190,7 @@ int ATI_API_CALL __ke_register_ioctl32_conversion(unsigned int cmd, int (*handle + void ATI_API_CALL __ke_unregister_ioctl32_conversion(unsigned int cmd) + { + #ifdef FIREGL_IOCTL_COMPAT +- return 0; ++ return; + #else + unregister_ioctl32_conversion(cmd); + #endif diff --git a/x11-drivers/ati-drivers/files/0004-Linux-2.6.26.x-kernels-firegl_public.c.patch b/x11-drivers/ati-drivers/files/0004-Linux-2.6.26.x-kernels-firegl_public.c.patch new file mode 100644 index 0000000..b466c39 --- /dev/null +++ b/x11-drivers/ati-drivers/files/0004-Linux-2.6.26.x-kernels-firegl_public.c.patch @@ -0,0 +1,1726 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c ++++ common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -24,13 +24,13 @@ + // ============================================================ + #include + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) + #error Kernel versions older than 2.6.0 are no longer supported by this module. +-#endif ++#endif + + #include + +-#if !defined(CONFIG_X86_PC) ++#if !defined(CONFIG_X86_PC) + #if !defined(CONFIG_X86_64) + #if !defined(CONFIG_X86_VOYAGER) + #if !defined(CONFIG_X86_NUMAQ) +@@ -62,10 +62,10 @@ + * distribution would even include such a kernel patch. */ + #ifdef CONFIG_MEM_MIRROR + /* Prevent asm/mm_track.h from being included in subsequent +- * kernel headers as that would redefine CONFIG_MEM_MIRROR. */ ++ * kernel headers as that would redefine CONFIG_MEM_MIRROR. */ + #ifndef CONFIG_X86_64 + #define __I386_MMTRACK_H__ +-#define mm_track(ptep) ++#define mm_track(ptep) + #else + #define __X86_64_MMTRACK_H__ + #define mm_track_pte(ptep) +@@ -93,7 +93,7 @@ + #include + #include + #include +-#include ++//#include + #include + #include + #include +@@ -151,8 +151,8 @@ + #include "linux/freezer.h" + #endif + +-// For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h. +-#ifndef UTS_RELEASE ++// For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h. ++#ifndef UTS_RELEASE + #include + #endif + +@@ -210,7 +210,7 @@ char* firegl = NULL; + int __ke_debuglevel = 0; + int __ke_moduleflags = 0; + +-static struct pci_device_id fglrx_pci_table[] = ++static struct pci_device_id fglrx_pci_table[] = + { + #define FGL_ASIC_ID(x) \ + { \ +@@ -278,7 +278,7 @@ const unsigned long __ke_PAE_State = 1; + + static int firegl_pat_enabled = 0; + static unsigned long KCL_pat[2]; +-static unsigned long KCL_orig_pat[2]; ++static unsigned long KCL_orig_pat[2]; + + static int ATI_API_CALL KCL_enable_pat(void); + static void ATI_API_CALL KCL_disable_pat(void); +@@ -305,7 +305,7 @@ long ip_firegl_compat_ioctl(struct file* filp, unsigned int cmd, unsigned long a + #endif + + __ke_ssize_t ip_firegl_read( struct file *filp, +- char *buf, ++ char *buf, + __ke_size_t size, + __ke_loff_t *off_ptr) + { +@@ -313,7 +313,7 @@ __ke_ssize_t ip_firegl_read( struct file *filp, + } + + __ke_ssize_t ip_firegl_write( struct file *filp, +- const char *buf, ++ const char *buf, + __ke_size_t size, + __ke_loff_t *off_ptr) + { +@@ -449,34 +449,34 @@ READ_PROC_WRAP(firegl_debug_info) + READ_PROC_WRAP(firegl_bios_version) + READ_PROC_WRAP(firegl_interrupt_info) + +-static int ++static int + firegl_interrupt_open_wrap( +- struct inode *inode, +- struct file *file) ++ struct inode *inode, ++ struct file *file) + { + return firegl_interrupt_open(inode, file); + } + +-static int ++static int + firegl_interrupt_release_wrap( +- struct inode *inode, +- struct file *file) ++ struct inode *inode, ++ struct file *file) + { + return firegl_interrupt_release(inode, file); + } + +-static ssize_t ++static ssize_t + firegl_interrupt_read_wrap( +- struct file *user_file, +- char __user *user_buf, +- size_t user_buf_size, ++ struct file *user_file, ++ char __user *user_buf, ++ size_t user_buf_size, + loff_t *user_file_pos) + { + return (ssize_t) firegl_interrupt_read(user_file, user_buf, user_buf_size, user_file_pos); + } + +-static unsigned int +-firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) ++static unsigned int ++firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) + { + if(firegl_interrupt_poll(user_file, (__ke_poll_table*)pt)) + { +@@ -488,11 +488,11 @@ firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) + } + } + +-static ssize_t ++static ssize_t + firegl_interrupt_write_wrap( +- struct file *user_file, +- const char __user *user_buf, +- size_t user_buf_size, ++ struct file *user_file, ++ const char __user *user_buf, ++ size_t user_buf_size, + loff_t *user_file_pos) + { + return (ssize_t) firegl_interrupt_write(user_file, user_buf, user_buf_size, user_file_pos); +@@ -502,7 +502,7 @@ firegl_interrupt_write_wrap( + * \param func function to be wrapped + * \return None */ + +-static void ++static void + firegl_smp_func_parameter_wrap( + void *func) + { +@@ -517,7 +517,7 @@ static struct file_operations firegl_interrupt_file_ops = { + .write = firegl_interrupt_write_wrap + }; + +-__ke_proc_list_t firegl_proc_list[] = ++__ke_proc_list_t firegl_proc_list[] = + { + { "name", drm_name_info_wrap, NULL}, + { "mem", drm_mem_info_wrap, NULL}, +@@ -586,11 +586,11 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev, + { + ent->proc_fops = (struct file_operations*)list->fops; + } +- ++ + { + ent->data = (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev); + } +- ++ + list++; + } + +@@ -623,7 +623,7 @@ static int firegl_proc_cleanup( int minor, + { + remove_proc_entry("dri", NULL); + __KE_DEBUG("remove proc dri. \n"); +- } ++ } + return 0; + } + +@@ -661,12 +661,12 @@ static int firegl_stub_getminor(const char *name, struct file_operations *fops, + { + int i; + int count = 0; +- ++ + __KE_DEBUG("firegl_stub_getminor: name=\"%s\"\n", name); + +- for( i = 0; i < FIREGL_STUB_MAXCARDS; i++ ) ++ for( i = 0; i < FIREGL_STUB_MAXCARDS; i++ ) + { +- if( !firegl_stub_list[i].fops ) ++ if( !firegl_stub_list[i].fops ) + { + firegl_stub_list[i].name = name; + firegl_stub_list[i].fops = fops; +@@ -693,16 +693,16 @@ static int firegl_stub_putminor(int minor) + if (minor < 0 || minor >= FIREGL_STUB_MAXCARDS) + { + return -1; +- } ++ } + firegl_proc_cleanup(minor, firegl_stub_root, firegl_stub_list[minor].dev_root, firegl_stub_list[minor].proclist); + firegl_stub_list[minor].name = NULL; + firegl_stub_list[minor].fops = NULL; + firegl_stub_list[minor].proclist = NULL; + +- if( minor == (firegl_minors-1) ) ++ if( minor == (firegl_minors-1) ) + { + unregister_chrdev(DRM_MAJOR, "drm"); +- } ++ } + return 0; + } + +@@ -726,7 +726,7 @@ static int __init firegl_stub_register(const char *name, struct file_operations + return -1; + } else if(err == -EBUSY) { + +- // the registering of the module's device has failed ++ // the registering of the module's device has failed + // because there was already some other drm module loaded. + __KE_DEBUG("register_chrdev() failed with -EBUSY\n"); + return -1; +@@ -758,7 +758,7 @@ static int fglrx_pci_probe(struct pci_dev *dev, const struct pci_device_id *id_t + /* Starting from 2.6.14, kernel has new struct defined for pm_message_t, + we have to handle this case separately. + 2.6.11/12/13 kernels have pm_message_t defined as int and older kernels +- don't have pm_message_t defined. ++ don't have pm_message_t defined. + */ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) + static int fglrx_pci_suspend(struct pci_dev *pdev, pm_message_t pm_event) +@@ -794,9 +794,9 @@ static int fglrx_pci_suspend(struct pci_dev *pdev, u32 pm_event) + + if (!ret) + { +- +- // since privdev->pcidev is acquired in X server, use pdev +- // directly here to allow suspend/resume without X server start. ++ ++ // since privdev->pcidev is acquired in X server, use pdev ++ // directly here to allow suspend/resume without X server start. + firegl_pci_save_state((__ke_pci_dev_t*)pdev, privdev); + pci_disable_device(pdev); + PMSG_EVENT(pdev->dev.power.power_state) = state; +@@ -848,13 +848,13 @@ static int fglrx_pci_resume(struct pci_dev *pdev) + // before pci_set_master! + firegl_pci_restore_state((__ke_pci_dev_t*)pdev, privdev); + +- if (pci_enable_device(pdev)) ++ if (pci_enable_device(pdev)) + { + __KE_ERROR("Cannot enable PCI device.\n"); +- } ++ } + + pci_set_master(pdev); +- ++ + firegl_cail_powerup(privdev); + + if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND) +@@ -865,7 +865,7 @@ static int fglrx_pci_resume(struct pci_dev *pdev) + return 0; + } + +-static struct pci_driver fglrx_pci_driver = ++static struct pci_driver fglrx_pci_driver = + { + .name = "fglrx_pci", + .id_table = fglrx_pci_table, +@@ -921,10 +921,10 @@ static int firegl_init_devices(__ke_device_t *pubdev) + { + pid = (struct pci_device_id *) &fglrx_pci_table[i]; + pdev = NULL; +- while (( pdev = pci_get_subsys(pid->vendor, +- pid->device, +- PCI_ANY_ID, +- PCI_ANY_ID, ++ while (( pdev = pci_get_subsys(pid->vendor, ++ pid->device, ++ PCI_ANY_ID, ++ PCI_ANY_ID, + pdev)) != NULL) + { + num_of_devices++; +@@ -934,7 +934,7 @@ static int firegl_init_devices(__ke_device_t *pubdev) + + if (firegl_init_device_heads(num_of_devices)) + { +- return -ENOMEM; ++ return -ENOMEM; + } + + for (i=0; fglrx_pci_table[i].vendor != 0; i++) +@@ -942,15 +942,15 @@ static int firegl_init_devices(__ke_device_t *pubdev) + pid = (struct pci_device_id *) &fglrx_pci_table[i]; + + pdev = NULL; +- while (( pdev = pci_get_subsys(pid->vendor, +- pid->device, +- PCI_ANY_ID, +- PCI_ANY_ID, ++ while (( pdev = pci_get_subsys(pid->vendor, ++ pid->device, ++ PCI_ANY_ID, ++ PCI_ANY_ID, + pdev)) != NULL) + { + if ((ret_code = firegl_get_dev(pubdev, pdev))) + { +- return ret_code; ++ return ret_code; + } + + j++; +@@ -983,7 +983,7 @@ static int __init firegl_init_module(void) + // init global vars that are in fact constants + __ke_HZ = HZ; + +-#ifdef _KE_SERIAL_DEBUG ++#ifdef _KE_SERIAL_DEBUG + __ke_SetSerialPort(); + #endif + +@@ -995,11 +995,11 @@ static int __init firegl_init_module(void) + return retcode; + } + +-#ifdef FIREGL_CF_SUPPORT ++#ifdef FIREGL_CF_SUPPORT + adapter_chain_init(); + cf_object_init(); +-#endif +- ++#endif ++ + // init DRM proc list + drm_proclist = kmalloc((DRM_PROC_ENTRIES + 1) * sizeof(__ke_proc_list_t), GFP_KERNEL); + if ( drm_proclist == NULL ) +@@ -1087,7 +1087,7 @@ static int __init firegl_init_module(void) + dev->pubdev.date, + firegl_minors); + +- ++ + #ifdef FIREGL_POWER_MANAGEMENT + if (pci_register_driver (&fglrx_pci_driver) < 0) + { +@@ -1117,12 +1117,12 @@ static void __exit firegl_cleanup_module(void) + { + KCL_disable_pat(); + __KE_INFO("Disable PAT\n"); +- } ++ } + #endif // FIREGL_USWC_SUPPORT + + for (i = 0; i < count; i++) + { +- if ( firegl_stub_unregister(i) ) ++ if ( firegl_stub_unregister(i) ) + { + __KE_ERROR("Cannot unload module on minor: %d\n", i); + } +@@ -1144,10 +1144,10 @@ static void __exit firegl_cleanup_module(void) + dev->pubdev.patchlevel, + dev->pubdev.date); + +-#ifdef FIREGL_CF_SUPPORT ++#ifdef FIREGL_CF_SUPPORT + cf_object_cleanup(); +- adapter_chain_cleanup(); +-#endif // FIREGL_CF_SUPPORT ++ adapter_chain_cleanup(); ++#endif // FIREGL_CF_SUPPORT + + firegl_private_cleanup (&dev->pubdev); + +@@ -1225,18 +1225,18 @@ void ATI_API_CALL __ke_add_wait_queue(__ke_wait_queue_head_t* queue_head, __ke_w + void ATI_API_CALL __ke_remove_wait_queue(__ke_wait_queue_head_t* queue_head, __ke_wait_queue_t* entry) + { + // current->state = TASK_RUNNING; +- remove_wait_queue((wait_queue_head_t*)(void *)queue_head, ++ remove_wait_queue((wait_queue_head_t*)(void *)queue_head, + (wait_queue_t*)(void *)entry); + } + + void ATI_API_CALL __ke_init_waitqueue_head(__ke_wait_queue_head_t* queue_head) + { +- init_waitqueue_head((wait_queue_head_t*)(void *)queue_head); ++ init_waitqueue_head((wait_queue_head_t*)(void *)queue_head); + } + + void ATI_API_CALL __ke_wait_event_interruptible(__ke_wait_queue_head_t* queue_head, int condition) + { +- wait_event_interruptible(*((wait_queue_head_t*)(void *)queue_head), condition); ++ wait_event_interruptible(*((wait_queue_head_t*)(void *)queue_head), condition); + } + + void ATI_API_CALL __ke_poll_wait(struct file* filp, __ke_wait_queue_head_t* queue_head, __ke_poll_table* pt) +@@ -1247,13 +1247,13 @@ void ATI_API_CALL __ke_poll_wait(struct file* filp, __ke_wait_queue_head_t* queu + void ATI_API_CALL *__ke_asyncio_alloc_sema() + { + int i; +- ++ + for(i=0; i= KERNEL_VERSION(2,6,17) ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) + rcu_read_lock(); +-#else ++#else + read_lock(&tasklist_lock); +-#endif +- p = find_task_by_pid( pid ); +- if (p) ++#endif ++ p = find_task_by_vpid( pid ); ++ if (p) + { + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) +- if (p->exit_state != EXIT_ZOMBIE && p->exit_state != EXIT_DEAD) ++ if (p->exit_state != EXIT_ZOMBIE && p->exit_state != EXIT_DEAD) + #else +- if (!(p->flags & PF_EXITING)) ++ if (!(p->flags & PF_EXITING)) + #endif + { + process_terminated = 0; + } +- } +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) ++ } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) + rcu_read_unlock(); +-#else ++#else + read_unlock(&tasklist_lock); +-#endif ++#endif + return process_terminated; + } + +-/** /brief Call global OS kernel task/thread scheduler ++/** /brief Call global OS kernel task/thread scheduler + * /return Nonzero if a system call was awakened by a signal + */ + int ATI_API_CALL KCL_GetSignalStatus(void) +@@ -1432,15 +1432,15 @@ void ATI_API_CALL __ke_unblock_all_signals(void) + unblock_all_signals(); + } + +-#if defined(__i386__) ++#if defined(__i386__) + #ifndef __HAVE_ARCH_CMPXCHG +-static inline +-unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old, +- unsigned long new, int size) +-{ +- unsigned long prev; +- switch (size) { +- case 1: ++static inline ++unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old, ++ unsigned long new, int size) ++{ ++ unsigned long prev; ++ switch (size) { ++ case 1: + __asm__ __volatile__(LOCK_PREFIX "cmpxchgb %b1,%2" + : "=a"(prev) + : "q"(new), "m"(*__xg(ptr)), "0"(old) +@@ -1551,7 +1551,7 @@ struct inode* ATI_API_CALL __ke_get_file_inode(struct file* filp) + */ + KCL_TYPE_Pid ATI_API_CALL KCL_GetPid(void) + { +- return current->pid; ++ return current->pid; + } + + /** /brief Return the current Thread Group ID +@@ -1559,7 +1559,7 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetPid(void) + */ + KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(void) + { +- return current->tgid; ++ return current->tgid; + } + + /** /brief Return the effective user ID +@@ -1655,7 +1655,7 @@ static int KCL_MAP_KernelConfigParam[] = + 1 + #else + 0 +-#endif ++#endif + }; + + /** /brief Check whether a kernel configuration parameter is defined +@@ -1718,13 +1718,13 @@ unsigned long ATI_API_CALL __ke_get_resource_start(__ke_pci_dev_t *dev, unsigned + #if defined(__x86_64__) || defined(__ia64__) + void* ATI_API_CALL __ke_pci_alloc_consistent(__ke_pci_dev_t* dev, int size, void *dma_handle) + { +- return (pci_alloc_consistent( (struct pci_dev*)(void *)dev, size, dma_handle)); ++ return (pci_alloc_consistent( (struct pci_dev*)(void *)dev, size, dma_handle)); + } + + void ATI_API_CALL __ke_pci_free_consistent(__ke_pci_dev_t* dev, int size, unsigned long cpu_addr, + unsigned int dma_handle) + { +- pci_free_consistent( (struct pci_dev*)(void *)dev, size, (void *)cpu_addr, ++ pci_free_consistent( (struct pci_dev*)(void *)dev, size, (void *)cpu_addr, + (unsigned long)dma_handle); + } + #endif // __ia64__ +@@ -1748,7 +1748,7 @@ static int KCL_MAP_ErrorCode[] = + + /** \brief This function maps OS independent error conditions to OS defined error codes + * \param errcode OS independent error condition code +- * \return OS kernel defined error code corresponding to the requested error condition ++ * \return OS kernel defined error code corresponding to the requested error condition + */ + int ATI_API_CALL KCL_GetErrorCode(KCL_ENUM_ErrorCode errcode) + { +@@ -1766,7 +1766,7 @@ int ATI_API_CALL KCL_GetErrorCode(KCL_ENUM_ErrorCode errcode) + int ATI_API_CALL firegl_get_user_ptr(u32 *src, void **dst) + { + unsigned long temp; +- int err = get_user(temp, src); ++ int err = get_user(temp, src); + *dst = (void*) temp; + return err; + } +@@ -1906,7 +1906,7 @@ void ATI_API_CALL __ke_atomic_set(void* v, int val) + + int ATI_API_CALL __ke_atomic_dec_and_test(void* v) + { +- return atomic_dec_and_test((atomic_t*)v); ++ return atomic_dec_and_test((atomic_t*)v); + } + + /*****************************************************************************/ +@@ -2006,19 +2006,19 @@ void ATI_API_CALL __ke_print_debug(const char* fmt, ...) + #endif + + #ifdef _KE_SERIAL_DEBUG +-// To enable serial port debug message dumping,just define _KE_SERIAL_DEBUG in firegl_public.h file. +-// Connect two PC with a null modern serial cable. run Hyper ternimal on the remote machine. +-// It's useful to debug resume if network not works properly and serial port is not recovered ++// To enable serial port debug message dumping,just define _KE_SERIAL_DEBUG in firegl_public.h file. ++// Connect two PC with a null modern serial cable. run Hyper ternimal on the remote machine. ++// It's useful to debug resume if network not works properly and serial port is not recovered + // properly when fglrx resume hook is called... +- +- ++ ++ + #define SER_DATA_PORT 0x3f8 + #define SER_INT_CTRL_PORT SER_DATA_PORT + 1 + #define SER_INT_STAT_PORT SER_DATA_PORT + 2 + #define SER_LINE_CTRL_PORT SER_DATA_PORT + 3 + #define SER_MODEM_CTRL_PORT SER_DATA_PORT + 4 + #define SER_LINE_STAT_PORT SER_DATA_PORT + 5 +- ++ + void ATI_API_CALL __ke_printc(char c) + { + while((inb(SER_LINE_STAT_PORT) & 0x20) == 0 ); //wait until Transmitter Holding Register Empty +@@ -2028,7 +2028,7 @@ void ATI_API_CALL __ke_printc(char c) + void ATI_API_CALL __ke_printstr(const char *str) + { + int len = strlen(str); +- while(len--)__ke_printc(*str++); ++ while(len--)__ke_printc(*str++); + } + + int ATI_API_CALL __ke_SerPrint(const char *format, ...) +@@ -2041,26 +2041,26 @@ int ATI_API_CALL __ke_SerPrint(const char *format, ...) + vsprintf(buffer, format, ap); + + va_end(ap); +- ++ + __ke_printstr(buffer); +- ++ + return 0; + } + void ATI_API_CALL __ke_SetSerialPort() + { + DRM_INFO("setup serial port\n"); +- outb(0x00, SER_INT_CTRL_PORT); // Turn off interrupts +- +- outb(0x80, SER_LINE_CTRL_PORT); // SET DLAB ON +- outb(0x01, SER_DATA_PORT); // Set Baud rate - Divisor Latch Low Byte +- // 0x01 = 115,200 ,0x02 = 57,600, 0x06 = 19,200 BPS, 0x0C = 9,600 BPS +- outb(0x00, SER_DATA_PORT + 1); // Set Baud rate - Divisor Latch High Byte +- outb(0x03, SER_LINE_CTRL_PORT); // reset DLAB ,8 Bits, No Parity, 1 Stop Bit +- outb(0xC7, SER_DATA_PORT + 2); // FIFO Control Register ++ outb(0x00, SER_INT_CTRL_PORT); // Turn off interrupts ++ ++ outb(0x80, SER_LINE_CTRL_PORT); // SET DLAB ON ++ outb(0x01, SER_DATA_PORT); // Set Baud rate - Divisor Latch Low Byte ++ // 0x01 = 115,200 ,0x02 = 57,600, 0x06 = 19,200 BPS, 0x0C = 9,600 BPS ++ outb(0x00, SER_DATA_PORT + 1); // Set Baud rate - Divisor Latch High Byte ++ outb(0x03, SER_LINE_CTRL_PORT); // reset DLAB ,8 Bits, No Parity, 1 Stop Bit ++ outb(0xC7, SER_DATA_PORT + 2); // FIFO Control Register + outb(0x0b, SER_DATA_PORT + 4); // Turn on DTR, RTS, and OUT2 +- ++ + __ke_printstr("serial port 0x3f8 is set ready for message print out \n"); +-} ++} + #endif + + /** \brief Get number of available RAM pages +@@ -2241,7 +2241,7 @@ void *ATI_API_CALL __ke_vmalloc_to_addr(void *vmalloc_addr) + struct page *page = NULL; + + page = vmalloc_to_page(vmalloc_addr); +- if(page == NULL) ++ if(page == NULL) + { + __KE_ERROR("__ke_vmalloc_to_addr: invalid page!"); + return NULL; +@@ -2283,7 +2283,7 @@ int ATI_API_CALL __ke_do_munmap(unsigned long addr, unsigned long len) + retcode = do_munmap(current->mm, + addr, + len); +-#endif ++#endif + up_write(¤t->mm->mmap_sem); + return retcode; + } +@@ -2327,10 +2327,10 @@ long long ATI_API_CALL __divdi3(long long n, long long base) + minus = !minus; + } + else +- { ++ { + ubase = base; + } +- ++ + do_div(un, ubase); + return (minus? -un : un); + } +@@ -2360,7 +2360,7 @@ long long ATI_API_CALL __moddi3(long long n, long long base) + else + { + ubase = base; +- } ++ } + + rem = do_div(un, ubase); + return (minus? -rem : rem); +@@ -2391,7 +2391,7 @@ void* ATI_API_CALL __ke_vmap(unsigned long *pagelist, unsigned int count) + vaddr = (void *) vmap(pages, count); + #else + #ifdef VM_MAP +- vaddr = (void *) vmap(pages, count, VM_MAP, PAGE_KERNEL); ++ vaddr = (void *) vmap(pages, count, VM_MAP, PAGE_KERNEL); + #else + vaddr = (void *) vmap(pages, count, 0, PAGE_KERNEL); + #endif +@@ -2447,7 +2447,7 @@ void ATI_API_CALL __ke_vunmap(void* addr) + } + #endif // defined(VM_MAP) || defined(vunmap) + +-/** \brief Reserve a memory page ++/** \brief Reserve a memory page + * + * \param pt Kernel logical address of the page + * +@@ -2459,7 +2459,7 @@ void ATI_API_CALL KCL_ReserveMemPage(void* pt) + SetPageReserved(virt_to_page((unsigned long)pt)); + } + +-/** \brief Unreserve a memory page ++/** \brief Unreserve a memory page + * + * \param pt Kernel logical address of the page + * +@@ -2471,7 +2471,7 @@ void ATI_API_CALL KCL_UnreserveMemPage(void* pt) + ClearPageReserved(virt_to_page((unsigned long)pt)); + } + +-/** \brief Lock a memory page ++/** \brief Lock a memory page + * + * \param pt Kernel logical address of the page + * +@@ -2480,14 +2480,14 @@ void ATI_API_CALL KCL_UnreserveMemPage(void* pt) + */ + void ATI_API_CALL KCL_LockMemPage(void* pt) + { +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) + SetPageReserved(virt_to_page((unsigned long)pt)); + #else + lock_page(virt_to_page((unsigned long)pt)); + #endif + } + +-/** \brief Unlock a memory page ++/** \brief Unlock a memory page + * + * \param pt Kernel logical address of the page + * +@@ -2496,7 +2496,7 @@ void ATI_API_CALL KCL_LockMemPage(void* pt) + */ + void ATI_API_CALL KCL_UnlockMemPage(void* pt) + { +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) + ClearPageReserved(virt_to_page((unsigned long)pt)); + #else + unlock_page(virt_to_page((unsigned long)pt)); +@@ -2521,7 +2521,7 @@ void* ATI_API_CALL __ke_get_vmptr( struct _agp_memory* memory ) + return memory->vmptr; + } + #endif +- ++ + void* ATI_API_CALL __ke_ioremap(unsigned long offset, unsigned long size) + { + return ioremap(offset, size); +@@ -2592,7 +2592,7 @@ void ATI_API_CALL KCL_flush_tlb_onepage(struct vm_area_struct * vma, unsigned lo + { + /*Some kernel developer removed the export of symbol "flush_tlb_page" on 2.6.25 x86_64 SMP kernel. + Define a simple version here.*/ +-#if defined(__x86_64__) && defined(__SMP__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) ++#if defined(__x86_64__) && defined(__SMP__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) + on_each_cpu(KCL_flush_tlb_one, &va, 1, 1); + #else + flush_tlb_page(vma, va); +@@ -2649,9 +2649,9 @@ void ATI_API_CALL __ke_put_vm_page_table(unsigned long page_addr) + static inline int ptep_clear_flush_dirty(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) + { + int ret = 0; +- ++ + DBG_ENTER("0x%08X, 0x%08X, 0x%08X->0x%08X", vma, addr, ptep, *ptep); +- ++ + if (pte_dirty(*ptep)) + { + #ifdef __x86_64__ +@@ -2666,19 +2666,19 @@ static inline int ptep_clear_flush_dirty(struct vm_area_struct *vma, unsigned lo + { + pte_update(vma->vm_mm, addr, ptep); + } +-#endif ++#endif + } + + DBG_TRACE("0x%08X->0x%08X", ptep, *ptep); +- ++ + // Flush Translation Lookaside Buffers + if (ret) + { + KCL_flush_tlb_onepage(vma,addr); + } +- ++ + DBG_LEAVE("%d", ret); +- ++ + return ret; + } + #endif +@@ -2705,7 +2705,7 @@ static inline int ptep_clear_flush_dirty(struct vm_area_struct *vma, unsigned lo + * the virtual address + * + * \param mm Pointer to the memory descriptor structure +- * \param virtual_addr Virtual address ++ * \param virtual_addr Virtual address + * + * \return Old value of the "dirty" flag on success or negative on error + * +@@ -2961,7 +2961,7 @@ int ATI_API_CALL __ke_config_mtrr(void) + return 0; + #else + return 1; +-#endif ++#endif + #else /* !CONFIG_MTRR */ + return 0; + #endif /* !CONFIG_MTRR */ +@@ -2987,7 +2987,7 @@ int ATI_API_CALL __ke_mtrr_del(int reg, unsigned long base, unsigned long size) + + int ATI_API_CALL __ke_has_vmap(void) + { +-// We disable vmap for 2.4.x kernel to work around the big memory( > 4GB ) issue. ++// We disable vmap for 2.4.x kernel to work around the big memory( > 4GB ) issue. + #if defined(VM_MAP) || defined(vunmap) + return 1; + #else +@@ -3009,7 +3009,7 @@ int ATI_API_CALL __ke_no_iommu(void) + { + return 0; + } +-#endif ++#endif + + /*****************************************************************************/ + +@@ -3066,7 +3066,7 @@ unsigned int ATI_API_CALL __ke_pci_get_func(__ke_pci_dev_t* pcidev) + { + struct pci_dev* dev = (struct pci_dev*)pcidev; + return PCI_FUNC(dev->devfn); +-} ++} + + __ke_dma_addr_t ATI_API_CALL __ke_pci_map_single (__ke_pci_dev_t *pdev, void *buffer, __ke_size_t size, int direction) + { +@@ -3153,7 +3153,7 @@ static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1) + return IRQ_HANDLED; + } + #endif +- ++ + int ATI_API_CALL __ke_request_irq(unsigned int irq, + void (*ATI_API_CALL handler)(int, void *, void *), + const char *dev_name, void *dev_id) +@@ -3166,7 +3166,7 @@ int ATI_API_CALL __ke_request_irq(unsigned int irq, + SA_SHIRQ, + #else + IRQF_SHARED, +-#endif ++#endif + dev_name, + dev_id); + } +@@ -3203,12 +3203,12 @@ int ATI_API_CALL __ke_agp_memory_get_page_count(struct _agp_memory* agpmem) + return (int)(agpmem->page_count); + } + +-void ATI_API_CALL __ke_agp_memory_get_memory(struct _agp_memory* agpmem, ++void ATI_API_CALL __ke_agp_memory_get_memory(struct _agp_memory* agpmem, + unsigned long **memory_ptr) + { + __KE_DEBUG("[%s] agpmem=0x%016lx agpmem->memory=0x%016lx [0]=0x%016x", +- __FUNCTION__, +- (unsigned long)agpmem, ++ __FUNCTION__, ++ (unsigned long)agpmem, + (unsigned long)agpmem->memory, + (agpmem->memory)[0]); + +@@ -3217,18 +3217,9 @@ void ATI_API_CALL __ke_agp_memory_get_memory(struct _agp_memory* agpmem, + + /*****************************************************************************/ + +-#ifndef NOPAGE_SIGBUS +-#define NOPAGE_SIGBUS 0 +-#endif /* !NOPAGE_SIGBUS */ +- + typedef struct page mem_map_t; + typedef mem_map_t *vm_nopage_ret_t; + +-static __inline__ vm_nopage_ret_t do_vm_nopage(struct vm_area_struct* vma, +- unsigned long address) +-{ +- return 0; /* Disallow mremap */ +-} + + #ifdef __AGP__BUILTIN__ + #ifdef __ia64__ +@@ -3253,19 +3244,20 @@ static __inline__ vm_nopage_ret_t do_vm_cant_nopage(struct vm_area_struct* vma, + return page; + } + } +- return NOPAGE_SIGBUS; /* Disallow mremap */ ++ return VM_FAULT_SIGBUS; /* Disallow mremap */ + } + + #endif /* __ia64__ */ + #endif /* __AGP__BUILTIN__ */ + + +-static __inline__ vm_nopage_ret_t do_vm_shm_nopage(struct vm_area_struct* vma, +- unsigned long address) ++static __inline__ int do_vm_shm_nopage(struct vm_area_struct* vma, ++ struct vm_fault *vmf) + { + pgd_t* pgd_p; + pmd_t* pmd_p; + pte_t pte; ++ unsigned long address = (unsigned long)vmf->virtual_address; + unsigned long vma_offset; + unsigned long pte_linear; + mem_map_t* pMmPage; +@@ -3294,7 +3286,7 @@ static __inline__ vm_nopage_ret_t do_vm_shm_nopage(struct vm_area_struct* vma, + (unsigned long)__ke_vm_offset(vma)); + + if (address > vma->vm_end) +- return NOPAGE_SIGBUS; /* address is out of range */ ++ return VM_FAULT_SIGBUS; /* address is out of range */ + + /* Calculate offset into VMA */ + vma_offset = address - vma->vm_start; +@@ -3306,7 +3298,7 @@ static __inline__ vm_nopage_ret_t do_vm_shm_nopage(struct vm_area_struct* vma, + pte_linear = firegl_get_addr_from_vm(vma); + if (!pte_linear) + { +- return NOPAGE_SIGBUS; /* bad address */ ++ return VM_FAULT_SIGBUS; /* bad address */ + } + pte_linear += vma_offset; + +@@ -3334,7 +3326,9 @@ static __inline__ vm_nopage_ret_t do_vm_shm_nopage(struct vm_area_struct* vma, + + // __KE_DEBUG3("vm-address 0x%08lx => kernel-page-address 0x%p\n", + // address, page_address(pMmPage)); +- return pMmPage; ++ vmf->page = pMmPage; ++ ++ return 0; + } + + /* +@@ -3343,8 +3337,10 @@ static __inline__ vm_nopage_ret_t do_vm_shm_nopage(struct vm_area_struct* vma, + (which is one ore more pages in size) + + */ +-static __inline__ vm_nopage_ret_t do_vm_dma_nopage(struct vm_area_struct* vma, unsigned long address) ++static __inline__ int do_vm_dma_nopage(struct vm_area_struct* vma, ++ struct vm_fault *vmf) + { ++ unsigned long address = (unsigned long) vmf->virtual_address; + unsigned long kaddr; + mem_map_t* pMmPage; + +@@ -3360,7 +3356,7 @@ static __inline__ vm_nopage_ret_t do_vm_dma_nopage(struct vm_area_struct* vma, u + kaddr = firegl_get_addr_from_vm(vma); + if (!kaddr) + { +- return NOPAGE_SIGBUS; /* bad address */ ++ return VM_FAULT_SIGBUS; /* bad address */ + } + kaddr += (address - vma->vm_start); + +@@ -3372,19 +3368,23 @@ static __inline__ vm_nopage_ret_t do_vm_dma_nopage(struct vm_area_struct* vma, u + // with drm_alloc_pages, which marks all pages as reserved. Reserved + // pages' usage count is not decremented by the kernel during unmap!!! + // +- // For kernel >= 2.6.15, We should reenable this, because the VM sub-system +- // will decrement the pages' usage count even for the pages marked as reserved ++ // For kernel >= 2.6.15, We should reenable this, because the VM sub-system ++ // will decrement the pages' usage count even for the pages marked as reserved + // - MC. + get_page(pMmPage); /* inc usage count of page */ + #endif + + __KE_DEBUG3("vm-address 0x%08lx => kernel-page-address 0x%p\n", + address, page_address(pMmPage)); +- return pMmPage; ++ vmf->page = pMmPage; ++ ++ return 0; + } + +-static __inline__ vm_nopage_ret_t do_vm_kmap_nopage(struct vm_area_struct* vma, unsigned long address) ++static __inline__ int do_vm_kmap_nopage(struct vm_area_struct* vma, ++ struct vm_fault *vmf) + { ++ unsigned long address = (unsigned long) vmf->virtual_address; + unsigned long kaddr; + mem_map_t* pMmPage; + +@@ -3394,13 +3394,14 @@ static __inline__ vm_nopage_ret_t do_vm_kmap_nopage(struct vm_area_struct* vma, + if ((pMmPage = (mem_map_t*) firegl_get_pagetable_page_from_vm(vma))) + { + get_page(pMmPage); +- return pMmPage; ++ vmf->page = pMmPage; ++ return 0; + } + + kaddr = firegl_get_addr_from_vm(vma); + if (!kaddr) + { +- return NOPAGE_SIGBUS; /* bad address */ ++ return VM_FAULT_SIGBUS; /* bad address */ + } + kaddr += (address - vma->vm_start); + +@@ -3413,50 +3414,52 @@ static __inline__ vm_nopage_ret_t do_vm_kmap_nopage(struct vm_area_struct* vma, + + __KE_DEBUG3("vm-address 0x%08lx => kernel-page-address 0x%p\n", address, page_address(pMmPage)); + +- return pMmPage; ++ vmf->page = pMmPage; ++ return 0; + } + +-/** ++/** + ** +- ** This routine is intented to locate the page table through the ++ ** This routine is intented to locate the page table through the + ** pagelist table created earlier in dev-> pcie + **/ +-static __inline__ vm_nopage_ret_t do_vm_pcie_nopage(struct vm_area_struct* vma, +- unsigned long address) ++static __inline__ int do_vm_pcie_nopage(struct vm_area_struct* vma, ++ struct vm_fault *vmf) + { + ++ unsigned long address = (unsigned long)vmf->virtual_address; + unsigned long vma_offset; +- unsigned long i; ++ unsigned long i; + mem_map_t* pMmPage; + struct firegl_pcie_mem* pciemem; + unsigned long* pagelist; +- ++ + drm_device_t *dev = (drm_device_t *)firegl_get_dev_from_vm(vma); + if (dev == NULL) + { + __KE_ERROR("dev is NULL\n"); +- return NOPAGE_SIGBUS; ++ return VM_FAULT_SIGBUS; + } + + if (address > vma->vm_end) + { + __KE_ERROR("address out of range\n"); +- return NOPAGE_SIGBUS; /* address is out of range */ ++ return VM_FAULT_SIGBUS; /* address is out of range */ + } + pciemem = firegl_get_pciemem_from_addr ( vma, address); + if (pciemem == NULL) + { + __KE_ERROR("No pciemem found! \n"); +- return NOPAGE_SIGBUS; +- } ++ return VM_FAULT_SIGBUS; ++ } + pagelist = firegl_get_pagelist_from_vm(vma); + +- if (pagelist == NULL) ++ if (pagelist == NULL) + { + __KE_ERROR("No pagelist! \n"); +- return NOPAGE_SIGBUS; ++ return VM_FAULT_SIGBUS; + } +- ++ + /** Find offset in vma */ + vma_offset = address - vma->vm_start; + /** Which entry in the pagelist */ +@@ -3468,15 +3471,17 @@ static __inline__ vm_nopage_ret_t do_vm_pcie_nopage(struct vm_area_struct* vma, + if (page_address(pMmPage) == 0x0) + { + __KE_ERROR("Invalid page address\n"); +- return NOPAGE_SIGBUS; ++ return VM_FAULT_SIGBUS; + } +- return pMmPage; ++ ++ vmf->page = pMmPage; ++ return 0; + } + +-static __inline__ vm_nopage_ret_t do_vm_gart_nopage(struct vm_area_struct* vma, +- unsigned long address) ++static __inline__ int do_vm_gart_nopage(struct vm_area_struct* vma, ++ struct vm_fault *vmf) + { +- ++ unsigned long address = (unsigned long) vmf->virtual_address; + unsigned long page_addr; + unsigned long offset; + struct page *page; +@@ -3484,36 +3489,31 @@ static __inline__ vm_nopage_ret_t do_vm_gart_nopage(struct vm_area_struct* vma, + if (address > vma->vm_end) + { + __KE_ERROR("Invalid virtual address\n"); +- return NOPAGE_SIGBUS; /* Disallow mremap */ +- } ++ return VM_FAULT_SIGBUS; /* Disallow mremap */ ++ } + + offset = address - vma->vm_start; +-#ifdef FIREGL_CF_SUPPORT ++#ifdef FIREGL_CF_SUPPORT + page_addr = mc_heap_get_page_addr(vma, offset); + #else + page_addr = firegl_cmmqs_get_pageaddr_from_vm(vma, offset); +-#endif ++#endif + if( !page_addr) + { + __KE_ERROR("Invalid page address\n"); +- return NOPAGE_SIGBUS; /* Disallow mremap */ ++ return VM_FAULT_SIGBUS; /* Disallow mremap */ + } + page = virt_to_page(page_addr); + get_page(page); + +- return page; ++ vmf->page = page; ++ return 0; + } + +- +- +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) +- +-static vm_nopage_ret_t vm_nopage(struct vm_area_struct* vma, +- unsigned long address, +- int *type) ++static int vm_nopage(struct vm_area_struct* vma, ++ struct vm_fault *vmf) + { +- if (type) *type = VM_FAULT_MINOR; +- return do_vm_nopage(vma, address); ++ return VM_FAULT_SIGBUS; + } + + #ifdef __AGP__BUILTIN__ +@@ -3545,91 +3545,10 @@ static vm_nopage_ret_t vm_cant_nopage(struct vm_area_struct* vma, + (which is one or more pages in size) + + */ +-static vm_nopage_ret_t vm_shm_nopage(struct vm_area_struct* vma, +- unsigned long address, +- int *type) +-{ +- if (type) *type = VM_FAULT_MINOR; +- return do_vm_shm_nopage(vma, address); +-} +- +-/* +- +- This routine is intended to remap addresses of a OpenGL context +- (which is one ore more pages in size) +- +-*/ +-static vm_nopage_ret_t vm_dma_nopage(struct vm_area_struct* vma, +- unsigned long address, +- int *type) +-{ +- if (type) *type = VM_FAULT_MINOR; +- return do_vm_dma_nopage(vma, address); +-} +- +-static vm_nopage_ret_t vm_kmap_nopage(struct vm_area_struct* vma, +- unsigned long address, +- int *type) +-{ +- if (type) *type = VM_FAULT_MINOR; +- return do_vm_kmap_nopage(vma, address); +-} +- +-static vm_nopage_ret_t vm_pcie_nopage(struct vm_area_struct* vma, +- unsigned long address, +- int *type) +-{ +- return do_vm_pcie_nopage(vma, address); +-} +- +-static vm_nopage_ret_t vm_gart_nopage(struct vm_area_struct* vma, +- unsigned long address, +- int *type) +-{ +- return do_vm_gart_nopage(vma, address); +-} +- +-#else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0) */ +- +-static vm_nopage_ret_t vm_nopage(struct vm_area_struct* vma, +- unsigned long address, +- int write_access) +-{ +- return do_vm_nopage(vma, address); +-} +- +-#ifdef __AGP__BUILTIN__ +-#ifdef __ia64__ +- +- +-static vm_nopage_ret_t vm_cant_nopage(struct vm_area_struct* vma, +- unsigned long address, +- int write_access) +-{ +- return do_vm_cant_nopage(vma, address); +-} +-#endif /* __ia64__ */ +-#endif /* __AGP__BUILTIN__ */ +- +-/* +- +- This function is called when a page of a mmap()'ed area is not currently +- visible in the specified VMA. +- Return value is the associated physical address for the requested page. +- (If not implemented, then the kernel default routine would allocate a new, +- zeroed page for servicing us) +- +- Possible errors: SIGBUS, OutOfMem +- +- This routine is intended to remap addresses of SHM SAREA +- (which is one or more pages in size) +- +- */ +-static vm_nopage_ret_t vm_shm_nopage(struct vm_area_struct* vma, +- unsigned long address, +- int write_access) ++static int vm_shm_nopage(struct vm_area_struct* vma, ++ struct vm_fault *vmf) + { +- return do_vm_shm_nopage(vma, address); ++ return do_vm_shm_nopage(vma, vmf); + } + + /* +@@ -3638,37 +3557,30 @@ static vm_nopage_ret_t vm_shm_nopage(struct vm_area_struct* vma, + (which is one ore more pages in size) + + */ +-static vm_nopage_ret_t vm_dma_nopage(struct vm_area_struct* vma, +- unsigned long address, +- int write_access) ++static int vm_dma_nopage(struct vm_area_struct* vma, ++ struct vm_fault *vmf) + { +- return do_vm_dma_nopage(vma, address); ++ return do_vm_dma_nopage(vma, vmf); + } + +-static vm_nopage_ret_t vm_kmap_nopage(struct vm_area_struct* vma, +- unsigned long address, +- int write_access) ++static int vm_kmap_nopage(struct vm_area_struct* vma, ++ struct vm_fault *vmf) + { +- return do_vm_kmap_nopage(vma, address); ++ return do_vm_kmap_nopage(vma, vmf); + } + +-static vm_nopage_ret_t vm_pcie_nopage(struct vm_area_struct* vma, +- unsigned long address, +- int write_access) ++static int vm_pcie_nopage(struct vm_area_struct* vma, ++ struct vm_fault *vmf) + { +- return do_vm_pcie_nopage(vma, address); ++ return do_vm_pcie_nopage(vma, vmf); + } + +-static vm_nopage_ret_t vm_gart_nopage(struct vm_area_struct* vma, +- unsigned long address, +- int *type) ++static int vm_gart_nopage(struct vm_area_struct* vma, ++ struct vm_fault *vmf) + { +- return do_vm_gart_nopage(vma, address); ++ return do_vm_gart_nopage(vma, vmf); + } + +- +-#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) */ +- + void* ATI_API_CALL __ke_vma_file_priv(struct vm_area_struct* vma) + { + return vma->vm_file->private_data; +@@ -3718,7 +3630,7 @@ char* ATI_API_CALL __ke_vm_page_prot_str(struct vm_area_struct* vma, char* buf) + *(buf + i++) = pgprot & _PAGE_DIRTY ? 'd' : '-'; + *(buf + i++) = pgprot & _PAGE_PSE ? 'm' : 'k'; + *(buf + i++) = pgprot & _PAGE_GLOBAL ? 'g' : 'l'; +-#endif /* __i386__ */ ++#endif /* __i386__ */ + *(buf + i++) = 0; + + return buf; +@@ -3747,9 +3659,9 @@ char *__ke_pte_phys_addr_str(pte_t pte, char *buf, __ke_dma_addr_t* phys_address + return buf; + } + +-char* ATI_API_CALL __ke_vm_phys_addr_str(struct vm_area_struct* vma, +- char* buf, +- unsigned long virtual_addr, ++char* ATI_API_CALL __ke_vm_phys_addr_str(struct vm_area_struct* vma, ++ char* buf, ++ unsigned long virtual_addr, + __ke_dma_addr_t* phys_address) + { + pgd_t* pgd_p; +@@ -3773,7 +3685,7 @@ void ip_drm_vm_close(struct vm_area_struct* vma) + + static struct vm_operations_struct vm_ops = + { +- nopage: vm_nopage, ++ fault: vm_nopage, + open: ip_drm_vm_open, + close: ip_drm_vm_close, + }; +@@ -3791,42 +3703,42 @@ static struct vm_operations_struct vm_cant_ops = + + static struct vm_operations_struct vm_shm_ops = + { +- nopage: vm_shm_nopage, ++ fault: do_vm_shm_nopage, + open: ip_drm_vm_open, + close: ip_drm_vm_close, + }; + + static struct vm_operations_struct vm_pci_bq_ops = + { +- nopage: vm_dma_nopage, ++ fault: vm_dma_nopage, + open: ip_drm_vm_open, + close: ip_drm_vm_close, + }; + + static struct vm_operations_struct vm_ctx_ops = + { +- nopage: vm_dma_nopage, ++ fault: vm_dma_nopage, + open: ip_drm_vm_open, + close: ip_drm_vm_close, + }; + +-static struct vm_operations_struct vm_pcie_ops = ++static struct vm_operations_struct vm_pcie_ops = + { +- nopage: vm_pcie_nopage, ++ fault: vm_pcie_nopage, + open: ip_drm_vm_open, + close: ip_drm_vm_close, + }; + + static struct vm_operations_struct vm_kmap_ops = + { +- nopage: vm_kmap_nopage, ++ fault: vm_kmap_nopage, + open: ip_drm_vm_open, + close: ip_drm_vm_close, + }; + + static struct vm_operations_struct vm_gart_ops = + { +- nopage: vm_gart_nopage, ++ fault: vm_gart_nopage, + open: ip_drm_vm_open, + close: ip_drm_vm_close, + }; +@@ -3835,14 +3747,14 @@ static struct vm_operations_struct vm_gart_ops = + #ifndef __ia64__ + static struct vm_operations_struct vm_agp_bq_ops = + { +- nopage: vm_nopage, ++ fault: vm_nopage, + open: ip_drm_vm_open, + close: ip_drm_vm_close, + }; +-#else ++#else + static struct vm_operations_struct vm_cant_agp_bq_ops = + { +- nopage: vm_cant_nopage, ++ fault: vm_cant_nopage, + open: ip_drm_vm_open, + close: ip_drm_vm_close, + }; +@@ -3877,19 +3789,19 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, + #ifdef __i386__ + if (boot_cpu_data.x86 > 3) + { +-#ifdef FIREGL_USWC_SUPPORT ++#ifdef FIREGL_USWC_SUPPORT + if (!firegl_pat_enabled) +-#endif ++#endif + { + pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; + pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT; + } +-#ifdef FIREGL_USWC_SUPPORT ++#ifdef FIREGL_USWC_SUPPORT + else + { + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); +- } +-#endif ++ } ++#endif + } + #endif /* __i386__ */ + #ifdef __ia64__ +@@ -3908,7 +3820,7 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, + } + break; + +-#ifdef FIREGL_USWC_SUPPORT ++#ifdef FIREGL_USWC_SUPPORT + case __KE_ADPT_REG: + { + #ifdef __ia64__ +@@ -3928,7 +3840,7 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, + } + else + { +- vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); ++ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); + } + } + #endif /* __i386__ */ +@@ -3947,7 +3859,7 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, + vma->vm_ops = &vm_ops; + } + break; +-#endif ++#endif + + case __KE_SHM: + vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +@@ -3981,7 +3893,7 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, + + #ifdef __AGP__BUILTIN__ + case __KE_AGP: +- // if(dev->agp->cant_use_aperture == 1) ++ // if(dev->agp->cant_use_aperture == 1) + #ifdef __ia64__ + { + /* +@@ -4005,9 +3917,9 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, + if( firegl_pat_enabled ) + { + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); +- } ++ } + } +-#endif ++#endif + + if (REMAP_PAGE_RANGE(vma,offset)) + { +@@ -4024,8 +3936,8 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, + #endif + break; + case __KE_AGP_BQS: +- // if(dev->agp->cant_use_aperture == 1) +-#ifdef __ia64__ ++ // if(dev->agp->cant_use_aperture == 1) ++#ifdef __ia64__ + { + /* + * On some systems we can't talk to bus dma address from +@@ -4048,9 +3960,9 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, + if( firegl_pat_enabled ) + { + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); +- } ++ } + } +-#endif ++#endif + + if (REMAP_PAGE_RANGE(vma,offset)) + { +@@ -4079,15 +3991,15 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, + break; + + case __KE_GART_USWC: +-#ifdef FIREGL_USWC_SUPPORT ++#ifdef FIREGL_USWC_SUPPORT + if (boot_cpu_data.x86 > 3) + { + if( firegl_pat_enabled ) + { + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); +- } ++ } + } +-#endif ++#endif + // fall through + case __KE_GART_CACHEABLE: + vma->vm_flags |= VM_RESERVED; +@@ -4137,7 +4049,7 @@ extern struct _agp_memory *_X(agp_allocate_memory_phys_list)(size_t, u32, u64 *) + #define FIREGL_agp_backend_release _X(agp_backend_release) + #define FIREGL_agp_memory _X(agp_memory) + +-unsigned int __ke_firegl_agpgart_inuse = AGPGART_INUSE_NONE; ++unsigned int __ke_firegl_agpgart_inuse = AGPGART_INUSE_NONE; + + #if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) + /*****************************************************************************/ +@@ -4252,7 +4164,7 @@ static + int ATI_API_CALL __ke_agpgart_available(__ke_pci_dev_t *pcidev, int use_internal) + { + drm_agp_module_stub = &drm_agp; +- __ke_firegl_agpgart_inuse = KERNEL26_AGPGART_INUSE; ++ __ke_firegl_agpgart_inuse = KERNEL26_AGPGART_INUSE; + { + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) + firegl_pci_device = (struct pci_dev*)(void*)pcidev; +@@ -4305,7 +4217,7 @@ int ATI_API_CALL __ke_agp_available(__ke_pci_dev_t *pcidev, int use_internal) + } else { + available = __ke_firegl_agpgart_available(); + } +- ++ + return available; + } + +@@ -4410,7 +4322,7 @@ void ATI_API_CALL __ke_agp_copy_info(__ke_agp_kern_info_t* info) + + if (AGP_AVAILABLE(copy_info)) + { +- struct agp_kern_info kern; ++ struct agp_kern_info kern; + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) + if (firegl_agp_bridge == NULL) +@@ -4508,7 +4420,7 @@ int ATI_API_CALL __ke_agp_enable(unsigned long mode) + + int ATI_API_CALL __ke_read_agp_caps_registers(__ke_pci_dev_t* dev, unsigned int *caps) + { +- return -EINVAL; ++ return -EINVAL; + } + + int ATI_API_CALL __ke_agp_acquire(__ke_pci_dev_t* dev) +@@ -4550,9 +4462,9 @@ int ATI_API_CALL __ke_smp_processor_id(void) + + /** \brief Runs a function on all other CPUs + * \param func_to_call function to be called on all other cpus +- * \return None ++ * \return None + */ +-void ATI_API_CALL KCL_CallFuncOnOtherCpus(firegl_void_routine_t func_to_call) ++void ATI_API_CALL KCL_CallFuncOnOtherCpus(firegl_void_routine_t func_to_call) + { + #ifdef CONFIG_SMP + smp_call_function( firegl_smp_func_parameter_wrap, (void*)func_to_call, 0, 1 ); +@@ -4659,7 +4571,7 @@ int ATI_API_CALL __ke_has_PSE(void) + + int ATI_API_CALL KCL_is_pat_enabled(void) + { +- return firegl_pat_enabled; ++ return firegl_pat_enabled; + } + + static int ATI_API_CALL KCL_has_pat(void) +@@ -4675,7 +4587,7 @@ static void KCL_setup_pat(void *info) + { + unsigned long cr0=0, cr4=0; + unsigned long flags; +- ++ + local_irq_save(flags); + cr0 = read_cr0() | 0x40000000; + write_cr0(cr0); +@@ -4706,7 +4618,7 @@ static void KCL_restore_pat(void *info) + { + unsigned long cr0 = 0, cr4 = 0; + unsigned long flags; +- ++ + local_irq_save(flags); + cr0 = read_cr0() | 0x40000000; + write_cr0(cr0); +@@ -4718,7 +4630,7 @@ static void KCL_restore_pat(void *info) + write_cr4(cr4 & ~X86_CR4_PGE); + } + __flush_tlb(); +- ++ + wrmsr(MSR_IA32_CR_PAT, KCL_orig_pat[0], KCL_orig_pat[1]); + + cr0 = read_cr0(); +@@ -4741,7 +4653,7 @@ static int ATI_API_CALL KCL_enable_pat(void) + __KE_INFO("USWC is disabled in module parameters\n"); + return 0; + } +- ++ + if (!KCL_has_pat()) + { + return 0; +@@ -4751,13 +4663,13 @@ static int ATI_API_CALL KCL_enable_pat(void) + + for ( i = 0; i < 2; i++ ) + { +- for (j = 0; j < 4; j ++) ++ for (j = 0; j < 4; j ++) + { + if (((KCL_orig_pat[i] >> (j * 8)) & 0xFF) == 1) +- { ++ { + __KE_ERROR("Pat entry %d is already configured\n", (i+1)*(j+1)); + return 0; +- } ++ } + } + } + +@@ -4829,7 +4741,7 @@ typedef struct tag_kasContext_t + } kasContext_t; + + /** \brief KAS context */ +-static kasContext_t kasContext; ++static kasContext_t kasContext; + + /** \brief Kernel support required to enable KAS */ + #if defined(cmpxchg) && \ +@@ -5137,7 +5049,7 @@ unsigned int ATI_API_CALL KAS_Ih_Execute(KAS_IhRoutine_t ih_routine, + DBG_TRACE("Interrupt handler returned 0x%08X", ret); + + kasSetExecutionLevel(orig_level); +- spin_unlock(&kasContext.lock_ih); ++ spin_unlock(&kasContext.lock_ih); + + DBG_LEAVE("%d", ret); + return ret; +@@ -5412,7 +5324,7 @@ typedef struct tag_kasSlabCache_t + #endif + spinlock_t lock; /* OS spinlock object protecting the cache */ + unsigned int routine_type; /* Type of routine the cache might be accessed from */ +- char name[14]; /* Cache object name (kernel 2.4 restricts its length to 19 chars) */ ++ char name[24]; /* Cache object name (kernel 2.4 restricts its length to 19 chars) */ + } kasSlabCache_t; + + /** \brief Return Slab Cache object size +@@ -5450,7 +5362,8 @@ unsigned int ATI_API_CALL KAS_SlabCache_Initialize(void* hSlabCache, + + slabcache_obj->routine_type = access_type; + spin_lock_init(&(slabcache_obj->lock)); +- sprintf(slabcache_obj->name, "kas(%08lX)",(unsigned long)slabcache_obj); ++ snprintf(slabcache_obj->name, sizeof(slabcache_obj->name), ++ "kas(%p)", slabcache_obj); + + DBG_TRACE("creating slab object '%s'", slabcache_obj->name); + +@@ -6366,7 +6279,7 @@ unsigned int ATI_API_CALL KAS_AtomicAddInt( + + kas_xadd(puiDestination, iAdd, ret, "l"); + +- return ret + iAdd; ++ return ret + iAdd; + #else + return 0xDEADC0DE; /* To make compiler happy */ + #endif +@@ -6449,7 +6362,7 @@ long ATI_API_CALL KAS_ScheduleTimeout(long n_jiffies) + #ifdef FIREGL_CF_SUPPORT + + void *ATI_API_CALL KCL_lock_init() +-{ ++{ + spinlock_t *lock; + + lock = kmalloc(sizeof(*lock), GFP_KERNEL); +@@ -6461,7 +6374,7 @@ void *ATI_API_CALL KCL_lock_init() + } + + void ATI_API_CALL KCL_lock_deinit(void *plock) +-{ ++{ + if (plock == NULL) + { + __KE_ERROR("plock is NULL\n"); diff --git a/x11-drivers/ati-drivers/files/0005-Linux-2.6.26.x-kernels-firegl_public.h.patch b/x11-drivers/ati-drivers/files/0005-Linux-2.6.26.x-kernels-firegl_public.h.patch new file mode 100644 index 0000000..a9fa63e --- /dev/null +++ b/x11-drivers/ati-drivers/files/0005-Linux-2.6.26.x-kernels-firegl_public.h.patch @@ -0,0 +1,38 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.h ++++ common/lib/modules/fglrx/build_mod/firegl_public.h +@@ -78,7 +78,7 @@ + if (!pgd_present(*(pgd_p))) \ + { \ + __KE_ERROR("FATAL ERROR: User queue buffer not present! (pgd)\n"); \ +- return (unsigned long)NOPAGE_SIGBUS; /* Something bad happened; generate SIGBUS */ \ ++ return VM_FAULT_SIGBUS; /* Something bad happened; generate SIGBUS */ \ + /* alternatively we could generate a NOPAGE_OOM "out of memory" */ \ + } \ + } while(0) +@@ -91,7 +91,7 @@ + if (!pud_present(*(pud_p))) \ + { \ + __KE_ERROR("FATAL ERROR: User queue buffer not present! (pud)\n"); \ +- return (unsigned long)NOPAGE_SIGBUS; /* Something bad happened; generate SIGBUS */ \ ++ return VM_FAULT_SIGBUS; /* Something bad happened; generate SIGBUS */ \ + /* alternatively we could generate a NOPAGE_OOM "out of memory" */ \ + } \ + pmd_p = pmd_offset(pud_p, pte_linear); \ +@@ -111,7 +111,7 @@ + if (!pmd_present(*(pmd_p))) \ + { \ + __KE_ERROR("FATAL ERROR: User queue buffer not present! (pmd)\n"); \ +- return (unsigned long)NOPAGE_SIGBUS; /* Something bad happened; generate SIGBUS */ \ ++ return VM_FAULT_SIGBUS; /* Something bad happened; generate SIGBUS */ \ + /* alternatively we could generate a NOPAGE_OOM "out of memory" */ \ + } \ + } while(0) +@@ -157,7 +157,7 @@ + if (!pte_present(pte)) \ + { \ + __KE_ERROR("FATAL ERROR: User queue buffer not present! (pte)\n"); \ +- return (unsigned long)NOPAGE_SIGBUS; /* Something bad happened; generate SIGBUS */ \ ++ return VM_FAULT_SIGBUS; /* Something bad happened; generate SIGBUS */ \ + /* alternatively we could generate a NOPAGE_OOM "out of memory" */ \ + } \ + } while(0) diff --git a/x11-drivers/ati-drivers/files/09ati b/x11-drivers/ati-drivers/files/09ati new file mode 100644 index 0000000..27180e0 --- /dev/null +++ b/x11-drivers/ati-drivers/files/09ati @@ -0,0 +1,3 @@ +PATH=/opt/ati/bin +ROOTPATH=/opt/ati/bin:/opt/ati/sbin +MANPATH=/opt/ati/man diff --git a/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch b/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch new file mode 100644 index 0000000..25d5883 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch @@ -0,0 +1,17 @@ +--- common-orig/lib/modules/fglrx/build_mod/firegl_public.c 2007-08-01 16:58:40.000000000 -0500 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-08-01 16:57:11.000000000 -0500 +@@ -144,12 +144,14 @@ + #define EXPORT_NO_SYMBOLS + #endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) + #ifdef __x86_64__ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) + #include "linux/ioctl32.h" + #else + #include "asm/ioctl32.h" + #endif ++#endif + + #ifdef __x86_64__ + #include "asm/compat.h" diff --git a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch b/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch new file mode 100644 index 0000000..9713208 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch @@ -0,0 +1,41 @@ +diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 13:36:37.000000000 +0200 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 14:24:11.000000000 +0200 +@@ -2409,7 +2409,11 @@ + #ifdef pte_offset_map + pte_p = pte_offset_map(pmd_p, virtual_addr); + if (pte_present(*pte_p)) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) + ret = (ptep_clear_flush_dirty(vma, virtual_addr, pte_p) ? 1 : 0); ++#else ++ return 0; ++#endif + else + __KE_DEBUG("page not exists!\n"); + pte_unmap(pte_p); +@@ -3399,9 +3403,11 @@ + sprintf(buf, "0x%Lx %c%c%c%c%c%c\n", + *phys_address, + pte_present (pte) ? 'p' : '-', ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) + pte_read (pte) ? 'r' : '-', +- pte_write (pte) ? 'w' : '-', + pte_exec (pte) ? 'x' : '-', ++#endif ++ pte_write (pte) ? 'w' : '-', + pte_dirty (pte) ? 'd' : '-', + pte_young (pte) ? 'a' : '-'); + } +@@ -5348,7 +5354,11 @@ + DBG_TRACE("creating slab object '%s'", slabcache_obj->name); + + if ((slabcache_obj->cache = ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) + kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL, NULL))) ++#else ++ kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL))) ++#endif + { + ret = 1; + } + diff --git a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch b/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch new file mode 100644 index 0000000..378435d --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch @@ -0,0 +1,90 @@ +diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 13:36:37.000000000 +0200 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 14:24:11.000000000 +0200 +@@ -452,7 +452,7 @@ + } + + static unsigned int +-firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) ++firegl_interrupt_poll_wrap(struct file *user_file, struct poll_table_struct *pt) + { + if(firegl_interrupt_poll(user_file, (__ke_poll_table*)pt)) + { +@@ -1491,7 +1491,8 @@ + int ATI_API_CALL firegl_put_user_ptr(void *src, u32 *dst) + { + void *temp = src; +- return put_user(temp, dst); ++ void *dst_temp = dst; ++ return put_user(temp, dst_temp); + } + + int ATI_API_CALL firegl_put_user_u16(u16 src, u16 *dst) +@@ -1883,7 +1884,7 @@ + + __ke_pci_dev_t* ATI_API_CALL __ke_pci_find_device (unsigned int vendor, unsigned int dev, __ke_pci_dev_t* from) + { +- return (__ke_pci_dev_t*)pci_find_device( vendor, dev, (struct pci_dev *)(void *)from ); ++ return (__ke_pci_dev_t*) pci_get_device(vendor, dev, (struct pci_dev *)(void *) from); + } + + void* ATI_API_CALL __ke_malloc(__ke_size_t size) +@@ -2813,9 +2814,9 @@ + #else + static void ATI_API_CALL (*irq_handler_func)(int, void*, void*); /* function pointer variable */ + +-static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1, struct pt_regs *regs) ++static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1) + { +- irq_handler_func(irq, arg1, regs); ++ irq_handler_func(irq, arg1, NULL); + return IRQ_HANDLED; + } + +@@ -2826,7 +2827,7 @@ + irq_handler_func = handler; + return request_irq(irq, + ke_irq_handler_wrap, +- SA_SHIRQ, dev_name, dev_id); ++ IRQF_SHARED, dev_name, dev_id); + } + + void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id) +@@ -2848,9 +2849,7 @@ + + void ATI_API_CALL __ke_unregister_ioctl32_conversion(unsigned int cmd) + { +-#ifdef FIREGL_IOCTL_COMPAT +- return 0; +-#else ++#ifndef FIREGL_IOCTL_COMPAT + unregister_ioctl32_conversion(cmd); + #endif + } +@@ -4353,7 +4352,7 @@ + void ATI_API_CALL KCL_CallFuncOnOtherCpus(firegl_void_routine_t func_to_call) + { + #ifdef CONFIG_SMP +- smp_call_function( firegl_smp_func_parameter_wrap, (void*)func_to_call, 0, 1 ); ++ smp_call_function( (void (*)(void *info)) func_to_call, NULL, 0, 1 ); + #endif + } + +@@ -5303,7 +5302,7 @@ + /** \brief Type definition of the structure describing Slab Cache object */ + typedef struct tag_kasSlabCache_t + { +- kmem_cache_t* cache; /* OS slab cache object */ ++ struct kmem_cache* cache; /* OS slab cache object */ + spinlock_t lock; /* OS spinlock object protecting the cache */ + unsigned int routine_type; /* Type of routine the cache might be accessed from */ + char name[14]; /* Cache object name (kernel 2.4 restricts its length to 19 chars) */ +@@ -5344,7 +5343,7 @@ + + slabcache_obj->routine_type = access_type; + spin_lock_init(&(slabcache_obj->lock)); +- sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)slabcache_obj); ++ sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)(long unsigned int)slabcache_obj); + + DBG_TRACE("creating slab object '%s'", slabcache_obj->name); + diff --git a/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch b/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch new file mode 100644 index 0000000..88b89a8 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch @@ -0,0 +1,33 @@ +diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh +--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 +@@ -17,6 +17,10 @@ + fi + } + ++aticonfig='/opt/bin/aticonfig' ++ ++# default high power state ++default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3` + + grep -q closed /proc/acpi/button/lid/*/state + if [ $? = 0 ]; then +@@ -46,7 +50,7 @@ + getXuser; + if [ x"$XAUTHORITY" != x"" ]; then + export DISPLAY=":$displaynum" +- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1 --effective=now" + fi + done + else +@@ -56,7 +60,7 @@ + getXuser; + if [ x"$XAUTHORITY" != x"" ]; then + export DISPLAY=":$displaynum" +- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$default_state --effective=now" + fi + done + fi + diff --git a/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch new file mode 100644 index 0000000..3819b23 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch @@ -0,0 +1,40 @@ +--- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh-orig 2007-12-23 22:48:55.873089378 -0600 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2007-12-23 22:49:59.246421379 -0600 +@@ -4,6 +4,8 @@ + # Control script for ACPI lid state and AC adapter state + # + ++aticonfig='/opt/bin/aticonfig' ++ + getXuser() { + user=`who| grep -m1 ":$displaynum " | awk '{print $1}'` + if [ x"$user" = x"" ]; then +@@ -47,7 +49,7 @@ + done + + #If PPLIB is enabled +-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB ++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB + if [ $? = 0 ]; then + echo "Has PPLIB" + has_pplib=1 +@@ -61,15 +63,15 @@ + if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then + echo "Low power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1" + fi + else + echo "high power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" + fi + fi diff --git a/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch new file mode 100644 index 0000000..f5a35a3 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch @@ -0,0 +1,42 @@ +diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh +--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 +@@ -4,6 +4,8 @@ + # Control script for ACPI lid state and AC adapter state + # + ++aticonfig='/opt/bin/aticonfig' ++ + getXuser() { + user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` + if [ x"$user" = x"" ]; then +@@ -47,7 +49,7 @@ + done + + #If PPLIB is enabled +-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB ++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB + if [ $? = 0 ]; then + echo "Has PPLIB" + has_pplib=1 +@@ -61,15 +63,15 @@ + if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then + echo "Low power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1" + fi + else + echo "high power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" + fi + fi + diff --git a/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch new file mode 100644 index 0000000..f5a35a3 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch @@ -0,0 +1,42 @@ +diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh +--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 +@@ -4,6 +4,8 @@ + # Control script for ACPI lid state and AC adapter state + # + ++aticonfig='/opt/bin/aticonfig' ++ + getXuser() { + user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` + if [ x"$user" = x"" ]; then +@@ -47,7 +49,7 @@ + done + + #If PPLIB is enabled +-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB ++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB + if [ $? = 0 ]; then + echo "Has PPLIB" + has_pplib=1 +@@ -61,15 +63,15 @@ + if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then + echo "Low power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1" + fi + else + echo "high power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" + fi + fi + diff --git a/x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch new file mode 100644 index 0000000..f5a35a3 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch @@ -0,0 +1,42 @@ +diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh +--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 +@@ -4,6 +4,8 @@ + # Control script for ACPI lid state and AC adapter state + # + ++aticonfig='/opt/bin/aticonfig' ++ + getXuser() { + user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` + if [ x"$user" = x"" ]; then +@@ -47,7 +49,7 @@ + done + + #If PPLIB is enabled +-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB ++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB + if [ $? = 0 ]; then + echo "Has PPLIB" + has_pplib=1 +@@ -61,15 +63,15 @@ + if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then + echo "Low power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1" + fi + else + echo "high power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" + fi + fi + diff --git a/x11-drivers/ati-drivers/files/8.476/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.476/ati-powermode-opt-path-2.patch new file mode 100644 index 0000000..f5a35a3 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.476/ati-powermode-opt-path-2.patch @@ -0,0 +1,42 @@ +diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh +--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 +@@ -4,6 +4,8 @@ + # Control script for ACPI lid state and AC adapter state + # + ++aticonfig='/opt/bin/aticonfig' ++ + getXuser() { + user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` + if [ x"$user" = x"" ]; then +@@ -47,7 +49,7 @@ + done + + #If PPLIB is enabled +-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB ++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB + if [ $? = 0 ]; then + echo "Has PPLIB" + has_pplib=1 +@@ -61,15 +63,15 @@ + if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then + echo "Low power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1" + fi + else + echo "high power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" + fi + fi + diff --git a/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch new file mode 100644 index 0000000..f5a35a3 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch @@ -0,0 +1,42 @@ +diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh +--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 +@@ -4,6 +4,8 @@ + # Control script for ACPI lid state and AC adapter state + # + ++aticonfig='/opt/bin/aticonfig' ++ + getXuser() { + user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` + if [ x"$user" = x"" ]; then +@@ -47,7 +49,7 @@ + done + + #If PPLIB is enabled +-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB ++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB + if [ $? = 0 ]; then + echo "Has PPLIB" + has_pplib=1 +@@ -61,15 +63,15 @@ + if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then + echo "Low power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1" + fi + else + echo "high power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" + fi + fi + diff --git a/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch b/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch new file mode 100644 index 0000000..2a2a4f2 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch @@ -0,0 +1,97 @@ +--- firegl_public.c 2008-09-19 10:57:09.000000000 +0200 ++++ firegl_public.c 2008-09-19 10:55:57.000000000 +0200 +@@ -199,6 +199,12 @@ + #define preempt_enable() + #endif + ++/* Since 2.6.27 smp_call_function doesn't have a nonatomic/retry argument */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) ++#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, wait) ++#else ++#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, retry, wait) ++#endif + // ============================================================ + /* globals */ + +@@ -250,7 +256,7 @@ + const char BUILD_KERNEL_HAS_MODVERSIONS_CLEARED; + #endif + +-#ifdef __SMP__ ++#ifdef CONFIG_SMP + const unsigned long __ke_SMP_State = 1; + const char BUILD_KERNEL_HAS_SMP_SET; + #else +@@ -2516,8 +2522,8 @@ + { + /*Some kernel developer removed the export of symbol "flush_tlb_page" on 2.6.25 x86_64 SMP kernel. + Define a simple version here.*/ +-#if defined(__x86_64__) && defined(__SMP__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) +- on_each_cpu(KCL_flush_tlb_one, &va, 1, 1); ++#if defined(__x86_64__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) ++ on_each_cpu(KCL_flush_tlb_one, &va, 1); + #else + flush_tlb_page(vma, va); + #endif +@@ -2902,7 +2908,7 @@ + + /*****************************************************************************/ + +-#ifdef __SMP__ ++#ifdef CONFIG_SMP + static atomic_t cpus_waiting; + + static void deferred_flush(void* contextp) +@@ -2918,13 +2924,13 @@ + while (atomic_read(&cpus_waiting) > 0) + barrier(); + } +-#endif /* __SMP__ */ ++#endif /* CONFIG_SMP */ + + int ATI_API_CALL __ke_flush_cache(void) + { +-#ifdef __SMP__ ++#ifdef CONFIG_SMP + /* write back invalidate all other CPUs (exported by kernel) */ +- if (smp_call_function(deferred_flush, NULL, 1, 0) != 0) ++ if (SMP_CALL_FUNCTION(deferred_flush, NULL, 1, 0) != 0) + panic("timed out waiting for the other CPUs!\n"); + + /* invalidate this CPU */ +@@ -2938,7 +2944,7 @@ + + while (atomic_read(&cpus_waiting) > 0) + barrier(); +-#else /* !__SMP__ */ ++#else /* !CONFIG_SMP */ + #if defined(__i386__) || defined(__x86_64__) + asm volatile ("wbinvd":::"memory"); + #elif defined(__alpha__) || defined(__sparc__) +@@ -2946,7 +2952,7 @@ + #else + #error "Please define flush_cache for your architecture." + #endif +-#endif /* !__SMP__ */ ++#endif /* !CONFIG_SMP */ + + //for kernel 2.6.25, tlb_flush has been included when calling set_pages_*. + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) +@@ -4654,7 +4660,7 @@ + } + + #ifdef CONFIG_SMP +- if (smp_call_function(KCL_setup_pat, NULL, 0, 1) != 0) ++ if (SMP_CALL_FUNCTION(KCL_setup_pat, NULL, 0, 1) != 0) + return 0; + #endif + KCL_setup_pat(NULL); +@@ -4673,7 +4679,7 @@ + } + + #ifdef CONFIG_SMP +- if (smp_call_function(KCL_restore_pat, NULL, 0, 1) != 0) ++ if (SMP_CALL_FUNCTION(KCL_restore_pat, NULL, 0, 1) != 0) + return; + #endif + KCL_restore_pat(NULL); diff --git a/x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch b/x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch new file mode 100644 index 0000000..a1b88df --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch @@ -0,0 +1,62 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:17:27.000000000 +0000 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:12:34.000000000 +0000 +@@ -31,6 +31,9 @@ + #include + + #if !defined(CONFIG_X86_PC) ++#if !defined(CONFIG_X86_PC_XEN) ++#if !defined(CONFIG_X86_XEN) ++#if !defined(CONFIG_X86_64_XEN) + #if !defined(CONFIG_X86_64) + #if !defined(CONFIG_X86_VOYAGER) + #if !defined(CONFIG_X86_NUMAQ) +@@ -47,6 +50,9 @@ + #endif + #endif + #endif ++#endif ++#endif ++#endif + + /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines + * a static inline function that uses a GPL-only symbol in a header +--- common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:17:27.000000000 +0000 ++++ common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:15:45.000000000 +0000 +@@ -30,9 +30,13 @@ + #endif + + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) +- ++#ifdef CONFIG_XEN ++#define REMAP_PAGE_RANGE_FN io_remap_pfn_range ++#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range" ++#else + #define REMAP_PAGE_RANGE_FN remap_pfn_range + #define REMAP_PAGE_RANGE_STR "remap_pfn_range" ++#endif + #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT) + + #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */ +@@ -43,13 +47,21 @@ + + #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */ + ++#ifdef CONFIG_XEN ++#define REMAP_PAGE_RANGE(vma,offset) \ ++ REMAP_PAGE_RANGE_FN((vma), \ ++ (vma)->vm_start, \ ++ REMAP_PAGE_RANGE_OFF(offset), \ ++ (vma)->vm_end - (vma)->vm_start, \ ++ (vma)->vm_page_prot) ++#else + #define REMAP_PAGE_RANGE(vma,offset) \ + REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \ + (vma)->vm_start, \ + REMAP_PAGE_RANGE_OFF(offset), \ + (vma)->vm_end - (vma)->vm_start, \ + (vma)->vm_page_prot) +- ++#endif + + /* Page table macros */ + diff --git a/x11-drivers/ati-drivers/files/8.573/ati-drivers-xen-8.552.patch b/x11-drivers/ati-drivers/files/8.573/ati-drivers-xen-8.552.patch new file mode 100644 index 0000000..a1b88df --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.573/ati-drivers-xen-8.552.patch @@ -0,0 +1,62 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:17:27.000000000 +0000 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:12:34.000000000 +0000 +@@ -31,6 +31,9 @@ + #include + + #if !defined(CONFIG_X86_PC) ++#if !defined(CONFIG_X86_PC_XEN) ++#if !defined(CONFIG_X86_XEN) ++#if !defined(CONFIG_X86_64_XEN) + #if !defined(CONFIG_X86_64) + #if !defined(CONFIG_X86_VOYAGER) + #if !defined(CONFIG_X86_NUMAQ) +@@ -47,6 +50,9 @@ + #endif + #endif + #endif ++#endif ++#endif ++#endif + + /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines + * a static inline function that uses a GPL-only symbol in a header +--- common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:17:27.000000000 +0000 ++++ common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:15:45.000000000 +0000 +@@ -30,9 +30,13 @@ + #endif + + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) +- ++#ifdef CONFIG_XEN ++#define REMAP_PAGE_RANGE_FN io_remap_pfn_range ++#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range" ++#else + #define REMAP_PAGE_RANGE_FN remap_pfn_range + #define REMAP_PAGE_RANGE_STR "remap_pfn_range" ++#endif + #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT) + + #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */ +@@ -43,13 +47,21 @@ + + #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */ + ++#ifdef CONFIG_XEN ++#define REMAP_PAGE_RANGE(vma,offset) \ ++ REMAP_PAGE_RANGE_FN((vma), \ ++ (vma)->vm_start, \ ++ REMAP_PAGE_RANGE_OFF(offset), \ ++ (vma)->vm_end - (vma)->vm_start, \ ++ (vma)->vm_page_prot) ++#else + #define REMAP_PAGE_RANGE(vma,offset) \ + REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \ + (vma)->vm_start, \ + REMAP_PAGE_RANGE_OFF(offset), \ + (vma)->vm_end - (vma)->vm_start, \ + (vma)->vm_page_prot) +- ++#endif + + /* Page table macros */ + diff --git a/x11-drivers/ati-drivers/files/8.573/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.573/ati-powermode-opt-path-2.patch new file mode 100644 index 0000000..f5a35a3 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.573/ati-powermode-opt-path-2.patch @@ -0,0 +1,42 @@ +diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh +--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 +@@ -4,6 +4,8 @@ + # Control script for ACPI lid state and AC adapter state + # + ++aticonfig='/opt/bin/aticonfig' ++ + getXuser() { + user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` + if [ x"$user" = x"" ]; then +@@ -47,7 +49,7 @@ + done + + #If PPLIB is enabled +-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB ++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB + if [ $? = 0 ]; then + echo "Has PPLIB" + has_pplib=1 +@@ -61,15 +63,15 @@ + if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then + echo "Low power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1" + fi + else + echo "high power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" + fi + fi + diff --git a/x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch b/x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch new file mode 100644 index 0000000..a1b88df --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch @@ -0,0 +1,62 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:17:27.000000000 +0000 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:12:34.000000000 +0000 +@@ -31,6 +31,9 @@ + #include + + #if !defined(CONFIG_X86_PC) ++#if !defined(CONFIG_X86_PC_XEN) ++#if !defined(CONFIG_X86_XEN) ++#if !defined(CONFIG_X86_64_XEN) + #if !defined(CONFIG_X86_64) + #if !defined(CONFIG_X86_VOYAGER) + #if !defined(CONFIG_X86_NUMAQ) +@@ -47,6 +50,9 @@ + #endif + #endif + #endif ++#endif ++#endif ++#endif + + /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines + * a static inline function that uses a GPL-only symbol in a header +--- common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:17:27.000000000 +0000 ++++ common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:15:45.000000000 +0000 +@@ -30,9 +30,13 @@ + #endif + + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) +- ++#ifdef CONFIG_XEN ++#define REMAP_PAGE_RANGE_FN io_remap_pfn_range ++#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range" ++#else + #define REMAP_PAGE_RANGE_FN remap_pfn_range + #define REMAP_PAGE_RANGE_STR "remap_pfn_range" ++#endif + #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT) + + #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */ +@@ -43,13 +47,21 @@ + + #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */ + ++#ifdef CONFIG_XEN ++#define REMAP_PAGE_RANGE(vma,offset) \ ++ REMAP_PAGE_RANGE_FN((vma), \ ++ (vma)->vm_start, \ ++ REMAP_PAGE_RANGE_OFF(offset), \ ++ (vma)->vm_end - (vma)->vm_start, \ ++ (vma)->vm_page_prot) ++#else + #define REMAP_PAGE_RANGE(vma,offset) \ + REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \ + (vma)->vm_start, \ + REMAP_PAGE_RANGE_OFF(offset), \ + (vma)->vm_end - (vma)->vm_start, \ + (vma)->vm_page_prot) +- ++#endif + + /* Page table macros */ + diff --git a/x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch new file mode 100644 index 0000000..f5a35a3 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch @@ -0,0 +1,42 @@ +diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh +--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 +@@ -4,6 +4,8 @@ + # Control script for ACPI lid state and AC adapter state + # + ++aticonfig='/opt/bin/aticonfig' ++ + getXuser() { + user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` + if [ x"$user" = x"" ]; then +@@ -47,7 +49,7 @@ + done + + #If PPLIB is enabled +-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB ++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB + if [ $? = 0 ]; then + echo "Has PPLIB" + has_pplib=1 +@@ -61,15 +63,15 @@ + if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then + echo "Low power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1" + fi + else + echo "high power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" + fi + fi + diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch new file mode 100644 index 0000000..160565a --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch @@ -0,0 +1,67 @@ +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c 2006-10-27 09:44:23.902749464 -0500 +@@ -61,7 +61,6 @@ + #include + #endif + #endif +-#include + #include + #include + #include +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c 2006-10-27 09:44:34.265174136 -0500 +@@ -99,9 +99,6 @@ + #endif + #endif + +-#include +- +- + #include + #include + #include +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h fglrx-install/common/lib/modules/fglrx/build_mod/drm.h +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/drm.h 2006-10-27 09:44:52.502401656 -0500 +@@ -38,7 +38,6 @@ + #define _DRM_H_ + + #if defined(__linux__) +-#include + #include /* For _IO* macros */ + #define DRM_IOCTL_NR(n) _IOC_NR(n) + #define DRM_IOC_VOID _IOC_NONE +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h 2006-10-27 09:45:03.912667032 -0500 +@@ -42,7 +42,6 @@ + * can build the DRM (part of PI DRI). 4/21/2000 S + B */ + #include + #endif /* __alpha__ */ +-#include + #include + #include + #include +diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c +--- fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c 2006-09-19 19:30:42.000000000 -0500 ++++ fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c 2006-10-27 09:45:47.463046368 -0500 +@@ -67,9 +67,6 @@ + * for example for CPU hot-plugging. I wonder why a desktop + * distribution would even include such a kernel patch. */ + #ifdef CONFIG_MEM_MIRROR +-/* Prevent linux/config.h from being included again in subsequent +- * kernel headers as that would redefine CONFIG_MEM_MIRROR. */ +-#include + #warning "Disabling CONFIG_MEM_MIRROR because it does not work with non-GPL modules." + #warning "This will break page tracking when the fglrx kernel module is used." + #undef CONFIG_MEM_MIRROR +@@ -86,7 +83,6 @@ + #include /* for installing the patch wrapper */ + #include + +-#include + #include + #include + #include diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch new file mode 100644 index 0000000..aeaba71 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch @@ -0,0 +1,73 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2006-12-18 10:58:15.000000000 -0500 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2006-12-18 11:14:04.000000000 -0500 +@@ -181,6 +181,70 @@ + int errno; + #endif // __ia64__ + ++#if defined(__i386__) ++#define __syscall_return(type, res) \ ++do { \ ++ if ((unsigned long)(res) >= (unsigned long)(-(128 + 1))) { \ ++ errno = -(res); \ ++ res = -1; \ ++ } \ ++ return (type) (res); \ ++} while (0) ++#define _syscall2(type,name,type1,arg1,type2,arg2) \ ++type name(type1 arg1,type2 arg2) \ ++{ \ ++long __res; \ ++__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \ ++ : "=a" (__res) \ ++ : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)) \ ++ : "memory"); \ ++__syscall_return(type,__res); \ ++} ++ ++#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \ ++type name(type1 arg1,type2 arg2,type3 arg3) \ ++{ \ ++long __res; \ ++__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \ ++ : "=a" (__res) \ ++ : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \ ++ "d" ((long)(arg3)) : "memory"); \ ++__syscall_return(type,__res); \ ++} ++#elif defined(__x86_64__) ++#define __syscall_clobber "r11","rcx","memory" ++#define __syscall "syscall" ++ ++#define __syscall_return(type, res) \ ++do { \ ++ if ((unsigned long)(res) >= (unsigned long)(-127)) { \ ++ errno = -(res); \ ++ res = -1; \ ++ } \ ++ return (type) (res); \ ++} while (0) ++#define _syscall2(type,name,type1,arg1,type2,arg2) \ ++type name(type1 arg1,type2 arg2) \ ++{ \ ++long __res; \ ++__asm__ volatile (__syscall \ ++ : "=a" (__res) \ ++ : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)) : __syscall_clobber ); \ ++__syscall_return(type,__res); \ ++} ++ ++#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \ ++type name(type1 arg1,type2 arg2,type3 arg3) \ ++{ \ ++long __res; \ ++__asm__ volatile (__syscall \ ++ : "=a" (__res) \ ++ : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)), \ ++ "d" ((long)(arg3)) : __syscall_clobber); \ ++__syscall_return(type,__res); \ ++} ++#endif ++ + // int mlock(const void *addr, size_t len); + _syscall2(int, mlock, const void *, addr, size_t, len ) + // int munlock(const void *addr, size_t len); diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch new file mode 100644 index 0000000..665d8d6 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch @@ -0,0 +1,33 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-29 23:48:46.000000000 +0200 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-30 00:15:21.000000000 +0200 +@@ -5055,7 +5057,6 @@ + */ + unsigned int ATI_API_CALL KAS_SlabCache_Destroy(void* hSlabCache) + { +- unsigned int ret = 0; + kasSlabCache_t* slabcache_obj = (kasSlabCache_t*)hSlabCache; + + DBG_ENTER("0x%08X", hSlabCache); +@@ -5069,18 +5070,11 @@ + + DBG_TRACE("destroying slab object '%s'", slabcache_obj->name); + +- if (kmem_cache_destroy(slabcache_obj->cache) == 0) +- { +- ret = 1; +- slabcache_obj->cache = NULL; +- } +- else +- { +- DBG_ERROR("destroying failed"); +- } ++ kmem_cache_destroy(slabcache_obj->cache); ++ slabcache_obj->cache = NULL; + +- DBG_LEAVE("%d", ret); +- return ret; ++ DBG_LEAVE("1"); ++ return 1; + } + + /** \brief Allocate an entry in a Slab Cache diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch new file mode 100644 index 0000000..c830d38 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch @@ -0,0 +1,11 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-29 23:48:46.000000000 +0200 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-30 00:15:21.000000000 +0200 +@@ -171,6 +171,8 @@ + #endif + #endif + ++#include ++ + #include + + // To enable DBG_* macros set this variable to nonzero diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch new file mode 100644 index 0000000..fb6119e --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch @@ -0,0 +1,22 @@ +=== modified file 'common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh' +--- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2007-02-09 12:25:40 +0000 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2007-02-09 12:28:54 +0000 +@@ -46,7 +46,7 @@ + getXuser; + if [ x"$XAUTHORITY" != x"" ]; then + export DISPLAY=":$displaynum" +- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "/opt/bin/aticonfig --set-powerstate=1 --effective=now" + fi + done + else +@@ -56,7 +56,7 @@ + getXuser; + if [ x"$XAUTHORITY" != x"" ]; then + export DISPLAY=":$displaynum" +- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "/opt/bin/aticonfig --set-powerstate=3 --effective=now" + fi + done + fi + diff --git a/x11-drivers/ati-drivers/files/ati-powermode.sh.patch b/x11-drivers/ati-drivers/files/ati-powermode.sh.patch new file mode 100644 index 0000000..cd776e0 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-powermode.sh.patch @@ -0,0 +1,32 @@ +diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh +--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 +@@ -17,6 +17,10 @@ + fi + } + ++aticonfig='/opt/ati/bin/aticonfig' ++ ++# default high power state ++default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3` + + grep -q closed /proc/acpi/button/lid/*/state + if [ $? = 0 ]; then +@@ -46,7 +50,7 @@ + getXuser; + if [ x"$XAUTHORITY" != x"" ]; then + export DISPLAY=":$displaynum" +- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1 --effective=now" + fi + done + else +@@ -56,7 +60,7 @@ + getXuser; + if [ x"$XAUTHORITY" != x"" ]; then + export DISPLAY=":$displaynum" +- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$default_state --effective=now" + fi + done + fi diff --git a/x11-drivers/ati-drivers/files/atieventsd.init b/x11-drivers/ati-drivers/files/atieventsd.init new file mode 100644 index 0000000..73139ce --- /dev/null +++ b/x11-drivers/ati-drivers/files/atieventsd.init @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.init,v 1.3 2007/05/18 23:58:01 marienz Exp $ + +depend() { + need acpid +} + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --exec /opt/sbin/atieventsd -- ${ATIEVENTSDOPTS} + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --exec /opt/sbin/atieventsd + eend $? +} \ No newline at end of file diff --git a/x11-drivers/ati-drivers/files/atieventsd.rc6 b/x11-drivers/ati-drivers/files/atieventsd.rc6 new file mode 100644 index 0000000..2180e0e --- /dev/null +++ b/x11-drivers/ati-drivers/files/atieventsd.rc6 @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.rc6,v 1.2 2006/08/04 12:20:19 chrb Exp $ + +depend() { + need acpid +} + +start() { + start-stop-daemon --start --pidfile /var/run/atieventsd.pid \ + --exec /opt/ati/sbin/atieventsd -- ${ATIEVENTSDOPTS} + local pid=`pidof atieventsd` + echo $pid > /var/run/atieventsd.pid + eend $? +} + +stop() { + start-stop-daemon --stop --quiet --pidfile /var/run/atieventsd.pid + eend $? +} + diff --git a/x11-drivers/ati-drivers/files/libGL.la.in b/x11-drivers/ati-drivers/files/libGL.la.in new file mode 100644 index 0000000..7fdc409 --- /dev/null +++ b/x11-drivers/ati-drivers/files/libGL.la.in @@ -0,0 +1,32 @@ +# libGL.la - a libtool library file +# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='libGL.so.1' + +# Names of this library. +library_names='libGL.so.${libmajor}.${libminor} libGL.so.${libmajor} libGL.so' + +# The name of the static archive. +old_library='' + +# Libraries that this one depends upon. +dependency_libs='-L/usr/${libdir} -lX11 -lXext -ldl' + +# Version information for libGL. +current=1 +age=0 +revision=${revision} + +# Is this an already installed library? +installed=yes + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/usr/${libdir}'