commit 45b3143fd8ca94a5ae9e023f3b6296b80f531033 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Sun Oct 30 10:54:25 2022 +0100 Ported patches to akmods tarball structure. ...rt-get_task_ioprio-changes-from-510.85.02.patch | 20 +++++++------- 0021-backport-acpi-changes-from-510.85.02.patch | 32 +++++++++++----------- 0022-backport-acpi-changes-from-515.65.01.patch | 8 +++--- ...port-drm_frambuffer.h-changes-from-515.76.patch | 6 ++-- 4 files changed, 33 insertions(+), 33 deletions(-) --- diff --git a/0020-backport-get_task_ioprio-changes-from-510.85.02.patch b/0020-backport-get_task_ioprio-changes-from-510.85.02.patch index b7cef40..6f882d2 100644 --- a/0020-backport-get_task_ioprio-changes-from-510.85.02.patch +++ b/0020-backport-get_task_ioprio-changes-from-510.85.02.patch @@ -4,15 +4,15 @@ Date: Wed, 19 Oct 2022 00:14:36 +0200 Subject: [PATCH] backport get_task_ioprio changes from 510.85.02 --- - conftest.sh | 17 +++++++++++++++++ - nvidia/nv.c | 12 ++++++++++++ - nvidia/nvidia.Kbuild | 1 + + kernel/conftest.sh | 17 +++++++++++++++++ + kernel/nvidia/nv.c | 12 ++++++++++++ + kernel/nvidia/nvidia.Kbuild | 1 + 3 files changed, 30 insertions(+) -diff --git a/conftest.sh b/conftest.sh +diff --git a/kernel/conftest.sh b/kernel/conftest.sh index f3fd14b..4789bd5 100755 ---- a/conftest.sh -+++ b/conftest.sh +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh @@ -4817,6 +4817,23 @@ compile_test() { compile_check_conftest "$CODE" "NV_RESERVATION_OBJECT_RESERVE_SHARED_HAS_NUM_FENCES_ARG" "" "types" ;; @@ -39,8 +39,8 @@ index f3fd14b..4789bd5 100755 # diff --git a/nvidia/nv.c b/nvidia/nv.c index 02cc245..2475b96 100644 ---- a/nvidia/nv.c -+++ b/nvidia/nv.c +--- a/kernel/nvidia/nv.c ++++ b/kernel/nvidia/nv.c @@ -5438,7 +5438,19 @@ NvBool NV_API_CALL nv_s2idle_pm_configured(void) return NV_FALSE; } @@ -63,8 +63,8 @@ index 02cc245..2475b96 100644 diff --git a/nvidia/nvidia.Kbuild b/nvidia/nvidia.Kbuild index f1d9b3f..e3c6b1f 100644 ---- a/nvidia/nvidia.Kbuild -+++ b/nvidia/nvidia.Kbuild +--- a/kernel/nvidia/nvidia.Kbuild ++++ b/kernel/nvidia/nvidia.Kbuild @@ -170,6 +170,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_put_unlocked NV_CONFTEST_FUNCTION_COMPILE_TESTS += set_close_on_exec NV_CONFTEST_FUNCTION_COMPILE_TESTS += dma_set_coherent_mask diff --git a/0021-backport-acpi-changes-from-510.85.02.patch b/0021-backport-acpi-changes-from-510.85.02.patch index 960567a..08925c1 100644 --- a/0021-backport-acpi-changes-from-510.85.02.patch +++ b/0021-backport-acpi-changes-from-510.85.02.patch @@ -4,16 +4,16 @@ Date: Tue, 18 Oct 2022 22:32:41 +0200 Subject: [PATCH] backport acpi changes from 510.85.02 --- - common/inc/nv-linux.h | 12 -- - common/inc/nv-proto.h | 2 - - nvidia/nv-acpi.c | 443 ------------------------------------------ - nvidia/nv.c | 16 -- + kernel/common/inc/nv-linux.h | 12 -- + kernel/common/inc/nv-proto.h | 2 - + kernel/nvidia/nv-acpi.c | 443 ------------------------------------------ + kernel/nvidia/nv.c | 16 -- 4 files changed, 473 deletions(-) -diff --git a/common/inc/nv-linux.h b/common/inc/nv-linux.h +diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h index 51a973b..22b05a0 100644 ---- a/common/inc/nv-linux.h -+++ b/common/inc/nv-linux.h +--- a/kernel/common/inc/nv-linux.h ++++ b/kernel/common/inc/nv-linux.h @@ -1627,24 +1627,12 @@ extern NvBool nv_ats_supported; * and any other baggage we want to carry along * @@ -39,10 +39,10 @@ index 51a973b..22b05a0 100644 } nv_acpi_t; #endif -diff --git a/common/inc/nv-proto.h b/common/inc/nv-proto.h +diff --git a/kernel/common/inc/nv-proto.h b/kernel/common/inc/nv-proto.h index 79cccfa..aa8b285 100644 ---- a/common/inc/nv-proto.h -+++ b/common/inc/nv-proto.h +--- a/kernel/common/inc/nv-proto.h ++++ b/kernel/common/inc/nv-proto.h @@ -22,8 +22,6 @@ extern nvidia_module_t nv_fops; void nv_acpi_register_notifier (nv_linux_state_t *); @@ -52,10 +52,10 @@ index 79cccfa..aa8b285 100644 NvU8 nv_find_pci_capability (struct pci_dev *, NvU8); void * nv_alloc_file_private (void); -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..dcad96c 100644 ---- a/nvidia/nv-acpi.c -+++ b/nvidia/nv-acpi.c +--- a/kernel/nvidia/nv-acpi.c ++++ b/kernel/nvidia/nv-acpi.c @@ -22,35 +22,13 @@ static NV_STATUS nv_acpi_extract_buffer (const union acpi_object *, void *, N static NV_STATUS nv_acpi_extract_package (const union acpi_object *, void *, NvU32, NvU32 *); static NV_STATUS nv_acpi_extract_object (const union acpi_object *, void *, NvU32, NvU32 *); @@ -569,10 +569,10 @@ index 2b7b988..dcad96c 100644 void NV_API_CALL nv_acpi_methods_init(NvU32 *handlePresent) { *handlePresent = 0; -diff --git a/nvidia/nv.c b/nvidia/nv.c +diff --git a/kernel/nvidia/nv.c b/kernel/nvidia/nv.c index 2475b96..13d2614 100644 ---- a/nvidia/nv.c -+++ b/nvidia/nv.c +--- a/kernel/nvidia/nv.c ++++ b/kernel/nvidia/nv.c @@ -2694,7 +2694,6 @@ nvidia_ctl_open( nv_linux_state_t *nvl = &nv_ctl_device; nv_state_t *nv = NV_STATE_PTR(nvl); diff --git a/0022-backport-acpi-changes-from-515.65.01.patch b/0022-backport-acpi-changes-from-515.65.01.patch index c1b1590..fb73d45 100644 --- a/0022-backport-acpi-changes-from-515.65.01.patch +++ b/0022-backport-acpi-changes-from-515.65.01.patch @@ -4,13 +4,13 @@ Date: Mon, 17 Oct 2022 03:03:00 +0200 Subject: [PATCH] backport acpi changes from 515.65.01 --- - nvidia/nv-acpi.c | 65 +++++++++++++----------------------------------- + kernel/nvidia/nv-acpi.c | 65 +++++++++++++----------------------------------- 1 file changed, 17 insertions(+), 48 deletions(-) -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 dcad96c..4ec227c 100644 ---- a/nvidia/nv-acpi.c -+++ b/nvidia/nv-acpi.c +--- a/kernel/nvidia/nv-acpi.c ++++ b/kernel/nvidia/nv-acpi.c @@ -681,12 +681,11 @@ NV_STATUS NV_API_CALL nv_acpi_ddc_method( ) { diff --git a/0023-backport-drm_frambuffer.h-changes-from-515.76.patch b/0023-backport-drm_frambuffer.h-changes-from-515.76.patch index 402bfcd..bdeb33d 100644 --- a/0023-backport-drm_frambuffer.h-changes-from-515.76.patch +++ b/0023-backport-drm_frambuffer.h-changes-from-515.76.patch @@ -4,13 +4,13 @@ Date: Mon, 17 Oct 2022 03:35:02 +0200 Subject: [PATCH] backport drm_frambuffer.h changes from 515.76 --- - nvidia-drm/nvidia-drm-helper.c | 13 +++++++++++++ + kernel/nvidia-drm/nvidia-drm-helper.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nvidia-drm/nvidia-drm-helper.c b/nvidia-drm/nvidia-drm-helper.c index 3831180..8fc8620 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,19 @@ #include <drm/drm_atomic_uapi.h> #endif