From c0cd361dd6f4edec864e59c0bf5c4ee1311e9029 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sat, 6 Jan 2018 00:13:48 +0000
Subject: [PATCH] xf86-video-nvidia: update to xf86-video-nvidia-384.111

---
 packages/x11/driver/xf86-video-nvidia/package.mk  |  4 ++--
 .../xf86-video-nvidia-0100-kernel-4.14.9.patch    | 15 ---------------
 .../xf86-video-nvidia/udev.d/96-nvidia.rules      |  3 +++
 3 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-0100-kernel-4.14.9.patch

diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk
index cfd4c909fe..51372db010 100644
--- a/packages/x11/driver/xf86-video-nvidia/package.mk
+++ b/packages/x11/driver/xf86-video-nvidia/package.mk
@@ -20,8 +20,8 @@ PKG_NAME="xf86-video-nvidia"
 # Remember to run "python packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py" and commit changes to
 # "packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules" whenever bumping version.
 # Host may require installation of python-lxml and python-requests packages.
-PKG_VERSION="384.98"
-PKG_SHA256="169909c756ce01abcb676d704638003f3b782173a8ea82f2de798e40212780f5"
+PKG_VERSION="384.111"
+PKG_SHA256="56b8c993c697aa37fe9ab1b6764304b82c86d5c745cd98dd8492be27f596ead7"
 PKG_ARCH="x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.nvidia.com/"
diff --git a/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-0100-kernel-4.14.9.patch b/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-0100-kernel-4.14.9.patch
deleted file mode 100644
index d44663e8f4..0000000000
--- a/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-0100-kernel-4.14.9.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/kernel/nvidia-uvm/uvm8_va_block.c b/kernel/nvidia-uvm/uvm8_va_block.c
-index 99f6f9b..a453eb6 100644
---- a/kernel/nvidia-uvm/uvm8_va_block.c
-+++ b/kernel/nvidia-uvm/uvm8_va_block.c
-@@ -36,6 +36,10 @@
- #include "uvm8_perf_prefetch.h"
- #include "uvm8_mem.h"
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,9)
-+#include <linux/sched/task_stack.h>
-+#endif
-+
- typedef enum
- {
-     BLOCK_PTE_OP_MAP,
diff --git a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules
index 9edbd98fdf..00543a9976 100644
--- a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules
+++ b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules
@@ -311,6 +311,8 @@ ATTRS{device}=="0x1618", GOTO="configure_nvidia"
 ATTRS{device}=="0x1619", GOTO="configure_nvidia"
 ATTRS{device}=="0x161a", GOTO="configure_nvidia"
 ATTRS{device}=="0x1667", GOTO="configure_nvidia"
+ATTRS{device}=="0x174d", GOTO="configure_nvidia"
+ATTRS{device}=="0x174e", GOTO="configure_nvidia"
 ATTRS{device}=="0x179c", GOTO="configure_nvidia"
 ATTRS{device}=="0x17c2", GOTO="configure_nvidia"
 ATTRS{device}=="0x17c8", GOTO="configure_nvidia"
@@ -360,6 +362,7 @@ ATTRS{device}=="0x1cb3", GOTO="configure_nvidia"
 ATTRS{device}=="0x1d01", GOTO="configure_nvidia"
 ATTRS{device}=="0x1d10", GOTO="configure_nvidia"
 ATTRS{device}=="0x1d12", GOTO="configure_nvidia"
+ATTRS{device}=="0x1d33", GOTO="configure_nvidia"
 ATTRS{device}=="0x1db1", GOTO="configure_nvidia"
 ATTRS{device}=="0x1db4", GOTO="configure_nvidia"
 GOTO="configure_nvidia-legacy"