up to 367.44

[packages/xorg-driver-video-nvidia.git] / linux-4.7.patch

diff --git a/linux-4.7.patch b/linux-4.7.patch
deleted file mode 100644 (file)
index 97a0b48..0000000
--- a/linux-4.7.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/kernel/nvidia-drm/nvidia-drm-fb.c
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.c
-@@ -20,6 +20,7 @@
-  * DEALINGS IN THE SOFTWARE.
-  */
- 
-+#include <linux/version.h>
- #include "conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-@@ -114,7 +115,11 @@
-      * We don't support any planar format, pick up first buffer only.
-      */
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+    gem = drm_gem_object_lookup(file, cmd->handles[0]);
-+#else
-     gem = drm_gem_object_lookup(dev, file, cmd->handles[0]);
-+#endif
- 
-     if (gem == NULL)
-     {
---- a/kernel/nvidia-drm/nvidia-drm-gem.c
-+++ b/kernel/nvidia-drm/nvidia-drm-gem.c
-@@ -24,6 +24,7 @@
- 
- #if defined(NV_DRM_AVAILABLE)
- 
-+#include <linux/version.h>
- #include "nvidia-drm-priv.h"
- #include "nvidia-drm-ioctl.h"
- #include "nvidia-drm-gem.h"
-@@ -405,7 +406,11 @@
- 
-     mutex_lock(&dev->struct_mutex);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+    gem = drm_gem_object_lookup(file, handle);
-+#else
-     gem = drm_gem_object_lookup(dev, file, handle);
-+#endif
- 
-     if (gem == NULL)
-     {
-