[arch-commits] Commit in nvidia/repos/extra-x86_64 (5 files)

2019-05-16 Thread Felix Yan via arch-commits 
Date: Thursday, May 16, 2019 @ 19:45:50
  Author: felixonmars
Revision: 353494

archrelease: copy trunk to extra-x86_64

Added:
  nvidia/repos/extra-x86_64/PKGBUILD
(from rev 353493, nvidia/trunk/PKGBUILD)
  nvidia/repos/extra-x86_64/fs62142.patch
(from rev 353493, nvidia/trunk/fs62142.patch)
Deleted:
  nvidia/repos/extra-x86_64/PKGBUILD
  nvidia/repos/extra-x86_64/fs62142.patch
  nvidia/repos/extra-x86_64/kernel-4.16.patch

---+
 PKGBUILD  |  176 +---
 fs62142.patch |   26 +++
 kernel-4.16.patch |   33 -
 3 files changed, 98 insertions(+), 137 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2019-05-16 19:45:35 UTC (rev 353493)
+++ PKGBUILD2019-05-16 19:45:50 UTC (rev 353494)
@@ -1,91 +0,0 @@
-# Maintainer: Sven-Hendrik Haase 
-# Maintainer: Felix Yan 
-# Contributor: Thomas Baechler 
-
-pkgbase=nvidia
-pkgname=(nvidia nvidia-dkms)
-pkgver=418.74
-_extramodules=extramodules-ARCH
-pkgrel=4
-pkgdesc="NVIDIA drivers for linux"
-arch=('x86_64')
-url="http://www.nvidia.com/;
-makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
-license=('custom')
-options=('!strip')
-_pkg="NVIDIA-Linux-x86_64-${pkgver}"
-source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
-kernel-4.16.patch
-fs62142.patch)
-sha512sums=('485d94f0a328c117f86c7b2d8e14885aa1e498755bcc7285aaba1cf5e8f4672feaece7c87a7d0f835c55ff4022d0be6b023ffee262f0a3073ccf88ca1f39201f'
-
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af'
-
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
-
-prepare() {
-sh "${_pkg}.run" --extract-only
-cd "${_pkg}"
-
-# Restore phys_to_dma support (still needed for 396.18)
-# https://bugs.archlinux.org/task/58074
-patch -Np1 -i ../kernel-4.16.patch
-
-# Fix https://bugs.archlinux.org/task/62142
-patch -Np1 -i ../fs62142.patch
-
-cp -a kernel kernel-dkms
-cd kernel-dkms
-sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
-sed -i 's/__JOBS/`nproc`/' dkms.conf
-sed -i 's/__DKMS_MODULES//' dkms.conf
-sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
-DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[1]="nvidia-uvm"\
-DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[2]="nvidia-modeset"\
-DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[3]="nvidia-drm"\
-DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
-
-# Gift for linux-rt guys
-sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
-}
-
-build() {
-_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-cd "${_pkg}"/kernel
-make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package_nvidia() {
-pkgdesc="NVIDIA drivers for linux"
-depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
-
-install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
-  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
-
-find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
-
-echo "blacklist nouveau" |
-install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
-
-install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
-}
-
-package_nvidia-dkms() {
-pkgdesc="NVIDIA driver sources for linux"
-depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
-optdepends=('linux-headers: Build the module for Arch kernel'
-'linux-lts-headers: Build the module for LTS Arch kernel')
-provides=("nvidia=$pkgver")
-conflicts+=('nvidia')
-
-cd ${_pkg}
-
-install -dm 755 "${pkgdir}"/usr/src
-cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
-
-echo "blacklist nouveau" |
-install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
-
-install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
-}

Copied: nvidia/repos/extra-x86_64/PKGBUILD (from rev 353493, 
nvidia/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2019-05-16 19:45:50 UTC (rev 353494)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.14
+_extramodules=extramodules-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"

[arch-commits] Commit in nvidia/repos/extra-x86_64 (5 files)

2019-04-01 Thread Sven-Hendrik Haase via arch-commits 
Date: Tuesday, April 2, 2019 @ 00:04:02
  Author: svenstaro
Revision: 349580

archrelease: copy trunk to extra-x86_64

Added:
  nvidia/repos/extra-x86_64/PKGBUILD
(from rev 349579, nvidia/trunk/PKGBUILD)
  nvidia/repos/extra-x86_64/fs62142.patch
(from rev 349579, nvidia/trunk/fs62142.patch)
  nvidia/repos/extra-x86_64/kernel-4.16.patch
(from rev 349579, nvidia/trunk/kernel-4.16.patch)
Deleted:
  nvidia/repos/extra-x86_64/PKGBUILD
  nvidia/repos/extra-x86_64/kernel-4.16.patch

---+
 PKGBUILD  |  177 ++--
 fs62142.patch |   13 +++
 kernel-4.16.patch |   66 +--
 3 files changed, 137 insertions(+), 119 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2019-04-01 23:58:44 UTC (rev 349579)
+++ PKGBUILD2019-04-02 00:04:02 UTC (rev 349580)
@@ -1,86 +0,0 @@
-# Maintainer: Sven-Hendrik Haase 
-# Maintainer: Felix Yan 
-# Contributor: Thomas Baechler 
-
-pkgbase=nvidia
-pkgname=(nvidia nvidia-dkms)
-pkgver=418.56
-_extramodules=extramodules-ARCH
-pkgrel=3
-pkgdesc="NVIDIA drivers for linux"
-arch=('x86_64')
-url="http://www.nvidia.com/;
-makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
-license=('custom')
-options=('!strip')
-_pkg="NVIDIA-Linux-x86_64-${pkgver}"
-source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
-kernel-4.16.patch)
-sha512sums=('859b9a27b75416f269037f4ae2af16b4807c704edc63d70be4b2ea96661ef29efde8e4793c015a25ce56a55ee55a707273e9ec55c9d6e3a0caaf8442ccb43910'
-
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
-
-prepare() {
-sh "${_pkg}.run" --extract-only
-cd "${_pkg}"
-
-# Restore phys_to_dma support (still needed for 396.18)
-# https://bugs.archlinux.org/task/58074
-patch -Np1 -i ../kernel-4.16.patch
-
-cp -a kernel kernel-dkms
-cd kernel-dkms
-sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
-sed -i 's/__JOBS/`nproc`/' dkms.conf
-sed -i 's/__DKMS_MODULES//' dkms.conf
-sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
-DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[1]="nvidia-uvm"\
-DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[2]="nvidia-modeset"\
-DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[3]="nvidia-drm"\
-DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
-
-# Gift for linux-rt guys
-sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
-}
-
-build() {
-_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-cd "${_pkg}"/kernel
-make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package_nvidia() {
-pkgdesc="NVIDIA drivers for linux"
-depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
-
-install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
-  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
-
-find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
-
-echo "blacklist nouveau" |
-install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
-
-install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
-}
-
-package_nvidia-dkms() {
-pkgdesc="NVIDIA driver sources for linux"
-depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
-optdepends=('linux-headers: Build the module for Arch kernel'
-'linux-lts-headers: Build the module for LTS Arch kernel')
-provides=("nvidia=$pkgver")
-conflicts+=('nvidia')
-
-cd ${_pkg}
-
-install -dm 755 "${pkgdir}"/usr/src
-cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
-
-echo "blacklist nouveau" |
-install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
-
-install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
-}

Copied: nvidia/repos/extra-x86_64/PKGBUILD (from rev 349579, 
nvidia/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2019-04-02 00:04:02 UTC (rev 349580)
@@ -0,0 +1,91 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=418.56
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch
+fs62142.patch)

[arch-commits] Commit in nvidia/repos/extra-x86_64 (5 files)

2019-03-29 Thread Sven-Hendrik Haase via arch-commits 
Date: Friday, March 29, 2019 @ 15:55:01
  Author: svenstaro
Revision: 349409

archrelease: copy trunk to extra-x86_64

Added:
  nvidia/repos/extra-x86_64/PKGBUILD
(from rev 349408, nvidia/trunk/PKGBUILD)
  nvidia/repos/extra-x86_64/fs62142.patch
(from rev 349408, nvidia/trunk/fs62142.patch)
  nvidia/repos/extra-x86_64/kernel-4.16.patch
(from rev 349408, nvidia/trunk/kernel-4.16.patch)
Deleted:
  nvidia/repos/extra-x86_64/PKGBUILD
  nvidia/repos/extra-x86_64/kernel-4.16.patch

---+
 PKGBUILD  |  177 ++--
 fs62142.patch |   13 +++
 kernel-4.16.patch |   66 +--
 3 files changed, 137 insertions(+), 119 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2019-03-29 15:54:51 UTC (rev 349408)
+++ PKGBUILD2019-03-29 15:55:01 UTC (rev 349409)
@@ -1,86 +0,0 @@
-# Maintainer: Sven-Hendrik Haase 
-# Maintainer: Felix Yan 
-# Contributor: Thomas Baechler 
-
-pkgbase=nvidia
-pkgname=(nvidia nvidia-dkms)
-pkgver=418.56
-_extramodules=extramodules-ARCH
-pkgrel=2
-pkgdesc="NVIDIA drivers for linux"
-arch=('x86_64')
-url="http://www.nvidia.com/;
-makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
-license=('custom')
-options=('!strip')
-_pkg="NVIDIA-Linux-x86_64-${pkgver}"
-source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
-kernel-4.16.patch)
-sha512sums=('859b9a27b75416f269037f4ae2af16b4807c704edc63d70be4b2ea96661ef29efde8e4793c015a25ce56a55ee55a707273e9ec55c9d6e3a0caaf8442ccb43910'
-
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
-
-prepare() {
-sh "${_pkg}.run" --extract-only
-cd "${_pkg}"
-
-# Restore phys_to_dma support (still needed for 396.18)
-# https://bugs.archlinux.org/task/58074
-patch -Np1 -i ../kernel-4.16.patch
-
-cp -a kernel kernel-dkms
-cd kernel-dkms
-sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
-sed -i 's/__JOBS/`nproc`/' dkms.conf
-sed -i 's/__DKMS_MODULES//' dkms.conf
-sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
-DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[1]="nvidia-uvm"\
-DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[2]="nvidia-modeset"\
-DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[3]="nvidia-drm"\
-DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
-
-# Gift for linux-rt guys
-sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
-}
-
-build() {
-_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-cd "${_pkg}"/kernel
-make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package_nvidia() {
-pkgdesc="NVIDIA drivers for linux"
-depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
-
-install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
-  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
-
-find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
-
-echo "blacklist nouveau" |
-install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
-
-install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
-}
-
-package_nvidia-dkms() {
-pkgdesc="NVIDIA driver sources for linux"
-depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
-optdepends=('linux-headers: Build the module for Arch kernel'
-'linux-lts-headers: Build the module for LTS Arch kernel')
-provides=("nvidia=$pkgver")
-conflicts+=('nvidia')
-
-cd ${_pkg}
-
-install -dm 755 "${pkgdir}"/usr/src
-cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
-
-echo "blacklist nouveau" |
-install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
-
-install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
-}

Copied: nvidia/repos/extra-x86_64/PKGBUILD (from rev 349408, 
nvidia/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2019-03-29 15:55:01 UTC (rev 349409)
@@ -0,0 +1,91 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=418.56
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch
+fs62142.patch)

[arch-commits] Commit in nvidia/repos/extra-x86_64 (5 files)

2018-02-10 Thread Sven-Hendrik Haase via arch-commits 
Date: Saturday, February 10, 2018 @ 12:00:52
  Author: svenstaro
Revision: 316581

archrelease: copy trunk to extra-x86_64

Added:
  nvidia/repos/extra-x86_64/4.15-FS57305.patch
(from rev 316580, nvidia/trunk/4.15-FS57305.patch)
  nvidia/repos/extra-x86_64/PKGBUILD
(from rev 316580, nvidia/trunk/PKGBUILD)
  nvidia/repos/extra-x86_64/fix-abi.patch
(from rev 316580, nvidia/trunk/fix-abi.patch)
Deleted:
  nvidia/repos/extra-x86_64/PKGBUILD
  nvidia/repos/extra-x86_64/fix-abi.patch

+
 4.15-FS57305.patch |  181 +++
 PKGBUILD   |  166 +++---
 fix-abi.patch  |   24 +++---
 3 files changed, 278 insertions(+), 93 deletions(-)

Copied: nvidia/repos/extra-x86_64/4.15-FS57305.patch (from rev 316580, 
nvidia/trunk/4.15-FS57305.patch)
===
--- 4.15-FS57305.patch  (rev 0)
+++ 4.15-FS57305.patch  2018-02-10 12:00:52 UTC (rev 316581)
@@ -0,0 +1,181 @@
+diff --git a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/conftest.sh 
b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/conftest.sh
+index 292d7da..5f254e1 100755
+--- a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/conftest.sh
 b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/conftest.sh
+@@ -2123,6 +2123,7 @@ compile_test() {
+ #endif
+ #include 
+ #include 
++#include 
+ #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
+ #error DRM not enabled
+ #endif
+@@ -2146,8 +2147,12 @@ compile_test() {
+ /* 2014-12-18 88a48e297b3a3bac6022c03babfb038f1a886cea */
+ i = DRIVER_ATOMIC;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ /* 2015-04-10 df63b9994eaf942afcdb946d27a28661d7dfbf2a */
+ for_each_crtc_in_state(s, c, cs, i) { }
++#else
++for_each_new_crtc_in_state(s, c, cs, i) {}
++#endif
+ 
+ /* 2015-05-18 036ef5733ba433760a3512bb5f7a155946e2df05 */
+ a = offsetof(struct drm_mode_config_funcs, 
atomic_state_alloc);
+diff --git 
a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c
 
b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c
+index cf16b6f..a66ae5a 100644
+--- 
a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c
 
b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c
+@@ -33,6 +33,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ static void nv_drm_connector_destroy(struct drm_connector *connector)
+ {
+@@ -87,7 +88,11 @@ static enum drm_connector_status 
__nv_drm_connector_detect_internal(
+ break;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ encoder = drm_encoder_find(dev, connector->encoder_ids[i]);
++#else
++encoder = drm_encoder_find(dev, NULL, connector->encoder_ids[i]);
++#endif
+ 
+ if (encoder == NULL) {
+ BUG_ON(encoder != NULL);
+diff --git 
a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-crtc.c 
b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-crtc.c
+index b54128a..d820dc2 100644
+--- 
a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-crtc.c
 
b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-crtc.c
+@@ -37,6 +37,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ static const u32 nv_default_supported_plane_drm_formats[] = {
+ DRM_FORMAT_ARGB1555,
+@@ -141,7 +142,11 @@ static int nv_drm_plane_atomic_check(struct drm_plane 
*plane,
+ goto done;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ for_each_crtc_in_state(plane_state->state, crtc, crtc_state, i) {
++#else
++for_each_new_crtc_in_state(plane_state->state, crtc, crtc_state, i) {
++#endif
+ struct nv_drm_crtc_state *nv_crtc_state = 
to_nv_crtc_state(crtc_state);
+ struct NvKmsKapiHeadRequestedConfig *head_req_config =
+ _crtc_state->req_config;
+@@ -365,7 +370,11 @@ static int nv_drm_crtc_atomic_check(struct drm_crtc *crtc,
+ 
+ req_config->flags.displaysChanged = NV_TRUE;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ for_each_connector_in_state(crtc_state->state,
++#else
++for_each_new_connector_in_state(crtc_state->state,
++#endif
+ connector, connector_state, j) {
+ if (connector_state->crtc != crtc) {
+ continue;
+@@ -613,7 +622,11 @@ int nv_drm_get_crtc_crc32_ioctl(struct drm_device *dev,
+ goto done;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ crtc = drm_crtc_find(dev, params->crtc_id);
++#else
++crtc = drm_crtc_find(dev, NULL, params->crtc_id);
++#endif

[arch-commits] Commit in nvidia/repos/extra-x86_64 (5 files)

2017-11-26 Thread Sven-Hendrik Haase via arch-commits 
Date: Sunday, November 26, 2017 @ 09:12:04
  Author: svenstaro
Revision: 310940

archrelease: copy trunk to extra-x86_64

Added:
  nvidia/repos/extra-x86_64/PKGBUILD
(from rev 310939, nvidia/trunk/PKGBUILD)
  nvidia/repos/extra-x86_64/fix-abi.patch
(from rev 310939, nvidia/trunk/fix-abi.patch)
  nvidia/repos/extra-x86_64/nvidia.install
(from rev 310939, nvidia/trunk/nvidia.install)
Deleted:
  nvidia/repos/extra-x86_64/PKGBUILD
  nvidia/repos/extra-x86_64/fix-abi.patch

+
 PKGBUILD   |  163 +--
 fix-abi.patch  |   24 
 nvidia.install |   13 
 3 files changed, 111 insertions(+), 89 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2017-11-26 09:11:59 UTC (rev 310939)
+++ PKGBUILD2017-11-26 09:12:04 UTC (rev 310940)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase 
-# Maintainer: Felix Yan 
-# Contributor: Thomas Baechler 
-
-pkgbase=nvidia
-pkgname=(nvidia nvidia-dkms)
-pkgver=387.34
-_extramodules=extramodules-4.13-ARCH
-pkgrel=3
-pkgdesc="NVIDIA drivers for linux"
-arch=('x86_64')
-url="http://www.nvidia.com/;
-makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 
'linux-headers>=4.13' 'linux-headers<4.14')
-license=('custom')
-options=('!strip')
-source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;)
-sha256sums=('d540908e76aeecb1f4a2812acf5ad37346934a6b7c8043c8b3ce230a48ceb440')
-
-_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
-
-prepare() {
-sh "${_pkg}.run" --extract-only
-cd "${_pkg}"
-
-cp -a kernel kernel-dkms
-cd kernel-dkms
-sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
-sed -i 's/__JOBS/`nproc`/' dkms.conf
-sed -i 's/__DKMS_MODULES//' dkms.conf
-sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
-DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[1]="nvidia-uvm"\
-DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[2]="nvidia-modeset"\
-DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
-BUILT_MODULE_NAME[3]="nvidia-drm"\
-DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
-
-# Gift for linux-rt guys
-sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
-}
-
-build() {
-_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-cd "${_pkg}"/kernel
-make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package_nvidia() {
-pkgdesc="NVIDIA drivers for linux"
-depends=('linux>=4.13' 'linux<4.14' "nvidia-utils=${pkgver}" 'libgl')
-
-install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
-  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
-
-find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
-
-echo "blacklist nouveau" |
-  install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
-}
-
-package_nvidia-dkms() {
-pkgdesc="NVIDIA driver sources for linux"
-depends=('dkms' "nvidia-utils=$pkgver" 'libgl')
-optdepends=('linux-headers: Build the module for Arch kernel'
-'linux-lts-headers: Build the module for LTS Arch kernel')
-conflicts+=('nvidia')
-
-cd ${_pkg}
-
-install -dm 755 "${pkgdir}"/usr/src
-cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
-
-echo "blacklist nouveau" |
-  install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
-}

Copied: nvidia/repos/extra-x86_64/PKGBUILD (from rev 310939, 
nvidia/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2017-11-26 09:12:04 UTC (rev 310940)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=387.34
+_extramodules=extramodules-4.13-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 
'linux-headers>=4.13' 'linux-headers<4.14')
+license=('custom')
+options=('!strip')
+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_x86_64=('a009bbc502c30e4b483d71be9fa51790')
+
+[[ "$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}"
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/"