6 files changed, 226 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..b33008e0c9d4
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,77 @@
+pkgbase = nvidia-304xx-ck
+	pkgdesc = NVIDIA drivers for linux-ck, 304xx legacy branch.
+	pkgver = 304.125
+	pkgrel = 19
+	url = http://www.nvidia.com/
+	install = nvidia-304xx-ck.install
+	arch = i686
+	arch = x86_64
+	license = custom
+	makedepends = linux-ck-headers>=4.0
+	makedepends = linux-ck-headers<4.1
+	depends = linux-ck>=4.0
+	depends = linux-ck<4.1
+	depends = nvidia-304xx-libgl
+	depends = nvidia-304xx-utils=304.125
+	conflicts = nvidia-340xx-ck
+	conflicts = nvidia-ck
+	conflicts = nvidia-275xx-ck
+	conflicts = nvidia-319-ck
+	conflicts = nvidia-96xx-ck
+	conflicts = nvidia-beta-ck
+	conflicts = nvidia-ck-atom
+	conflicts = nvidia-ck-barcelona
+	conflicts = nvidia-ck-bulldozer
+	conflicts = nvidia-ck-corex
+	conflicts = nvidia-ck-core2
+	conflicts = nvidia-ck-haswell
+	conflicts = nvidia-ck-ivybridge
+	conflicts = nvidia-ck-kx
+	conflicts = nvidia-ck-k10
+	conflicts = nvidia-ck-nehalem
+	conflicts = nvidia-ck-p4
+	conflicts = nvidia-ck-piledriver
+	conflicts = nvidia-ck-pentm
+	conflicts = nvidia-ck-sandybridge
+	conflicts = nvidia-304xx-ck-atom
+	conflicts = nvidia-304xx-ck-barcelona
+	conflicts = nvidia-304xx-ck-corex
+	conflicts = nvidia-304xx-ck-core2
+	conflicts = nvidia-304xx-ck-haswell
+	conflicts = nvidia-304xx-ck-ivybridge
+	conflicts = nvidia-304xx-ck-kx
+	conflicts = nvidia-304xx-ck-k10
+	conflicts = nvidia-304xx-ck-nehalem
+	conflicts = nvidia-304xx-ck-p4
+	conflicts = nvidia-304xx-ck-piledriver
+	conflicts = nvidia-304xx-ck-pentm
+	conflicts = nvidia-304xx-ck-sandybridge
+	conflicts = nvidia-340xx-ck-atom
+	conflicts = nvidia-340xx-ck-barcelona
+	conflicts = nvidia-340xx-ck-bulldozer
+	conflicts = nvidia-340xx-ck-core2
+	conflicts = nvidia-340xx-ck-haswell
+	conflicts = nvidia-340xx-ck-ivybridge
+	conflicts = nvidia-340xx-ck-kx
+	conflicts = nvidia-340xx-ck-k10
+	conflicts = nvidia-340xx-ck-nehalem
+	conflicts = nvidia-340xx-ck-p4
+	conflicts = nvidia-340xx-ck-piledriver
+	conflicts = nvidia-340xx-ck-pentm
+	conflicts = nvidia-340xx-ck-sandybridge
+	conflicts = nvidia-340xx-ck-silvermont
+	conflicts = nvidia-ck-silvermont
+	options = !strip
+	source = nv-drm.patch
+	source = nvidia-3.19.patch
+	source = nvidia-4.0.patch
+	md5sums = 2365f1405f0c7bbb8f8cd7ebd5e4e301
+	md5sums = 965a8455b291fdb414a02101a3a9f587
+	md5sums = f42bdf589f52d4e6c38baa5bef15eef8
+	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/304.125/NVIDIA-Linux-x86-304.125.run
+	md5sums_i686 = bc3b0ac291fa998d5109a6f7e94fb2d4
+	source_x86_64 = http://://us.download.nvidia.com/XFree86/Linux-x86_64/304.125/NVIDIA-Linux-x86_64-304.125-no-compat32.run
+	md5sums_x86_64 = 291d41ccdbcc08f752a38f9e0a7eeea0
+
+pkgname = nvidia-304xx-ck
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..c79117fa0474
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: graysky <graysky AT archlnux.us>
+# Contributor: A.J. Korf <jacobkorf at gmail dot com>
+# Contributor: Thomas Baechler <thomas@archlinux.org>
+
+pkgname=nvidia-304xx-ck
+pkgver=304.125
+_extramodules=extramodules-4.0-ck
+pkgrel=19
+_pkgdesc="NVIDIA drivers for linux-ck, 304xx legacy branch."
+pkgdesc="$_pkgdesc"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux-ck>=4.0' 'linux-ck<4.1' 'nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}")
+makedepends=('linux-ck-headers>=4.0' 'linux-ck-headers<4.1')
+conflicts=('nvidia-340xx-ck' 'nvidia-ck' 'nvidia-275xx-ck' 'nvidia-319-ck' 'nvidia-96xx-ck' 'nvidia-beta-ck' 'nvidia-ck-atom' 'nvidia-ck-barcelona' 'nvidia-ck-bulldozer' 'nvidia-ck-corex' 'nvidia-ck-core2' 'nvidia-ck-haswell' 'nvidia-ck-ivybridge' 'nvidia-ck-kx' 'nvidia-ck-k10' 'nvidia-ck-nehalem' 'nvidia-ck-p4' 'nvidia-ck-piledriver' 'nvidia-ck-pentm' 'nvidia-ck-sandybridge' 'nvidia-304xx-ck-atom' 'nvidia-304xx-ck-barcelona' 'nvidia-304xx-ck-corex' 'nvidia-304xx-ck-core2' 'nvidia-304xx-ck-haswell' 'nvidia-304xx-ck-ivybridge' 'nvidia-304xx-ck-kx' 'nvidia-304xx-ck-k10' 'nvidia-304xx-ck-nehalem' 'nvidia-304xx-ck-p4' 'nvidia-304xx-ck-piledriver' 'nvidia-304xx-ck-pentm' 'nvidia-304xx-ck-sandybridge' 'nvidia-340xx-ck-atom' 'nvidia-340xx-ck-barcelona' 'nvidia-340xx-ck-bulldozer' 'nvidia-340xx-ck-core2' 'nvidia-340xx-ck-haswell' 'nvidia-340xx-ck-ivybridge' 'nvidia-340xx-ck-kx' 'nvidia-340xx-ck-k10' 'nvidia-340xx-ck-nehalem' 'nvidia-340xx-ck-p4' 'nvidia-340xx-ck-piledriver' 'nvidia-340xx-ck-pentm' 'nvidia-340xx-ck-sandybridge' 'nvidia-340xx-ck-silvermont' 'nvidia-ck-silvermont')
+#groups=('ck-generic')
+#replaces=()
+license=('custom')
+install=nvidia-304xx-ck.install
+options=(!strip)
+source=('nv-drm.patch'
+'nvidia-3.19.patch'
+'nvidia-4.0.patch')
+source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
+source_x86_64+=("http://://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
+md5sums=('2365f1405f0c7bbb8f8cd7ebd5e4e301'
+         '965a8455b291fdb414a02101a3a9f587'
+         'f42bdf589f52d4e6c38baa5bef15eef8')
+md5sums_i686=('bc3b0ac291fa998d5109a6f7e94fb2d4')
+md5sums_x86_64=('291d41ccdbcc08f752a38f9e0a7eeea0')
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+	sh "${_pkg}.run" --extract-only
+	cd "${_pkg}"
+	patch -Np0 -i "$srcdir/nv-drm.patch"
+	patch -p1 -i "$srcdir/nvidia-3.19.patch"
+	patch -p0 -i "$srcdir/nvidia-4.0.patch"
+}
+
+build() {
+	_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+	cd ${_pkg}/kernel
+	make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package() {
+	install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+		"${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+	install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+	echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-ck.conf"
+	sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia-304xx-ck.install"
+	gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+
+	# the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time.
+}
diff --git a/nv-drm.patch b/nv-drm.patch
new file mode 100644
index 000000000000..820463d378c2
--- /dev/null
+++ b/nv-drm.patch
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200
++++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include <drm/drmP.h>
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include <drm/drm_gem.h>
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
++++ kernel/nv-drm.c
+@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = {
+     .gem_prime_vmap = nv_gem_prime_vmap,
+     .gem_prime_vunmap = nv_gem_prime_vunmap,
+
++    .set_busid = drm_pci_set_busid,
++
+     .name = "nvidia-drm",
+     .desc = "NVIDIA DRM driver",
+     .date = "20130102",
diff --git a/nvidia-3.19.patch b/nvidia-3.19.patch
new file mode 100644
index 000000000000..2ace4237a0e7
--- /dev/null
+++ b/nvidia-3.19.patch
@@ -0,0 +1,22 @@
+diff -Npur NVIDIA-Linux-x86_64-304.orig/kernel/nv.c NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c
+--- NVIDIA-Linux-x86_64-304.orig/kernel/nv.c	2014-12-02 04:58:34.000000000 +0100
++++ NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c	2014-12-21 17:50:33.420697348 +0100
+@@ -2026,7 +2026,7 @@ long nv_kern_unlocked_ioctl(
+     unsigned long i_arg
+ )
+ {
+-    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+ }
+ 
+ long nv_kern_compat_ioctl(
+@@ -2035,7 +2035,7 @@ long nv_kern_compat_ioctl(
+     unsigned long i_arg
+ )
+ {
+-    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+ }
+ 
+ /*
+
diff --git a/nvidia-304xx-ck.install b/nvidia-304xx-ck.install
new file mode 100644
index 000000000000..bd3ec6bb7b6c
--- /dev/null
+++ b/nvidia-304xx-ck.install
@@ -0,0 +1,15 @@
+post_install() {
+	EXTRAMODULES='extramodules-4.0-ck'
+	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+	echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+	EXTRAMODULES='extramodules-4.0-ck'
+	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+	EXTRAMODULES='extramodules-4.0-ck'
+	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
diff --git a/nvidia-4.0.patch b/nvidia-4.0.patch
new file mode 100644
index 000000000000..905ebeaf3fde
--- /dev/null
+++ b/nvidia-4.0.patch
@@ -0,0 +1,28 @@
+--- kernel/nv-pat.c~ 2015-02-22 20:39:43.889075396 -0800
++++ kernel/nv-pat.c 2015-02-22 20:29:33.519735577 -0800
+@@ -35,8 +35,13 @@
+     unsigned long cr0 = read_cr0();
+     write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
+     wbinvd();
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++    *cr4 = __read_cr4();
++    if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
++#else
+     *cr4 = read_cr4();
+     if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
++#endif
+     __flush_tlb();
+ }
+ 
+@@ -46,7 +46,11 @@
+     wbinvd();
+     __flush_tlb();
+     write_cr0((cr0 & 0x9fffffff));
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++    if (cr4 & 0x80) __write_cr4(cr4);
++#else
+     if (cr4 & 0x80) write_cr4(cr4);
++#endif
+ }
+ 
+ static int nv_determine_pat_mode(void)