From f863834617633f023f3dd1157298e4677e94a8b6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Oct 2022 19:17:05 +0100 Subject: sys-kernel/nvidia-drivers-dkms (390 & 470) : fix patch hunks --- sys-kernel/nvidia-drivers-dkms/files/390-kernel6.patch | 12 ++++++------ sys-kernel/nvidia-drivers-dkms/files/470-kernel6.patch | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'sys-kernel') diff --git a/sys-kernel/nvidia-drivers-dkms/files/390-kernel6.patch b/sys-kernel/nvidia-drivers-dkms/files/390-kernel6.patch index a8cf8d7c..ec5b2542 100644 --- a/sys-kernel/nvidia-drivers-dkms/files/390-kernel6.patch +++ b/sys-kernel/nvidia-drivers-dkms/files/390-kernel6.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Tentative fix for NVIDIA 470.141.03 driver for Linux 6.0-rc1 nvidia/nv.c | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) -diff --git a/nvidia-drm/nvidia-drm-helper.c b/nvidia-drm/nvidia-drm-helper.c +diff --git a/kernel/nvidia-drm/nvidia-drm-helper.c b/kernel/nvidia-drm/nvidia-drm-helper.c index 3831180..fa03d51 100644 ---- a/nvidia-drm/nvidia-drm-helper.c -+++ b/nvidia-drm/nvidia-drm-helper.c +--- a/kernel/nvidia-drm/nvidia-drm-helper.c ++++ b/kernel/nvidia-drm/nvidia-drm-helper.c @@ -41,6 +41,11 @@ #include #endif @@ -25,10 +25,10 @@ index 3831180..fa03d51 100644 static void __nv_drm_framebuffer_put(struct drm_framebuffer *fb) { #if defined(NV_DRM_FRAMEBUFFER_GET_PRESENT) -diff --git a/nvidia/nv-acpi.c b/nvidia/nv-acpi.c +diff --git a/kernel/nvidia/nv-acpi.c b/kernel/nvidia/nv-acpi.c index 2b7b988..76c36fa 100644 ---- a/nvidia/nv-acpi.c -+++ b/nvidia/nv-acpi.c +--- a/kernel/nvidia/nv-acpi.c ++++ b/kernel/nvidia/nv-acpi.c @@ -16,7 +16,10 @@ #include diff --git a/sys-kernel/nvidia-drivers-dkms/files/470-kernel6.patch b/sys-kernel/nvidia-drivers-dkms/files/470-kernel6.patch index 3ad376a2..0058f6b4 100644 --- a/sys-kernel/nvidia-drivers-dkms/files/470-kernel6.patch +++ b/sys-kernel/nvidia-drivers-dkms/files/470-kernel6.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Tentative fix for NVIDIA 470.141.03 driver for Linux 6.0-rc1 nvidia/nv.c | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) -diff --git a/nvidia-drm/nvidia-drm-helper.c b/nvidia-drm/nvidia-drm-helper.c +diff --git a/kernel/nvidia-drm/nvidia-drm-helper.c b/kernel/nvidia-drm/nvidia-drm-helper.c index 3831180..fa03d51 100644 ---- a/nvidia-drm/nvidia-drm-helper.c -+++ b/nvidia-drm/nvidia-drm-helper.c +--- a/kernel/nvidia-drm/nvidia-drm-helper.c ++++ b/kernel/nvidia-drm/nvidia-drm-helper.c @@ -41,6 +41,11 @@ #include #endif @@ -25,10 +25,10 @@ index 3831180..fa03d51 100644 static void __nv_drm_framebuffer_put(struct drm_framebuffer *fb) { #if defined(NV_DRM_FRAMEBUFFER_GET_PRESENT) -diff --git a/nvidia/nv-acpi.c b/nvidia/nv-acpi.c +diff --git a/kernel/nvidia/nv-acpi.c b/kernel/nvidia/nv-acpi.c index 2b7b988..76c36fa 100644 ---- a/nvidia/nv-acpi.c -+++ b/nvidia/nv-acpi.c +--- a/kernel/nvidia/nv-acpi.c ++++ b/kernel/nvidia/nv-acpi.c @@ -16,7 +16,10 @@ #include @@ -41,10 +41,10 @@ index 2b7b988..76c36fa 100644 static NV_STATUS nv_acpi_extract_integer (const union acpi_object *, void *, NvU32, NvU32 *); static NV_STATUS nv_acpi_extract_buffer (const union acpi_object *, void *, NvU32, NvU32 *); static NV_STATUS nv_acpi_extract_package (const union acpi_object *, void *, NvU32, NvU32 *); -diff --git a/nvidia/nv.c b/nvidia/nv.c +diff --git a/kernel/nvidia/nv.c b/kernel/nvidia/nv.c index ab7d17c..e313e2e 100644 ---- a/nvidia/nv.c -+++ b/nvidia/nv.c +--- a/kernel/nvidia/nv.c ++++ b/kernel/nvidia/nv.c @@ -5423,7 +5423,8 @@ NvBool NV_API_CALL nv_s2idle_pm_configured(void) { NvU8 buf[8]; -- cgit v1.2.3