11:13 a.m.
commit bacf0855d9301d09700926f4dafdf20cd3474afa
Author: Henrik Nordström <henrik(a)hno.se>
Date: Fri Jul 23 13:13:28 2021 +0200
390.144
kernel-5.13.patch | 55 --------------------------------------------------
nvidia-390xx-kmod.spec | 31 +++++++++++++++-------------
use-kbuild-flags.patch | 4 ++--
3 files changed, 19 insertions(+), 71 deletions(-)
---
diff --git a/kernel-5.13.patch b/kernel-5.13.patch
index 4d05069..472172b 100644
--- a/kernel-5.13.patch
+++ b/kernel-5.13.patch
@@ -157,15 +157,6 @@ diff --git a/kernel/nvidia-drm/nvidia-drm-crtc.c
b/kernel/nvidia-drm/nvidia-drm-
index 8abd1f3..be93995 100644
--- a/kernel/nvidia-drm/nvidia-drm-crtc.c
+++ b/kernel/nvidia-drm/nvidia-drm-crtc.c
-@@ -19,7 +19,7 @@
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
--
-+#include <linux/version.h>
- #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
-
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
@@ -34,6 +34,7 @@
#include "nvidia-drm-ioctl.h"
@@ -174,52 +165,6 @@ index 8abd1f3..be93995 100644
#include <drm/drm_plane_helper.h>
#include <drm/drm_atomic.h>
-@@ -130,9 +131,19 @@ plane_req_config_update(struct drm_plane_state *plane_state,
- old_config.dstHeight != req_config->config.dstHeight;
- }
-
-+// Rel commit "drm/atomic: Pass the full state to planes atomic_check" (Maxime
Ripard, Feb 19 2021)
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 13, 0))
- static int nv_drm_plane_atomic_check(struct drm_plane *plane,
- struct drm_plane_state *plane_state)
-+#else
-+static int nv_drm_plane_atomic_check(struct drm_plane *plane,
-+ struct drm_atomic_state *state)
-+#endif
- {
-+// Rel commit "drm/atomic: Pass the full state to planes atomic_check" (Maxime
Ripard, Feb 19 2021)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0))
-+ struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state, plane);
-+#endif
- int i;
- struct drm_crtc *crtc;
- struct drm_crtc_state *crtc_state;
-@@ -165,13 +176,25 @@ done:
- return 0;
- }
-
-+// Rel commit "drm/atomic: Pass the full state to planes atomic disable and
update" (Maxime Ripard, Feb 19 2021)
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 13, 0))
- static void nv_drm_plane_atomic_update(struct drm_plane *plane,
- struct drm_plane_state *old_state)
-+#else
-+static void nv_drm_plane_atomic_update(struct drm_plane *plane,
-+ struct drm_atomic_state *state)
-+#endif
- {
- }
-
-+// Rel commit "drm/atomic: Pass the full state to planes atomic disable and
update" (Maxime Ripard, Feb 19 2021)
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 13, 0))
- static void nv_drm_plane_atomic_disable(struct drm_plane *plane,
- struct drm_plane_state *old_state)
-+#else
-+static void nv_drm_plane_atomic_disable(struct drm_plane *plane,
-+ struct drm_atomic_state *state)
-+#endif
- {
- }
-
diff --git a/kernel/nvidia-drm/nvidia-drm-crtc.h b/kernel/nvidia-drm/nvidia-drm-crtc.h
index f54e34d..f4de8af 100644
--- a/kernel/nvidia-drm/nvidia-drm-crtc.h
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index a3909b7..4e772dd 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -10,9 +10,9 @@
Name: nvidia-390xx-kmod
Epoch: 3
-Version: 390.143
+Version: 390.144
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -68,18 +68,18 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name}
--filterf
%setup -T -c
tar --use-compress-program xz -xf
%{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# Apply patches
-%patch10 -p1 -d kernel
-%patch11 -p2 -d kernel
-%patch12 -p2 -d kernel
-%patch30 -p1 -d kernel
-%patch31 -p1 -d kernel
-%patch32 -p1 -d kernel
-%patch33 -p1 -d kernel
-%patch34 -p1 -d kernel
-%patch40 -p1 -d kernel
-%patch41 -p1 -d kernel
-%patch42 -p1 -d kernel
-%patch43 -p1 -d kernel
+%patch10 -p1 -b 10 -d kernel
+%patch11 -p2 -b 11 -d kernel
+%patch12 -p2 -b 12 -d kernel
+%patch30 -p1 -b 30 -d kernel
+%patch31 -p1 -b 31 -d kernel
+%patch32 -p1 -b 32 -d kernel
+%patch33 -p1 -b 33 -d kernel
+%patch34 -p1 -b 34 -d kernel
+%patch40 -p1 -b 40 -d kernel
+%patch41 -p1 -b 41 -d kernel
+%patch42 -p1 -b 42 -d kernel
+%patch43 -p1 -b 42 -d kernel
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -106,6 +106,9 @@ done
%changelog
+* Fri Jul 23 2021 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 390.144-1
+- Update to 390.144
+
* Sun Jun 27 2021 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 390.143-2
- Kernel 5.12 patch taken from OpenSuSE via Arch repo
- Kernel 5.13 patch taken from Herecura Arch repo
diff --git a/use-kbuild-flags.patch b/use-kbuild-flags.patch
index 3d15f72..9033258 100644
--- a/use-kbuild-flags.patch
+++ b/use-kbuild-flags.patch
@@ -16,7 +16,7 @@ Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS
--- a/nvidia/nvidia.Kbuild
+++ b/nvidia/nvidia.Kbuild
@@ -88,7 +88,7 @@ NVIDIA_INTERFACE := nvidia/nv-interface.
- always += $(NVIDIA_INTERFACE)
+ always-y += $(NVIDIA_INTERFACE)
$(obj)/$(NVIDIA_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_OBJECTS))
- $(LD) -r -o $@ $^
@@ -38,7 +38,7 @@ Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS
--- a/nvidia-modeset/nvidia-modeset.Kbuild
+++ b/nvidia-modeset/nvidia-modeset.Kbuild
@@ -70,7 +70,7 @@ NVIDIA_MODESET_INTERFACE := nvidia-modes
- always += $(NVIDIA_MODESET_INTERFACE)
+ always-y += $(NVIDIA_MODESET_INTERFACE)
$(obj)/$(NVIDIA_MODESET_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_MODESET_OBJECTS))
- $(LD) -r -o $@ $^