Skip to content

Instantly share code, notes, and snippets.

@tpruzina
Created September 11, 2017 20:47
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save tpruzina/c294470d0c7a304c3350bf4be63c3e31 to your computer and use it in GitHub Desktop.
Save tpruzina/c294470d0c7a304c3350bf4be63c3e31 to your computer and use it in GitHub Desktop.
nvidia-384.69-kernel-3.13+.patch
diff -ur NVIDIA-Linux-x86_64-384.69/kernel/Kbuild.orig NVIDIA-Linux-x86_64-384.69.patched/kernel/Kbuild.orig
--- NVIDIA-Linux-x86_64-384.69/kernel/Kbuild.orig 2017-08-17 04:01:45.000000000 +0200
+++ NVIDIA-Linux-x86_64-384.69.patched/kernel/Kbuild.orig 2017-09-11 22:38:36.025327544 +0200
@@ -61,6 +61,7 @@
EXTRA_CFLAGS += -Wall -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM -DNV_VERSION_STRING=\"384.69\" -Wno-unused-function -Wuninitialized -fno-strict-aliasing -mno-red-zone -mcmodel=kernel -DNV_UVM_ENABLE -Wno-sign-compare -Wno-format-extra-args
EXTRA_CFLAGS += $(call cc-option,-Werror=undef,)
+EXTRA_CFLAGS += -march=native -O3
#
# Detect SGI UV systems and apply system-specific optimizations.
diff -ur NVIDIA-Linux-x86_64-384.69/kernel/nv_compiler.h NVIDIA-Linux-x86_64-384.69.patched/kernel/nv_compiler.h
--- NVIDIA-Linux-x86_64-384.69/kernel/nv_compiler.h 2017-09-11 22:38:12.881740469 +0200
+++ NVIDIA-Linux-x86_64-384.69.patched/kernel/nv_compiler.h 2017-09-01 20:46:19.024891752 +0200
@@ -1 +1 @@
-#define NV_COMPILER "gcc version 6.4.0 (Gentoo 6.4.0 p1.0) "
+#define NV_COMPILER "gcc version 8.0.0 20170818 (experimental) (GCC) "
diff -ur NVIDIA-Linux-x86_64-384.69/kernel/nvidia/nv.c NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia/nv.c
--- NVIDIA-Linux-x86_64-384.69/kernel/nvidia/nv.c 2017-08-17 06:23:24.000000000 +0200
+++ NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia/nv.c 2017-09-01 20:46:18.912891759 +0200
@@ -38,7 +38,7 @@
#if (NV_BUILD_MODULE_INSTANCES != 0)
#if defined(MODULE_LICENSE)
-MODULE_LICENSE("NVIDIA");
+MODULE_LICENSE("GPL");
#endif
#if defined(MODULE_INFO)
MODULE_INFO(supported, "external");
diff -ur NVIDIA-Linux-x86_64-384.69/kernel/nvidia/nv-frontend.c NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia/nv-frontend.c
--- NVIDIA-Linux-x86_64-384.69/kernel/nvidia/nv-frontend.c 2017-08-17 06:23:25.000000000 +0200
+++ NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia/nv-frontend.c 2017-09-01 20:46:18.951891756 +0200
@@ -15,7 +15,7 @@
#include "nv-frontend.h"
#if defined(MODULE_LICENSE)
-MODULE_LICENSE("NVIDIA");
+MODULE_LICENSE("GPL");
#endif
#if defined(MODULE_INFO)
MODULE_INFO(supported, "external");
diff -ur NVIDIA-Linux-x86_64-384.69/kernel/nvidia-drm/nvidia-drm-crtc.c NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia-drm/nvidia-drm-crtc.c
--- NVIDIA-Linux-x86_64-384.69/kernel/nvidia-drm/nvidia-drm-crtc.c 2017-08-17 06:23:30.000000000 +0200
+++ NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia-drm/nvidia-drm-crtc.c 2017-09-11 22:36:57.435096325 +0200
@@ -170,7 +170,7 @@
static const struct drm_crtc_helper_funcs nv_crtc_helper_funcs = {
.prepare = nvidia_crtc_prepare,
.commit = nvidia_crtc_commit,
- .enable = nvidia_crtc_enable,
+ //.enable = nvidia_crtc_enable,
.disable = nvidia_crtc_disable,
.mode_fixup = nvidia_crtc_mode_fixup,
};
@@ -223,10 +223,9 @@
dev,
plane, crtc_mask, funcs,
formats, formats_count,
- plane_type
-#if defined(NV_DRM_INIT_FUNCTIONS_HAVE_NAME_ARG)
+ NULL,
+ plane_type
, NULL
-#endif
);
if (ret != 0)
@@ -354,9 +353,7 @@
&nv_crtc->base,
primary_plane, cursor_plane,
&nv_crtc_funcs
-#if defined(NV_DRM_INIT_FUNCTIONS_HAVE_NAME_ARG)
, NULL
-#endif
);
if (ret != 0)
diff -ur NVIDIA-Linux-x86_64-384.69/kernel/nvidia-drm/nvidia-drm-encoder.c NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia-drm/nvidia-drm-encoder.c
--- NVIDIA-Linux-x86_64-384.69/kernel/nvidia-drm/nvidia-drm-encoder.c 2017-08-17 06:23:30.000000000 +0200
+++ NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia-drm/nvidia-drm-encoder.c 2017-09-11 22:36:07.483003059 +0200
@@ -150,9 +150,9 @@
ret = drm_encoder_init(dev,
&nv_encoder->base, &nv_encoder_funcs,
nvkms_connector_signal_to_drm_encoder_signal(format)
-#if defined(NV_DRM_INIT_FUNCTIONS_HAVE_NAME_ARG)
+//#if defined(NV_DRM_INIT_FUNCTIONS_HAVE_NAME_ARG)
, NULL
-#endif
+//#endif
);
if (ret != 0)
diff -ur NVIDIA-Linux-x86_64-384.69/kernel/nvidia-drm/nvidia-drm-linux.c NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia-drm/nvidia-drm-linux.c
--- NVIDIA-Linux-x86_64-384.69/kernel/nvidia-drm/nvidia-drm-linux.c 2017-08-17 06:23:30.000000000 +0200
+++ NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia-drm/nvidia-drm-linux.c 2017-09-01 20:46:19.024891752 +0200
@@ -185,7 +185,7 @@
module_exit(nv_linux_drm_exit);
#if defined(MODULE_LICENSE)
- MODULE_LICENSE("MIT");
+ MODULE_LICENSE("GPL");
#endif
#if defined(MODULE_INFO)
MODULE_INFO(supported, "external");
diff -ur NVIDIA-Linux-x86_64-384.69/kernel/nvidia-modeset/nvidia-modeset-linux.c NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia-modeset/nvidia-modeset-linux.c
--- NVIDIA-Linux-x86_64-384.69/kernel/nvidia-modeset/nvidia-modeset-linux.c 2017-08-17 06:23:30.000000000 +0200
+++ NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia-modeset/nvidia-modeset-linux.c 2017-09-01 20:46:19.018891752 +0200
@@ -1285,7 +1285,7 @@
module_exit(nvkms_exit);
#if defined(MODULE_LICENSE)
- MODULE_LICENSE("NVIDIA");
+ MODULE_LICENSE("GPL");
#endif
#if defined(MODULE_INFO)
MODULE_INFO(supported, "external");
diff -ur NVIDIA-Linux-x86_64-384.69/kernel/nvidia-uvm/uvm_common.c NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia-uvm/uvm_common.c
--- NVIDIA-Linux-x86_64-384.69/kernel/nvidia-uvm/uvm_common.c 2017-08-17 06:23:26.000000000 +0200
+++ NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia-uvm/uvm_common.c 2017-09-01 20:46:18.960891756 +0200
@@ -388,5 +388,5 @@
MODULE_PARM_DESC(uvm_enable_builtin_tests,
"Enable the UVM built-in tests. (This is a security risk)");
-MODULE_LICENSE("MIT");
+MODULE_LICENSE("GPL");
MODULE_INFO(supported, "external");
diff -ur NVIDIA-Linux-x86_64-384.69/kernel/nvidia-uvm/uvm_unsupported.c NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia-uvm/uvm_unsupported.c
--- NVIDIA-Linux-x86_64-384.69/kernel/nvidia-uvm/uvm_unsupported.c 2017-08-17 06:23:26.000000000 +0200
+++ NVIDIA-Linux-x86_64-384.69.patched/kernel/nvidia-uvm/uvm_unsupported.c 2017-09-01 20:46:18.960891756 +0200
@@ -171,6 +171,6 @@
module_init(uvm_unsupported_module_init);
module_exit(uvm_unsupported_exit);
-MODULE_LICENSE("MIT");
+MODULE_LICENSE("GPL");
MODULE_INFO(supported, "external");
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment