- release 7 (by relup.sh)

[packages/xorg-driver-video-nvidia-legacy-390xx.git] / kernel-5.6.patch

diff --git a/kernel-5.6.patch b/kernel-5.6.patch
index 0958acb9fe1a5a15c82737f3f224737d0531af33..fd9875a7a4eb0e8aef1fca3d61aa4b046ec14be1 100644 (file)
--- a/kernel-5.6.patch
+++ b/kernel-5.6.patch
@@ -138,7 +138,7 @@ index ec9e093..463a464 100755
          ioremap_wc)
              #
              # Determine if the ioremap_wc() function is present.
-@@ -1430,6 +1446,31 @@ compile_test() {
+@@ -1430,6 +1446,29 @@ compile_test() {
              compile_check_conftest "$CODE" "NV_SG_ALLOC_TABLE_FROM_PAGES_PRESENT" "" "functions"
          ;;
  
@@ -159,12 +159,10 @@ index ec9e093..463a464 100755
 +            CODE="
 +            #include <linux/ktime.h>
 +            int conftest_ktime_get_raw_ts64(void) {
-+                struct timespec64 ts = {0};
-+
-+                ktime_get_raw_ts64(&ts);
++                ktime_get_raw_ts64();
 +            }"
 +
-+            compile_check_conftest "$CODE" "NV_KTIME_GET_RAW_TS64_PRESENT" "" "types"
++            compile_check_conftest "$CODE" "NV_KTIME_GET_RAW_TS64_PRESENT" "" "functions"
 +        ;;
 +
          efi_enabled)
@@ -183,37 +181,6 @@ index d42aabb..f0404fb 100644
  
      nv_gettimeofday(&tv);
  
-diff --git a/kernel/nvidia-uvm/uvm_linux.h b/kernel/nvidia-uvm/uvm_linux.h
-index 8784a82..c256cdb 100644
---- a/kernel/nvidia-uvm/uvm_linux.h
-+++ b/kernel/nvidia-uvm/uvm_linux.h
-@@ -329,7 +329,16 @@ static inline uint64_t NV_DIV64(uint64_t dividend, uint64_t divisor, uint64_t *r
- }
- #endif
- 
--#if defined(CLOCK_MONOTONIC_RAW)
-+#if defined(NV_KTIME_GET_RAW_TS64_PRESENT)
-+static inline NvU64 NV_GETTIME(void)
-+{
-+    struct timespec64 ts64 = {0};
-+
-+    ktime_get_raw_ts64(&ts64);
-+
-+    return (ts64.tv_sec * 1000000000ULL + ts64.tv_nsec);
-+}
-+#elif defined(CLOCK_MONOTONIC_RAW)
- /* Return a nanosecond-precise value */
- static inline NvU64 NV_GETTIME(void)
- {
-@@ -345,7 +354,7 @@ static inline NvU64 NV_GETTIME(void)
-  * available non-GPL symbols. */
- static inline NvU64 NV_GETTIME(void)
- {
--    struct timeval tv = {0};
-+    struct nv_timeval tv = {0};
- 
-     nv_gettimeofday(&tv);
- 
 diff --git a/kernel/nvidia/nv-procfs.c b/kernel/nvidia/nv-procfs.c
 index 5808a88..bc60a08 100644
 --- a/kernel/nvidia/nv-procfs.c