kernel-5.1.patch

   1 --- NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/common/inc/nv-list-helpers.h~        2019-01-27 17:12:19.000000000 +0100
   2 +++ NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/common/inc/nv-list-helpers.h 2019-05-07 19:39:34.895403211 +0200
   3 @@ -23,6 +23,7 @@
   4  #ifndef __NV_LIST_HELPERS_H__
   5  #define __NV_LIST_HELPERS_H__
   6
   7 +#include <linux/version.h>
   8  #include <linux/list.h>
   9  #include "conftest.h"
  10
  11 @@ -91,10 +91,12 @@
  12          list_entry((pos)->member.next, typeof(*(pos)), member)
  13  #endif
  14
  15 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
  16  static inline int list_is_first(const struct list_head *list,
  17                                  const struct list_head *head)
  18  {
  19      return list->prev == head;
  20  }
  21 +#endif
  22
  23  #endif // __NV_LIST_HELPERS_H__
  24 --- NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c.orig     2019-01-27 17:12:27.000000000 +0100
  25 +++ NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c  2019-05-07 20:39:24.748960946 +0200
  26 @@ -55,6 +55,11 @@
  27  #include <drm/drm_atomic_helper.h>
  28  #endif
  29
  30 +#include <linux/version.h>
  31 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
  32 +#include <drm/drm_probe_helper.h>
  33 +#endif
  34 +
  35  static struct nv_drm_device *dev_list = NULL;
  36
  37  #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
  38 --- NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-encoder.c~     2019-01-27 17:12:27.000000000 +0100
  39 +++ NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-encoder.c      2019-05-07 20:42:06.361103325 +0200
  40 @@ -36,6 +36,11 @@
  41  #include <drm/drm_atomic.h>
  42  #include <drm/drm_atomic_helper.h>
  43
  44 +#include <linux/version.h>
  45 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
  46 +#include <drm/drm_probe_helper.h>
  47 +#endif
  48 +
  49  static void nv_drm_encoder_destroy(struct drm_encoder *encoder)
  50  {
  51      struct nv_drm_encoder *nv_encoder = to_nv_encoder(encoder);
  52 --- NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c~   2019-01-27 17:12:27.000000000 +0100
  53 +++ NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c    2019-05-07 20:43:20.487229513 +0200
  54 @@ -35,6 +35,11 @@
  55  #include <drm/drm_atomic.h>
  56  #include <drm/drm_atomic_helper.h>
  57
  58 +#include <linux/version.h>
  59 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
  60 +#include <drm/drm_probe_helper.h>
  61 +#endif
  62 +
  63  static void nv_drm_connector_destroy(struct drm_connector *connector)
  64  {
  65      struct nv_drm_connector *nv_connector = to_nv_connector(connector);
  66 --- NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c~    2019-01-27 17:12:27.000000000 +0100
  67 +++ NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c     2019-05-07 20:45:43.466195062 +0200
  68 @@ -19,6 +19,7 @@
  69   * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  70   * DEALINGS IN THE SOFTWARE.
  71   */
  72 +#include <linux/version.h>
  73
  74  #include "nvidia-drm-conftest.h"
  75
  76 @@ -268,12 +268,20 @@
  77   */
  78
  79  #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
  80 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
  81 +static vm_fault_t nv_drm_vma_fault(struct vm_fault *vmf)
  82 +#else
  83  static int nv_drm_vma_fault(struct vm_fault *vmf)
  84 +#endif
  85  {
  86      return __nv_drm_vma_fault(vmf->vma, vmf);
  87  }
  88  #else
  89 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
  90 +static vm_fault_t nv_drm_vma_fault(struct vm_area_struct *vma,
  91 +#else
  92  static int nv_drm_vma_fault(struct vm_area_struct *vma,
  93 +#endif
  94                                  struct vm_fault *vmf)
  95  {
  96      return __nv_drm_vma_fault(vma, vmf);