From d3098090fe12467698fd031fd072f6bce6899ea8 Mon Sep 17 00:00:00 2001
From: Jonathon Fernyhough <jonathon@m2x.dev>
Date: Tue, 20 Jul 2021 20:00:35 +0100
Subject: [PATCH] Upstream 390.144

---
 .SRCINFO | 10 +++++-----
 PKGBUILD | 22 +++++-----------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index edcbf30b3bcae..b6f90ac4ff897 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = nvidia-390xx-utils
-	pkgver = 390.143
-	pkgrel = 4
+	pkgver = 390.144
+	pkgrel = 1
 	url = https://www.nvidia.com/
 	arch = x86_64
 	license = custom
 	options = !strip
 	source = nvidia-drm-outputclass.conf
 	source = nvidia-390xx-utils.sysusers
-	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/390.143/NVIDIA-Linux-x86_64-390.143-no-compat32.run
+	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/390.144/NVIDIA-Linux-x86_64-390.144-no-compat32.run
 	source = kernel-4.16.patch
 	source = kernel-5.12.patch
 	source = kernel-5.13.patch
 	b2sums = 8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9
 	b2sums = c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be
-	b2sums = d1871a27b1df73b4daea26f45c5cc33fa7582dea538ac2acfbb5ed23c0254fe5261d6be60cdb7ce8643ee77b0259195acb2ba2a3784b74c404e79d960005b83d
+	b2sums = 093d3f4779a904a9bbbc0d10e1c2b150665d6515bc9bba9fdaeb06c09be4f1029aa742058635f9309d4dca7f5e8e3fcdbe49f74ed6035075315ed3555b648404
 	b2sums = a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05
 	b2sums = 7db8a62a47e382445e1e61c6e1f58c4641df60b642ec5662e5b094510873d94f1c73b3801c81c26c1f110cff92cf5af882fd95d8f759df8c159769b76906e642
 	b2sums = f2d37280bd336dbbf223e71e7bb376aefad70a1e5c389bceb61424b69ed76cdb2c5657fbb384d63219ecdeb5cbef374bd6772719cc9e4f304d6760054a3935f5
@@ -48,6 +48,6 @@ pkgname = opencl-nvidia-390xx
 pkgname = nvidia-390xx-dkms
 	pkgdesc = NVIDIA drivers - module sources
 	depends = dkms
-	depends = nvidia-390xx-utils=390.143
+	depends = nvidia-390xx-utils=390.144
 	depends = libglvnd
 	provides = NVIDIA-MODULE
diff --git a/PKGBUILD b/PKGBUILD
index 8d0ac4d05ff08..b9954f5e5a1e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgbase=nvidia-390xx-utils
 pkgname=('nvidia-390xx-utils' 'opencl-nvidia-390xx' 'nvidia-390xx-dkms')
-pkgver=390.143
-pkgrel=4
+pkgver=390.144
+pkgrel=1
 arch=('x86_64')
 url="https://www.nvidia.com/"
 license=('custom')
@@ -16,15 +16,11 @@ _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 source=('nvidia-drm-outputclass.conf'
         'nvidia-390xx-utils.sysusers'
         "https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
-        kernel-4.16.patch
-        kernel-5.12.patch
-        kernel-5.13.patch)
+        kernel-4.16.patch)
 b2sums=('8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9'
         'c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be'
-        'd1871a27b1df73b4daea26f45c5cc33fa7582dea538ac2acfbb5ed23c0254fe5261d6be60cdb7ce8643ee77b0259195acb2ba2a3784b74c404e79d960005b83d'
-        'a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05'
-        '7db8a62a47e382445e1e61c6e1f58c4641df60b642ec5662e5b094510873d94f1c73b3801c81c26c1f110cff92cf5af882fd95d8f759df8c159769b76906e642'
-        'f2d37280bd336dbbf223e71e7bb376aefad70a1e5c389bceb61424b69ed76cdb2c5657fbb384d63219ecdeb5cbef374bd6772719cc9e4f304d6760054a3935f5')
+        '093d3f4779a904a9bbbc0d10e1c2b150665d6515bc9bba9fdaeb06c09be4f1029aa742058635f9309d4dca7f5e8e3fcdbe49f74ed6035075315ed3555b648404'
+        'a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05')
 
 create_links() {
     # create soname links
@@ -47,14 +43,6 @@ prepare() {
     # From loqs via https://bugs.archlinux.org/task/58074
     patch -Np1 -i ../kernel-4.16.patch
 
-    # From Larry Finger
-    # https://build.opensuse.org/package/view_file/X11:Drivers:Video/nvidia-gfxG04/kernel-5.12.patch?expand=1
-    patch -Np1 -i ../kernel-5.12.patch
-
-    # From Alberto Milone, adapted by JF
-    # http://launchpadlibrarian.net/540714527/nvidia-graphics-drivers-390_390.143-0ubuntu1_390.143-0ubuntu2.diff.gz
-    patch -Np1 -i ../kernel-5.13.patch
-
     cd kernel
     sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
     sed -i 's/__JOBS/`nproc`/' dkms.conf