Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (dd644682e392c0585107c895ca926be380def4df)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (dd644682e392c0585107c895ca926be380def4df)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (dd644682e392c0585107c895ca926be380def4df)
  • Date: Sun, 8 Apr 2018 12:45:19 +0000
GIT changes to master z-rejected grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:


z-kernels/nvidia_driver/0001-fix-incompatibility-with-linux-4.16-in-390.48.patch
| 66 ++++++++++
z-kernels/nvidia_driver/DETAILS
| 6
z-kernels/nvidia_driver/HISTORY
| 5
z-kernels/nvidia_driver/INSTALL
| 36 ++++-
z-kernels/nvidia_driver/PRE_BUILD
| 6
5 files changed, 109 insertions(+), 10 deletions(-)

New commits:
commit dd644682e392c0585107c895ca926be380def4df
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

z-kernels/nvidia_driver: stable version 390.48

diff --git
a/z-kernels/nvidia_driver/0001-fix-incompatibility-with-linux-4.16-in-390.48.patch

b/z-kernels/nvidia_driver/0001-fix-incompatibility-with-linux-4.16-in-390.48.patch
new file mode 100644
index 0000000..66eedf8
--- /dev/null
+++
b/z-kernels/nvidia_driver/0001-fix-incompatibility-with-linux-4.16-in-390.48.patch
@@ -0,0 +1,66 @@
+From 7e48f79e679c2d71067af48fcc77a5429dc77677 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Thu, 5 Apr 2018 19:48:13 +0200
+Subject: [PATCH] fix incompatibility with linux 4.16 in 390.48
+
+---
+ kernel/common/inc/nv-linux.h | 43 ------------------------------------
+ 1 file changed, 43 deletions(-)
+
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..ca6132c 100644
+--- a/kernel/common/inc/nv-linux.h
++++ b/kernel/common/inc/nv-linux.h
+@@ -1209,49 +1209,6 @@ static inline NvU32 nv_alloc_init_flags(int cached,
int contiguous, int zeroed)
+ static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev)
+ {
+ NvBool swiotlb_in_use = NV_FALSE;
+-#if defined(CONFIG_SWIOTLB)
+- #if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT)
+- /*
+- * We only use the 'dma_ops' symbol on older x86_64 kernels; later
kernels,
+- * including those for other architectures, have converged on the
+- * get_dma_ops() interface.
+- */
+- #if defined(NV_GET_DMA_OPS_PRESENT)
+- #if defined(NV_DMA_MAP_OPS_PRESENT)
+- const struct dma_map_ops *ops = get_dma_ops(&dev->dev);
+- #else
+- const struct dma_mapping_ops *ops = get_dma_ops(&dev->dev);
+- #endif
+- #else
+- const struct dma_mapping_ops *ops = dma_ops;
+- #endif
+- #if defined(NV_DMA_MAP_OPS_PRESENT)
+- /*
+- * The switch from dma_mapping_ops -> dma_map_ops coincided with the
+- * switch from swiotlb_map_sg -> swiotlb_map_sg_attrs.
+- */
+- #if defined(NVCPU_AARCH64) && \
+- defined(NV_NONCOHERENT_SWIOTLB_DMA_OPS_PRESENT)
+- /* AArch64 exports these symbols directly */
+- swiotlb_in_use = ((ops == &noncoherent_swiotlb_dma_ops) ||
+- (ops == &coherent_swiotlb_dma_ops));
+- #else
+- swiotlb_in_use = (ops->map_sg == swiotlb_map_sg_attrs);
+- #endif
+- #else
+- swiotlb_in_use = (ops->map_sg == swiotlb_map_sg);
+- #endif
+- #elif defined(NVCPU_X86_64)
+- /*
+- * Fallback for old 2.6 kernels - if the DMA operations infrastructure
+- * isn't in place, use the swiotlb flag. Before dma_ops was added, this
+- * flag used to be exported. It still exists in modern kernels but is no
+- * longer exported.
+- */
+- swiotlb_in_use = (swiotlb == 1);
+- #endif
+-#endif
+-
+ return swiotlb_in_use;
+ }
+
+--
+2.17.0
+
diff --git a/z-kernels/nvidia_driver/DETAILS b/z-kernels/nvidia_driver/DETAILS
index 8fe37cd..1ba1b26 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -1,6 +1,6 @@
. $GRIMOIRE/FUNCTIONS
SPELL=nvidia_driver
- STABLE_VERSION=390.25
+ STABLE_VERSION=390.48
BETA_VERSION=387.34
case "${SMGL_COMPAT_ARCHS[1]}" in
x86_64)
@@ -9,7 +9,7 @@ if [[ $NVIDIA_BETA == y ]]; then

