summaryrefslogtreecommitdiffstats
path: root/system/nvidia-driver/skip_conflict-GPU_detect.patch
diff options
context:
space:
mode:
Diffstat (limited to 'system/nvidia-driver/skip_conflict-GPU_detect.patch')
-rw-r--r--system/nvidia-driver/skip_conflict-GPU_detect.patch25
1 files changed, 13 insertions, 12 deletions
diff --git a/system/nvidia-driver/skip_conflict-GPU_detect.patch b/system/nvidia-driver/skip_conflict-GPU_detect.patch
index b98a12ccbb..2b979cbf46 100644
--- a/system/nvidia-driver/skip_conflict-GPU_detect.patch
+++ b/system/nvidia-driver/skip_conflict-GPU_detect.patch
@@ -1,6 +1,6 @@
-diff -uaN nvidia-installer-375.66/command-list.c nvidia-installer-375.66.new/command-list.c
---- nvidia-installer-375.66/command-list.c 2017-05-01 16:41:24.000000000 -0700
-+++ nvidia-installer-375.66.new/command-list.c 2017-07-01 18:15:25.087868229 -0700
+diff -uaN command-list.c command-list.c.new
+--- command-list.c 2018-01-24 20:59:24.000000000 -0800
++++ command-list.c.new 2018-02-18 00:51:13.218202297 -0800
@@ -903,6 +903,8 @@
// Allocate enough space for the whole file list, plus two extra files and
// a NULL at the end.
@@ -10,19 +10,20 @@ diff -uaN nvidia-installer-375.66/command-list.c nvidia-installer-375.66.new/com
for (i = 0; i < p->num_entries; i++) {
PackageEntry *entry = &p->entries[i];
-Common subdirectories: nvidia-installer-375.66/common-utils and nvidia-installer-375.66.new/common-utils
-diff -uaN nvidia-installer-375.66/misc.c nvidia-installer-375.66.new/misc.c
---- nvidia-installer-375.66/misc.c 2017-05-01 16:41:24.000000000 -0700
-+++ nvidia-installer-375.66.new/misc.c 2017-07-01 18:19:22.310846284 -0700
-@@ -2290,7 +2290,10 @@
+
+diff -uaN misc.c misc.c.new
+--- misc.c 2018-02-18 00:52:42.822203145 -0800
++++ misc.c.new 2018-02-18 00:53:28.926203581 -0800
+@@ -2289,7 +2289,10 @@
"For further details, please see the appendix SUPPORTED "
"NVIDIA GRAPHICS CHIPS in the README available on the Linux "
"driver download page at www.nvidia.com.", p->version);
- return FALSE;
-+ /* return FALSE;
-++ * We're just going to keep the message but skip the result
-++ * so we can run this in a VM.
-++ */
++/* return FALSE;
++ * We're just going to keep the message but skip the result
++ * so we can run this in a VM.
++ */
}
if (!found_vga_device)
+