diff -Nru nvidia-graphics-drivers-390-390.157/debian/changelog nvidia-graphics-drivers-390-390.157/debian/changelog --- nvidia-graphics-drivers-390-390.157/debian/changelog 2023-03-15 15:38:08.000000000 +0000 +++ nvidia-graphics-drivers-390-390.157/debian/changelog 2023-05-16 13:56:25.000000000 +0000 @@ -1,3 +1,13 @@ +nvidia-graphics-drivers-390 (390.157-0ubuntu6) lunar; urgency=medium + + * debian/dkms_nvidia.conf, + debian/templates/dkms_nvidia.conf.in, + debian/dkms_nvidia/patches/disable-acpi-support-in-linux-6.0.patch, + debian/dkms_nvidia/patches/buildfix_kernel_6.2.patch: + - Better support for linux 6.2 (LP: #2019869) + + -- Andrea Righi Tue, 16 May 2023 15:56:25 +0200 + nvidia-graphics-drivers-390 (390.157-0ubuntu5) lunar; urgency=medium * debian/templates/control.in: diff -Nru nvidia-graphics-drivers-390-390.157/debian/dkms_nvidia/patches/buildfix_kernel_6.2.patch nvidia-graphics-drivers-390-390.157/debian/dkms_nvidia/patches/buildfix_kernel_6.2.patch --- nvidia-graphics-drivers-390-390.157/debian/dkms_nvidia/patches/buildfix_kernel_6.2.patch 2023-03-15 15:18:43.000000000 +0000 +++ nvidia-graphics-drivers-390-390.157/debian/dkms_nvidia/patches/buildfix_kernel_6.2.patch 2023-05-16 13:56:25.000000000 +0000 @@ -1,69 +1,145 @@ ---- a/nvidia-drm/nvidia-drm-drv.c 2022-10-12 09:30:31.000000000 +0000 -+++ b/nvidia-drm/nvidia-drm-drv.c 2023-03-03 10:02:40.645530593 +0000 -@@ -61,6 +61,9 @@ - - #include +From 5db7eb5a62003bbe04f3f07d089fcf5445b34a29 Mon Sep 17 00:00:00 2001 +From: Joan Bruguera +Date: Sun, 25 Dec 2022 22:05:14 +0000 +Subject: [PATCH] Tentative fix for NVIDIA 470.161.03 driver for Linux 6.2-rc1 + +--- + nvidia-drm/nvidia-drm-connector.c | 22 ++++++++++++++++++++++ + nvidia-drm/nvidia-drm-drv.c | 4 ++++ + nvidia/nv-acpi.c | 19 ++++++++++++++++--- + 3 files changed, 42 insertions(+), 3 deletions(-) + +diff --git a/nvidia-drm/nvidia-drm-connector.c b/nvidia-drm/nvidia-drm-connector.c +index 6fbcd63..a5ab9e9 100644 +--- a/nvidia-drm/nvidia-drm-connector.c ++++ b/nvidia-drm/nvidia-drm-connector.c +@@ -20,6 +20,8 @@ + * DEALINGS IN THE SOFTWARE. + */ +#include -+#include ++#include + #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ + + #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) +@@ -98,6 +100,7 @@ __nv_drm_detect_encoder(struct NvKmsKapiDynamicDisplayParams *pDetectParams, + break; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0) + if (connector->override_edid) { + const struct drm_property_blob *edid = connector->edid_blob_ptr; + +@@ -110,6 +113,25 @@ __nv_drm_detect_encoder(struct NvKmsKapiDynamicDisplayParams *pDetectParams, + sizeof(pDetectParams->edid.buffer)); + } + } ++#else ++ // Rel. commit "drm/edid: detach debugfs EDID override from EDID property update" (Jani Nikula, 24 Oct 2022) ++ // NOTE: HUGE HACK! ++ mutex_lock(&connector->edid_override_mutex); ++ if (connector->edid_override) { ++ const struct edid *edid = drm_edid_raw(connector->edid_override); ++ size_t edid_length = EDID_LENGTH * (edid->extensions + 1); ++ if (edid_length <= sizeof(pDetectParams->edid.buffer)) { ++ memcpy(pDetectParams->edid.buffer, edid, edid_length); ++ pDetectParams->edid.bufferSize = edid_length; ++ pDetectParams->overrideEdid = NV_TRUE; ++ } else { ++ WARN_ON(edid_length > ++ sizeof(pDetectParams->edid.buffer)); ++ } ++ } ++ mutex_unlock(&connector->edid_override_mutex); + - /* - * Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h") - * moves a number of helper function definitions from -@@ -240,8 +243,9 @@ nv_drm_init_mode_config(struct nv_drm_de ++#endif + + if (!nvKms->getDynamicDisplayInfo(nv_dev->pDevice, pDetectParams)) { + NV_DRM_DEV_LOG_ERR( +diff --git a/nvidia-drm/nvidia-drm-drv.c b/nvidia-drm/nvidia-drm-drv.c +index 6d007b1..d08ab4c 100644 +--- a/nvidia-drm/nvidia-drm-drv.c ++++ b/nvidia-drm/nvidia-drm-drv.c +@@ -20,6 +20,7 @@ + * DEALINGS IN THE SOFTWARE. + */ + ++#include + #include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */ + + #include "nvidia-drm-priv.h" +@@ -240,9 +241,12 @@ nv_drm_init_mode_config(struct nv_drm_device *nv_dev, + dev->mode_config.preferred_depth = 24; dev->mode_config.prefer_shadow = 1; ++// Rel. commit "drm: Remove drm_mode_config::fb_base" (Zack Rusin, 18 Oct 2022) ++#if defined(CONFIG_FB) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0) /* Currently unused. Update when needed. */ -- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0) + dev->mode_config.fb_base = 0; +#endif - dev->mode_config.async_page_flip = false; - ---- a/nvidia-drm/nvidia-drm-connector.c 2022-10-12 09:30:31.000000000 +0000 -+++ b/nvidia-drm/nvidia-drm-connector.c 2023-03-03 10:10:15.338464565 +0000 -@@ -30,6 +30,9 @@ - #include "nvidia-drm-utils.h" - #include "nvidia-drm-encoder.h" + #if defined(NV_DRM_CRTC_STATE_HAS_ASYNC_FLIP) || \ + defined(NV_DRM_CRTC_STATE_HAS_PAGEFLIP_FLAGS) +diff --git a/nvidia/nv-acpi.c b/nvidia/nv-acpi.c +index 07501eb..1fdf71c 100644 +--- a/nvidia/nv-acpi.c ++++ b/nvidia/nv-acpi.c +@@ -8,6 +8,7 @@ + * _NVRM_COPYRIGHT_END_ + */ +#include -+#include -+ - /* - * Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h") - * moves a number of helper function definitions from -@@ -58,6 +61,24 @@ static void nv_drm_connector_destroy(str - nv_drm_free(nv_connector); + #define __NO_VERSION__ + + #include "os-interface.h" +@@ -24,7 +25,10 @@ static NV_STATUS nv_acpi_extract_object (const union acpi_object *, void *, N + + static int nv_acpi_add (struct acpi_device *); + +-#if !defined(NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT) || (NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT == 2) ++// Rel. commit "ACPI: make remove callback of ACPI driver void" (Dawei Li, 14 Nov 2022) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0)) ++static void nv_acpi_remove_one_arg_void(struct acpi_device *device); ++#elif !defined(NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT) || (NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT == 2) + static int nv_acpi_remove_two_args(struct acpi_device *device, int type); + #else + static int nv_acpi_remove_one_arg(struct acpi_device *device); +@@ -80,7 +84,10 @@ static const struct acpi_driver nv_acpi_driver_template = { + .ids = nv_video_device_ids, + .ops = { + .add = nv_acpi_add, +-#if !defined(NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT) || (NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT == 2) ++// Rel. commit "ACPI: make remove callback of ACPI driver void" (Dawei Li, 14 Nov 2022) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0)) ++ .remove = nv_acpi_remove_one_arg_void, ++#elif !defined(NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT) || (NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT == 2) + .remove = nv_acpi_remove_two_args, + #else + .remove = nv_acpi_remove_one_arg, +@@ -342,7 +349,10 @@ static int nv_acpi_add(struct acpi_device *device) + return 0; } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0) -+static bool check_edid_override(struct drm_connector *connector) -+{ -+ return connector->override_edid != NULL; -+} -+#else -+static bool check_edid_override(struct drm_connector *connector) -+{ -+ int ret; -+ -+ mutex_lock(&connector->edid_override_mutex); -+ ret = connector->edid_override != NULL; -+ mutex_lock(&connector->edid_override_mutex); -+ -+ return ret; -+} -+#endif -+ - static bool - __nv_drm_detect_encoder(struct NvKmsKapiDynamicDisplayParams *pDetectParams, - struct drm_connector *connector, -@@ -98,7 +119,7 @@ __nv_drm_detect_encoder(struct NvKmsKapi - break; +-#if !defined(NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT) || (NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT == 2) ++// Rel. commit "ACPI: make remove callback of ACPI driver void" (Dawei Li, 14 Nov 2022) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0)) ++static void nv_acpi_remove_one_arg_void(struct acpi_device *device) ++#elif !defined(NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT) || (NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT == 2) + static int nv_acpi_remove_two_args(struct acpi_device *device, int type) + #else + static int nv_acpi_remove_one_arg(struct acpi_device *device) +@@ -396,7 +406,10 @@ static int nv_acpi_remove_one_arg(struct acpi_device *device) + device->driver_data = NULL; } -- if (connector->override_edid) { -+ if (check_edid_override(connector)) { - const struct drm_property_blob *edid = connector->edid_blob_ptr; ++// Rel. commit "ACPI: make remove callback of ACPI driver void" (Dawei Li, 14 Nov 2022) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0)) + return status; ++#endif + } - if (edid->length <= sizeof(pDetectParams->edid.buffer)) { + /* +-- +2.39.0 + diff -Nru nvidia-graphics-drivers-390-390.157/debian/dkms_nvidia/patches/disable-acpi-support-in-linux-6.0.patch nvidia-graphics-drivers-390-390.157/debian/dkms_nvidia/patches/disable-acpi-support-in-linux-6.0.patch --- nvidia-graphics-drivers-390-390.157/debian/dkms_nvidia/patches/disable-acpi-support-in-linux-6.0.patch 2023-03-15 15:18:43.000000000 +0000 +++ nvidia-graphics-drivers-390-390.157/debian/dkms_nvidia/patches/disable-acpi-support-in-linux-6.0.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -From: Joan Bruguera -Subject: [PATCH] Tentative fix for NVIDIA 470.141.03 driver for Linux 6.0-rc1 -Origin: https://gitlab.com/herecura/packages/nvidia-470xx-dkms/-/blob/9c88952c1504e32ba3656cb0e2afd9286d2a763d/kernel-6.0.patch - -diff -urpN build.orig/nvidia/nv-acpi.c build/nvidia/nv-acpi.c ---- build.orig/nvidia/nv-acpi.c 2022-06-22 04:58:04.000000000 +0000 -+++ build/nvidia/nv-acpi.c 2023-02-09 07:58:56.532267584 +0000 -@@ -15,7 +15,10 @@ - #include "nv-linux.h" - #include "nv-reg.h" - --#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) -+#include -+// Rel.commit "ACPI: bus: Drop unused list heads from struct acpi_device" (Rafael J. Wysocki, 4 Jun 2022) -+// Disable ACPI support due to more GPL stuff (acpi_dev_for_each_child is only GPL-exported) -+#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)) - 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 -urpN build.orig/nvidia-drm/nvidia-drm-helper.c build/nvidia-drm/nvidia-drm-helper.c ---- build.orig/nvidia-drm/nvidia-drm-helper.c 2022-06-22 04:58:08.000000000 +0000 -+++ build/nvidia-drm/nvidia-drm-helper.c 2023-02-09 07:58:56.532267584 +0000 -@@ -39,6 +39,11 @@ - #include - #endif - -+// Add header which is no longer indirectly referenced as of Linux 6.0-rc1 -+#if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT) -+#include -+#endif -+ - static void __nv_drm_framebuffer_put(struct drm_framebuffer *fb) - { - #if defined(NV_DRM_FRAMEBUFFER_GET_PRESENT) diff -Nru nvidia-graphics-drivers-390-390.157/debian/dkms_nvidia.conf nvidia-graphics-drivers-390-390.157/debian/dkms_nvidia.conf --- nvidia-graphics-drivers-390-390.157/debian/dkms_nvidia.conf 2023-03-15 15:38:08.000000000 +0000 +++ nvidia-graphics-drivers-390-390.157/debian/dkms_nvidia.conf 2023-05-16 13:56:25.000000000 +0000 @@ -26,8 +26,7 @@ AUTOINSTALL="yes" PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch" PATCH[1]="buildfix_kernel_5.13_armhf.patch" -PATCH[2]="disable-acpi-support-in-linux-6.0.patch" -PATCH[3]="buildfix_kernel_6.2.patch" +PATCH[2]="buildfix_kernel_6.2.patch" #PATCH[3]="buildfix_kernel_5.16.patch" # Apply from v4 to v5.12 kernels # v5.13 kernels already disable both by default diff -Nru nvidia-graphics-drivers-390-390.157/debian/templates/dkms_nvidia.conf.in nvidia-graphics-drivers-390-390.157/debian/templates/dkms_nvidia.conf.in --- nvidia-graphics-drivers-390-390.157/debian/templates/dkms_nvidia.conf.in 2023-03-15 15:18:43.000000000 +0000 +++ nvidia-graphics-drivers-390-390.157/debian/templates/dkms_nvidia.conf.in 2023-05-16 13:56:25.000000000 +0000 @@ -26,8 +26,7 @@ AUTOINSTALL="yes" PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch" PATCH[1]="buildfix_kernel_5.13_armhf.patch" -PATCH[2]="disable-acpi-support-in-linux-6.0.patch" -PATCH[3]="buildfix_kernel_6.2.patch" +PATCH[2]="buildfix_kernel_6.2.patch" #PATCH[3]="buildfix_kernel_5.16.patch" # Apply from v4 to v5.12 kernels # v5.13 kernels already disable both by default