SOURCE_HASH=sha512:6742768f1258a028c9ba56ad1d72f27d7eea4b6bfd324ba29c7f057ab5819816bd728aeaf2a8058031dadcd4c51bc6d08f0e0e0e26c68ed57955e90d68ac5a4b
else
VERSION=$STABLE_VERSION
-
SOURCE_HASH=sha512:23271f698b62035c47aa356f5b04e416556a4965cd2664068554d505960f737c95c3e10287d6bab825a4583d7e2153bfa5a5828e8f39f4c68af8bdf73f7bd443
+
SOURCE_HASH=sha512:47f4bcc0d88d1e80ed0c03cacde96301b1c657bec88935ee2edf9b96726620f70c747a174f1a8725b56f4812961878c01df02c249ac4810dc4aedf62d1152a7f
fi
SOURCE=NVIDIA-Linux-x86_64-$VERSION.run

SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
@@ -23,7 +23,7 @@ if [[ $NVIDIA_BETA == y ]]; then

SOURCE_HASH=sha512:ba9362123a75f85a0a5a9dcc95c06bcb350a8dff2db864db30a73172db44006fa39eee8e23cf959ab2012b61b922d1f0d7ab225329815737819f27d1be300b95
else
VERSION=$STABLE_VERSION
-
SOURCE_HASH=sha512:59f5d832a0372ec5a19e356f3cf9b82f1f704381683eca845092659df03791b21511c32f3c2bb5a263978c86b2008c1fdfde3b3a125100235948291cad99f8b3
+
SOURCE_HASH=sha512:9d80616abbf1f95c89bb3e6bda864708adc887a62ccdf8865e956c305bb013b0e54ffb3f495805363ee60a9115ab5fb38adf1534750a6afb69a457a4d034daeb
fi
SOURCE=NVIDIA-Linux-x86-$VERSION.run

SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86/$VERSION/$SOURCE
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index f2390cb..076ea21 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,8 @@
+2018-04-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PRE_BUILD, INSTALL,
+ 0001-fix-incompatibility-with-linux-4.16-in-390.48.patch:
+ stable versions 390.48
+
2018-02-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: stable versions 390.25

diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index 1cfd8a3..0fbc168 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -48,16 +48,32 @@ for lib in libGL.la libnvidia-glcore.so.${VERSION/-/.} \
done &&
mkdir -vp $INSTALL_ROOT/usr/lib/.nvidia \
$INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia/ &&
-cp -vr libGL.so.1.0.0 $INSTALL_ROOT/usr/lib/.nvidia &&
+if [[ $NVIDIA_BETA == y ]]; then
+ cp -vr libGL.so.1.0.0 $INSTALL_ROOT/usr/lib/.nvidia
+else
+ cp -vr libGL.so.1.7.0 $INSTALL_ROOT/usr/lib/.nvidia
+fi &&
cp -vr libGL.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
cp -vr libGLdispatch.so.0 $INSTALL_ROOT/usr/lib/.nvidia &&
cp -vr libEGL_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
cp -vr libEGL.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
-cp -vr libEGL.so.1 $INSTALL_ROOT/usr/lib/.nvidia &&
+if [[ $NVIDIA_BETA == y ]]; then
+ cp -vr libEGL.so.1 $INSTALL_ROOT/usr/lib/.nvidia
+else
+ cp -vr libEGL.so.1.1.0 $INSTALL_ROOT/usr/lib/.nvidia
+fi &&
cp -vr libGLESv1_CM_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
-cp -vr libGLESv1_CM.so.1 $INSTALL_ROOT/usr/lib/.nvidia &&
+if [[ $NVIDIA_BETA == y ]]; then
+ cp -vr libGLESv1_CM.so.1 $INSTALL_ROOT/usr/lib/.nvidia
+else
+ cp -vr libGLESv1_CM.so.1.2.0 $INSTALL_ROOT/usr/lib/.nvidia
+fi &&
cp -vr libGLESv2_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
-cp -vr libGLESv2.so.2 $INSTALL_ROOT/usr/lib/.nvidia &&
+if [[ $NVIDIA_BETA == y ]]; then
+ cp -vr libGLESv2.so.2 $INSTALL_ROOT/usr/lib/.nvidia
+else
+ cp -vr libGLESv2.so.2.1.0 $INSTALL_ROOT/usr/lib/.nvidia
+fi &&
cp -vr libGLX.so.0 $INSTALL_ROOT/usr/lib/.nvidia &&
cp -vr libOpenGL.so.0 $INSTALL_ROOT/usr/lib/.nvidia &&
mkdir -vp $INSTALL_ROOT/usr/lib/tls &&
@@ -70,9 +86,15 @@ pushd $INSTALL_ROOT/usr/lib/.nvidia
&&
ln -sfn libGL.so.${VERSION/-/.} libGL.so.1 &&
ln -sfn libGL.so.1 libGL.so &&
ln -sfn libEGL_nvidia.so.${VERSION/-/.} libEGL_nvidia.so.1 &&
-ln -sfn libEGL.so.${VERSION/-/.} libEGL.so.1 &&
-ln -sfn libGLESv1_CM.so.1 libGLESv1_CM.so &&
-ln -sfn libGLESv2.so.1 libGLESv2.so &&
+if [[ $NVIDIA_BETA == y ]]; then
+ ln -sfn libEGL.so.${VERSION/-/.} libEGL.so.1 &&
+ ln -sfn libGLESv1_CM.so.1 libGLESv1_CM.so &&
+ ln -sfn libGLESv2.so.1 libGLESv2.so
+else
+ ln -sfn libEGL.so.${VERSION/-/.} libEGL.so.1.1.0 &&
+ ln -sfn libGLESv1_CM.so.1.2.0 libGLESv1_CM.so &&
+ ln -sfn libGLESv2.so.2.1.0 libGLESv2.so
+fi &&
ln -sfn libOpenGL.so.0 libOpenGL.so &&
popd &&
pushd $INSTALL_ROOT/usr/lib &&
diff --git a/z-kernels/nvidia_driver/PRE_BUILD
b/z-kernels/nvidia_driver/PRE_BUILD
index e7d7ff2..acc161d 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -24,3 +24,9 @@ cd $SOURCE_DIRECTORY/kernel &&
#
sedit 's:depmod -ae:& \$(KERNEL_UNAME):' Makefile

+if [[ "$NVIDIA_BETA" == "n" ]]; then
+ message "${MESSAGE_COLOR}patching for compatibility with linux
4.16${DEFAULT_COLOR}" &&
+ cd $SOURCE_DIRECTORY &&
+ patch -p1 <
"$SPELL_DIRECTORY/0001-fix-incompatibility-with-linux-4.16-in-390.48.patch"
+fi
+


  • [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (dd644682e392c0585107c895ca926be380def4df), Florian Franzmann, 04/08/2018

Archive powered by MHonArc 2.6.24.

Top of Page