[VirtualBox-kmod/f28: 6/6] Merge branch 'master' into f28
by Sérgio M. Basto
commit 3e77315d221f874843804036e5fce9dcc83f02ab
Merge: 6ef7533 10f1806
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Mar 27 15:30:44 2019 +0000
Merge branch 'master' into f28
.gitignore | 1 +
VirtualBox-kmod.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
5 years, 1 month
[VirtualBox-kmod/f28] (6 commits) ...Merge branch 'master' into f28
by Sérgio M. Basto
Summary of changes:
9dfd45f... removed fixes_for_4.17.patch (*)
908ceed... Update to 5.2.24 (*)
40f66d7... Rebase and squash el7 (*)
eb5dd49... Merge branch 'master' into el7 (*)
10f1806... Update of new vboxsf. (*)
3e77315... Merge branch 'master' into f28
(*) This commit already existed in another branch; no separate mail sent
5 years, 1 month
[VirtualBox-kmod/f29: 2/2] Merge branch 'master' into f29
by Sérgio M. Basto
commit f366c26000f9ee62a350c6e573a8cbbf16a6910e
Merge: 0a7fecf 10f1806
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Mar 27 15:30:32 2019 +0000
Merge branch 'master' into f29
.gitignore | 1 +
VirtualBox-kmod.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
5 years, 1 month
[nvidia-340xx-kmod] patch for kernel-5.0.0
by Leigh Scott
commit 68e1031ef3491b347e332f1b131abc84b24a5d2b
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Mar 27 15:30:35 2019 +0000
patch for kernel-5.0.0
buildfix_kernel_5.0.patch | 256 ++++++++++++++++++++++++++++++++++++++++++++++
nv-linux-arm.patch | 2 +-
nvidia-340xx-kmod.spec | 7 +-
3 files changed, 263 insertions(+), 2 deletions(-)
---
diff --git a/buildfix_kernel_5.0.patch b/buildfix_kernel_5.0.patch
new file mode 100644
index 0000000..d9ce144
--- /dev/null
+++ b/buildfix_kernel_5.0.patch
@@ -0,0 +1,256 @@
+From 0b4e74ba61c50aefa16a4bafac3a60799eab7a20 Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone(a)canonical.com>
+Date: Fri, 15 Feb 2019 14:43:21 +0100
+Subject: [PATCH 1/1] Add support for Linux 5.0
+
+---
+ kernel/Makefile | 2 ++
+ kernel/conftest.sh | 33 +++++++++++++++++++++++++++++++++
+ kernel/nv-drm.c | 12 +++++++++++-
+ kernel/nv-time.h | 24 ++++++++++++++++++++++++
+ kernel/os-interface.c | 13 +++++++------
+ kernel/uvm/Makefile | 1 +
+ kernel/uvm/nvidia_uvm_linux.h | 1 +
+ kernel/uvm/nvidia_uvm_lite.c | 4 ++--
+ 8 files changed, 81 insertions(+), 9 deletions(-)
+ create mode 100644 nv-time.h
+
+diff --git a/kernel/Makefile b/kernel/Makefile
+index 8ac3c1a..1959dce 100644
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -147,6 +147,8 @@ COMPILE_TESTS = \
+ vm_fault_present \
+ vm_fault_has_address \
+ drm_driver_unload_has_int_return_type \
++ drm_gem_object_get \
++ do_gettimeofday \
+ drm_legacy_pci_init \
+ timer_setup
+ #
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index 64d75a1..fb0bf60 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -168,6 +168,7 @@ test_headers() {
+ FILES="$FILES linux/sched/task.h"
+ FILES="$FILES xen/ioemu.h"
+ FILES="$FILES linux/fence.h"
++ FILES="$FILES linux/ktime.h"
+
+ FILES_ARCH="$FILES_ARCH asm/set_memory.h"
+
+@@ -1971,6 +1972,38 @@ compile_test() {
+ compile_check_conftest "$CODE" "NV_DRM_DRIVER_UNLOAD_HAS_INT_RETURN_TYPE" "" "types"
+ ;;
+
++ drm_gem_object_get)
++ #
++ # Determine if the function drm_gem_object_get() is present.
++ #
++ CODE="
++ #include <drm/drmP.h>
++ #if defined(NV_DRM_DRM_GEM_H_PRESENT)
++ #include <drm/drm_gem.h>
++ #endif
++ void conftest_drm_gem_object_get(void) {
++ drm_gem_object_get();
++ }"
++
++ compile_check_conftest "$CODE" "NV_DRM_GEM_OBJECT_GET_PRESENT" "" "functions"
++ ;;
++
++ do_gettimeofday)
++ #
++ # Determine if the function do_gettimeofday() is present.
++ #
++ CODE="
++ #include <linux/time.h>
++ #if defined(NV_LINUX_KTIME_H_PRESENT)
++ #include <linux/ktime.h>
++ #endif
++ void conftest_do_gettimeofday(void) {
++ do_gettimeofday();
++ }"
++
++ compile_check_conftest "$CODE" "NV_DO_GETTIMEOFDAY_PRESENT" "" "functions"
++ ;;
++
+ drm_legacy_pci_init)
+ #
+ # Determine if drm_legacy_pci_init() is present. drm_pci_init() was
+diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index 0eb72e4..1c968de 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -37,6 +37,16 @@ struct nv_gem_object {
+ struct page **pages;
+ };
+
++static inline void
++nv_drm_gem_object_unreference_unlocked(struct nv_gem_object *nv_gem)
++{
++#if defined(NV_DRM_GEM_OBJECT_GET_PRESENT)
++ drm_gem_object_put_unlocked(&nv_gem->base);
++#else
++ drm_gem_object_unreference_unlocked(&nv_gem->base);
++#endif
++}
++
+ static int nv_drm_load(
+ struct drm_device *dev,
+ unsigned long flags
+@@ -252,7 +262,7 @@ RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle(
+ goto done;
+ }
+
+- drm_gem_object_unreference_unlocked(&nv_obj->base);
++ nv_drm_gem_object_unreference_unlocked(nv_obj);
+
+ status = RM_OK;
+
+diff --git a/kernel/nv-time.h b/kernel/nv-time.h
+new file mode 100644
+index 0000000..cc828aa
+--- /dev/null
++++ b/kernel/nv-time.h
+@@ -0,0 +1,24 @@
++#ifndef __NV_TIME_H__
++#define __NV_TIME_H__
++
++#include "conftest.h"
++#include <linux/time.h>
++
++#if defined(NV_LINUX_KTIME_H_PRESENT)
++#include <linux/ktime.h>
++#endif
++
++static inline void nv_gettimeofday(struct timeval *tv)
++{
++#ifdef NV_DO_GETTIMEOFDAY_PRESENT
++ do_gettimeofday(tv);
++#else
++ struct timespec64 now;
++
++ ktime_get_real_ts64(&now);
++ tv->tv_sec = now.tv_sec;
++ tv->tv_usec = now.tv_nsec/1000;
++#endif
++}
++
++#endif
+diff --git a/kernel/os-interface.c b/kernel/os-interface.c
+index 7e3d362..7190b26 100644
+--- a/kernel/os-interface.c
++++ b/kernel/os-interface.c
+@@ -13,6 +13,7 @@
+
+ #include "os-interface.h"
+ #include "nv-linux.h"
++#include "nv-time.h"
+
+ RM_STATUS NV_API_CALL os_disable_console_access(void)
+ {
+@@ -440,7 +441,7 @@ RM_STATUS NV_API_CALL os_get_current_time(
+ {
+ struct timeval tm;
+
+- do_gettimeofday(&tm);
++ nv_gettimeofday(&tm);
+
+ *seconds = tm.tv_sec;
+ *useconds = tm.tv_usec;
+@@ -475,7 +476,7 @@ RM_STATUS NV_API_CALL os_delay_us(NvU32 MicroSeconds)
+ #ifdef NV_CHECK_DELAY_ACCURACY
+ struct timeval tm1, tm2;
+
+- do_gettimeofday(&tm1);
++ nv_gettimeofday(&tm1);
+ #endif
+
+ if (in_irq() && (MicroSeconds > NV_MAX_ISR_DELAY_US))
+@@ -490,7 +491,7 @@ RM_STATUS NV_API_CALL os_delay_us(NvU32 MicroSeconds)
+ udelay(usec);
+
+ #ifdef NV_CHECK_DELAY_ACCURACY
+- do_gettimeofday(&tm2);
++ nv_gettimeofday(&tm2);
+ nv_printf(NV_DBG_ERRORS, "NVRM: osDelayUs %d: 0x%x 0x%x\n",
+ MicroSeconds, tm2.tv_sec - tm1.tv_sec, tm2.tv_usec - tm1.tv_usec);
+ #endif
+@@ -518,7 +519,7 @@ RM_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds)
+ struct timeval tm_start;
+ #endif
+
+- do_gettimeofday(&tm_aux);
++ nv_gettimeofday(&tm_aux);
+ #ifdef NV_CHECK_DELAY_ACCURACY
+ tm_start = tm_aux;
+ #endif
+@@ -552,7 +553,7 @@ RM_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds)
+ do
+ {
+ schedule_timeout(jiffies);
+- do_gettimeofday(&tm_aux);
++ nv_gettimeofday(&tm_aux);
+ if (NV_TIMERCMP(&tm_aux, &tm_end, <))
+ {
+ NV_TIMERSUB(&tm_end, &tm_aux, &tm_aux);
+@@ -574,7 +575,7 @@ RM_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds)
+ udelay(MicroSeconds);
+ }
+ #ifdef NV_CHECK_DELAY_ACCURACY
+- do_gettimeofday(&tm_aux);
++ nv_gettimeofday(&tm_aux);
+ timersub(&tm_aux, &tm_start, &tm_aux);
+ nv_printf(NV_DBG_ERRORS, "NVRM: osDelay %dmsec: %d.%06dsec\n",
+ MilliSeconds, tm_aux.tv_sec, tm_aux.tv_usec);
+diff --git a/kernel/uvm/Makefile b/kernel/uvm/Makefile
+index 42ad927..5c7b466 100644
+--- a/kernel/uvm/Makefile
++++ b/kernel/uvm/Makefile
+@@ -171,6 +171,7 @@ COMPILE_TESTS = \
+ kbasename \
+ fatal_signal_pending \
+ kuid_t \
++ do_gettimeofday \
+ vm_fault_has_address
+
+ MODULE_NAME:= nvidia-uvm
+diff --git a/kernel/uvm/nvidia_uvm_linux.h b/kernel/uvm/nvidia_uvm_linux.h
+index 1625209..1edb620 100644
+--- a/kernel/uvm/nvidia_uvm_linux.h
++++ b/kernel/uvm/nvidia_uvm_linux.h
+@@ -146,6 +146,7 @@
+ #include <linux/interrupt.h> /* tasklets, interrupt helpers */
+ #include <linux/timer.h>
+ #include <linux/time.h> /* do_gettimeofday()*/
++#include "nv-time.h"
+
+ #include <asm/div64.h> /* do_div() */
+ #if defined(NV_ASM_SYSTEM_H_PRESENT)
+diff --git a/kernel/uvm/nvidia_uvm_lite.c b/kernel/uvm/nvidia_uvm_lite.c
+index 119c93a..33b8d4b 100644
+--- a/kernel/uvm/nvidia_uvm_lite.c
++++ b/kernel/uvm/nvidia_uvm_lite.c
+@@ -2008,7 +2008,7 @@ static RM_STATUS _check_ecc_errors(UvmGpuMigrationTracking *pMigTracker,
+ {
+ if (!!(rmInterruptSet) && !bEccIncomingError)
+ {
+- do_gettimeofday(&eccErrorStartTime);
++ nv_gettimeofday(&eccErrorStartTime);
+ _set_timeout_in_usec(&eccErrorStartTime, &eccTimeout,
+ UVM_ECC_ERR_TIMEOUT_USEC);
+
+@@ -2040,7 +2040,7 @@ static RM_STATUS _check_ecc_errors(UvmGpuMigrationTracking *pMigTracker,
+ //
+ if (!!(rmInterruptSet) && (eccErrorStartTime.tv_usec != 0))
+ {
+- do_gettimeofday(&eccErrorCurrentTime);
++ nv_gettimeofday(&eccErrorCurrentTime);
+ if ((eccErrorCurrentTime.tv_sec > eccTimeout.tv_sec) ||
+ ((eccErrorCurrentTime.tv_sec == eccTimeout.tv_sec) &&
+ (eccErrorCurrentTime.tv_usec >= eccTimeout.tv_usec)))
+--
+2.19.1
+
diff --git a/nv-linux-arm.patch b/nv-linux-arm.patch
index 68b0e0c..e2c28e8 100644
--- a/nv-linux-arm.patch
+++ b/nv-linux-arm.patch
@@ -1,6 +1,6 @@
--- nvidiapkg-armv7hl/kernel/nv-linux.h.arm 2014-11-01 00:25:36.000000000 +0100
+++ nvidiapkg-armv7hl/kernel/nv-linux.h 2014-11-19 01:06:34.401644094 +0100
-@@ -234,7 +234,8 @@ RM_STATUS nvos_forward_error_to_cray(str
+@@ -255,7 +255,8 @@ RM_STATUS nvos_forward_error_to_cray(str
* NVIDIA graphics driver has no way of knowing and is unlikely
* to work correctly.
*/
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 0d08726..94921f8 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.107
# Taken over by kmodtool
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,6 +18,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
+Patch1: buildfix_kernel_5.0.patch
# needed for plague to make sure it builds for i586 and i686
#ExclusiveArch: i686 x86_64 armv7hl
@@ -44,6 +45,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterf
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
%patch0 -p1
+%patch1 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -73,6 +75,9 @@ done
%{?akmod_install}
%changelog
+* Wed Mar 27 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.107-7
+- patch for kernel-5.0.0
+
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:340.107-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 1 month
[VirtualBox-kmod/f29] (5 commits) ...Merge branch 'master' into f29
by Sérgio M. Basto
Summary of changes:
9dfd45f... removed fixes_for_4.17.patch (*)
908ceed... Update to 5.2.24 (*)
40f66d7... Rebase and squash el7 (*)
eb5dd49... Merge branch 'master' into el7 (*)
0a7fecf... Merge branch 'master' into f29
(*) This commit already existed in another branch; no separate mail sent
5 years, 1 month
