Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:wkazubski:G03
x11-video-nvidiaG04
kernel-6.2.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File kernel-6.2.patch of Package x11-video-nvidiaG04
From 5db7eb5a62003bbe04f3f07d089fcf5445b34a29 Mon Sep 17 00:00:00 2001 From: Joan Bruguera <joanbrugueram@gmail.com> Date: Sun, 25 Dec 2022 22:05:14 +0000 Subject: [PATCH] Tentative fix for NVIDIA 470.161.03 driver for Linux 6.2-rc1 --- kernel/nvidia-drm/nvidia-drm-connector.c | 22 ++++++++++++++++++++++ kernel/nvidia-drm/nvidia-drm-drv.c | 4 ++++ kernel/nvidia/nv-acpi.c | 19 ++++++++++++++++--- 3 files changed, 42 insertions(+), 3 deletions(-) diff -u -r -p NVIDIA-Linux-x86_64-390.157/kernel.orig/nvidia/nv-acpi.c NVIDIA-Linux-x86_64-390.157/kernel/nvidia/nv-acpi.c --- NVIDIA-Linux-x86_64-390.157/kernel.orig/nvidia/nv-acpi.c 2023-02-28 21:19:25.867713192 +0000 +++ NVIDIA-Linux-x86_64-390.157/kernel/nvidia/nv-acpi.c 2023-02-28 21:30:41.608762172 +0000 @@ -8,6 +8,7 @@ * _NVRM_COPYRIGHT_END_ */ +#include <linux/version.h> #define __NO_VERSION__ #include "nv-misc.h" @@ -23,7 +24,10 @@ static NV_STATUS nv_acpi_extract_objec 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); @@ -73,7 +77,10 @@ static const struct acpi_driver nv_acpi_ #endif .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, @@ -331,7 +338,10 @@ static int nv_acpi_add(struct acpi_devic return 0; } -#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) @@ -385,7 +395,10 @@ static int nv_acpi_remove_one_arg(struct device->driver_data = NULL; } +// 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 } static void nv_acpi_event(acpi_handle handle, u32 event_type, void *data) diff -u -r -p NVIDIA-Linux-x86_64-390.157/kernel.orig/nvidia-drm/nvidia-drm-connector.c NVIDIA-Linux-x86_64-390.157/kernel/nvidia-drm/nvidia-drm-connector.c --- NVIDIA-Linux-x86_64-390.157/kernel.orig/nvidia-drm/nvidia-drm-connector.c 2023-02-28 21:19:25.859713038 +0000 +++ NVIDIA-Linux-x86_64-390.157/kernel/nvidia-drm/nvidia-drm-connector.c 2023-02-28 21:19:25.879713424 +0000 @@ -20,6 +20,8 @@ * DEALINGS IN THE SOFTWARE. */ +#include <linux/version.h> +#include <drm/drm_edid.h> #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 NvKmsKapi 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 NvKmsKapi 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); + +#endif if (!nvKms->getDynamicDisplayInfo(nv_dev->pDevice, pDetectParams)) { NV_DRM_DEV_LOG_ERR( diff -u -r -p NVIDIA-Linux-x86_64-390.157/kernel.orig/nvidia-drm/nvidia-drm-drv.c NVIDIA-Linux-x86_64-390.157/kernel/nvidia-drm/nvidia-drm-drv.c --- NVIDIA-Linux-x86_64-390.157/kernel.orig/nvidia-drm/nvidia-drm-drv.c 2023-02-28 21:19:25.859713038 +0000 +++ NVIDIA-Linux-x86_64-390.157/kernel/nvidia-drm/nvidia-drm-drv.c 2023-02-28 21:24:12.233243087 +0000 @@ -20,6 +20,7 @@ * DEALINGS IN THE SOFTWARE. */ +#include <linux/version.h> #include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */ #include "nvidia-drm-priv.h" @@ -239,9 +240,12 @@ nv_drm_init_mode_config(struct nv_drm_de 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. */ dev->mode_config.fb_base = 0; +#endif dev->mode_config.async_page_flip = false;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
