mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 05:36:47 +00:00
xf86-video-nvidia: fix build with linux 6.3
This commit is contained in:
Rudi Heitbaum
parent
131dd593ae
commit
e7a31b057b
@ -0,0 +1,145 @@
|
|||||||
|
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 --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
|
||||||
|
index 6fbcd63..a5ab9e9 100644
|
||||||
|
--- a/kernel/nvidia-drm/nvidia-drm-connector.c
|
||||||
|
+++ b/kernel/nvidia-drm/nvidia-drm-connector.c
|
||||||
|
@@ -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 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);
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
if (!nvKms->getDynamicDisplayInfo(nv_dev->pDevice, pDetectParams)) {
|
||||||
|
NV_DRM_DEV_LOG_ERR(
|
||||||
|
diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
|
||||||
|
index 6d007b1..d08ab4c 100644
|
||||||
|
--- a/kernel/nvidia-drm/nvidia-drm-drv.c
|
||||||
|
+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
|
||||||
|
@@ -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"
|
||||||
|
@@ -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. */
|
||||||
|
|
||||||
|
dev->mode_config.fb_base = 0;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#if defined(NV_DRM_CRTC_STATE_HAS_ASYNC_FLIP) || \
|
||||||
|
defined(NV_DRM_CRTC_STATE_HAS_PAGEFLIP_FLAGS)
|
||||||
|
diff --git a/kernel/nvidia/nv-acpi.c b/kernel/nvidia/nv-acpi.c
|
||||||
|
index 07501eb..1fdf71c 100644
|
||||||
|
--- a/kernel/nvidia/nv-acpi.c
|
||||||
|
+++ b/kernel/nvidia/nv-acpi.c
|
||||||
|
@@ -8,6 +8,7 @@
|
||||||
|
* _NVRM_COPYRIGHT_END_
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#include <linux/version.h>
|
||||||
|
#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 !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;
|
||||||
|
}
|
||||||
|
|
||||||
|
+// 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
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
--
|
||||||
|
2.39.0
|
||||||
|
|
||||||
@ -0,0 +1,117 @@
|
|||||||
|
From a77f2da778f4a62695a6c7d26bba674d59ad9170 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Joan Bruguera <joanbrugueram@gmail.com>
|
||||||
|
Date: Sat, 25 Feb 2023 10:57:09 +0000
|
||||||
|
Subject: [PATCH] Tentative fix for NVIDIA 470.161.03 driver for Linux 6.3-rc1
|
||||||
|
|
||||||
|
---
|
||||||
|
kernel/common/inc/nv-linux.h | 13 +++++++++++++
|
||||||
|
kernel/nvidia-drm/nvidia-drm-gem-user-memory.c | 7 ++++---
|
||||||
|
kernel/nvidia-uvm/uvm.c | 2 +-
|
||||||
|
kernel/nvidia/nv-mmap.c | 12 ++++++------
|
||||||
|
4 files changed, 24 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
|
||||||
|
index f8df9e3..5b22cf1 100644
|
||||||
|
--- a/kernel/common/inc/nv-linux.h
|
||||||
|
+++ b/kernel/common/inc/nv-linux.h
|
||||||
|
@@ -1988,4 +1988,17 @@ static inline void nv_mutex_destroy(struct mutex *lock)
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
|
||||||
|
+// Rel. commit "mm: introduce vma->vm_flags wrapper functions" (Suren Baghdasaryan, 26 Jan 2023)
|
||||||
|
+static inline void vm_flags_set(struct vm_area_struct *vma, vm_flags_t flags)
|
||||||
|
+{
|
||||||
|
+ vma->vm_flags |= flags;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static inline void vm_flags_clear(struct vm_area_struct *vma, vm_flags_t flags)
|
||||||
|
+{
|
||||||
|
+ vma->vm_flags &= ~flags;
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#endif /* _NV_LINUX_H_ */
|
||||||
|
diff --git a/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c b/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c
|
||||||
|
index 8824daa..3ea9099 100644
|
||||||
|
--- a/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c
|
||||||
|
+++ b/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c
|
||||||
|
@@ -35,6 +35,7 @@
|
||||||
|
#include "linux/dma-buf.h"
|
||||||
|
#include "linux/mm.h"
|
||||||
|
#include "nv-mm.h"
|
||||||
|
+#include "nv-linux.h"
|
||||||
|
|
||||||
|
static inline
|
||||||
|
void __nv_drm_gem_user_memory_free(struct nv_drm_gem_object *nv_gem)
|
||||||
|
@@ -92,9 +93,9 @@ static int __nv_drm_gem_user_memory_mmap(struct nv_drm_gem_object *nv_gem,
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
- vma->vm_flags &= ~VM_PFNMAP;
|
||||||
|
- vma->vm_flags &= ~VM_IO;
|
||||||
|
- vma->vm_flags |= VM_MIXEDMAP;
|
||||||
|
+ vm_flags_clear(vma, VM_PFNMAP);
|
||||||
|
+ vm_flags_clear(vma, VM_IO);
|
||||||
|
+ vm_flags_set(vma, VM_MIXEDMAP);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
diff --git a/kernel/nvidia-uvm/uvm.c b/kernel/nvidia-uvm/uvm.c
|
||||||
|
index 3e7318d..7eddff7 100644
|
||||||
|
--- a/kernel/nvidia-uvm/uvm.c
|
||||||
|
+++ b/kernel/nvidia-uvm/uvm.c
|
||||||
|
@@ -812,7 +812,7 @@ static int uvm_mmap(struct file *filp, struct vm_area_struct *vma)
|
||||||
|
// Using VM_DONTCOPY would be nice, but madvise(MADV_DOFORK) can reset that
|
||||||
|
// so we have to handle vm_open on fork anyway. We could disable MADV_DOFORK
|
||||||
|
// with VM_IO, but that causes other mapping issues.
|
||||||
|
- vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND;
|
||||||
|
+ vm_flags_set(vma, VM_MIXEDMAP | VM_DONTEXPAND);
|
||||||
|
|
||||||
|
vma->vm_ops = &uvm_vm_ops_managed;
|
||||||
|
|
||||||
|
diff --git a/kernel/nvidia/nv-mmap.c b/kernel/nvidia/nv-mmap.c
|
||||||
|
index df514c9..8f85ff6 100644
|
||||||
|
--- a/kernel/nvidia/nv-mmap.c
|
||||||
|
+++ b/kernel/nvidia/nv-mmap.c
|
||||||
|
@@ -447,7 +447,7 @@ static int nvidia_mmap_numa(
|
||||||
|
}
|
||||||
|
|
||||||
|
// Needed for the linux kernel for mapping compound pages
|
||||||
|
- vma->vm_flags |= VM_MIXEDMAP;
|
||||||
|
+ vm_flags_set(vma, VM_MIXEDMAP);
|
||||||
|
|
||||||
|
for (i = 0, addr = mmap_context->page_array[0]; i < pages;
|
||||||
|
addr = mmap_context->page_array[++i], start += PAGE_SIZE)
|
||||||
|
@@ -596,7 +596,7 @@ int nvidia_mmap_helper(
|
||||||
|
}
|
||||||
|
up(&nvl->mmap_lock);
|
||||||
|
|
||||||
|
- vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND;
|
||||||
|
+ vm_flags_set(vma, VM_IO | VM_PFNMAP | VM_DONTEXPAND);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@@ -663,15 +663,15 @@ int nvidia_mmap_helper(
|
||||||
|
|
||||||
|
NV_PRINT_AT(NV_DBG_MEMINFO, at);
|
||||||
|
|
||||||
|
- vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
|
||||||
|
- vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP);
|
||||||
|
+ vm_flags_set(vma, VM_IO | VM_LOCKED | VM_RESERVED);
|
||||||
|
+ vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((prot & NV_PROTECT_WRITEABLE) == 0)
|
||||||
|
{
|
||||||
|
vma->vm_page_prot = NV_PGPROT_READ_ONLY(vma->vm_page_prot);
|
||||||
|
- vma->vm_flags &= ~VM_WRITE;
|
||||||
|
- vma->vm_flags &= ~VM_MAYWRITE;
|
||||||
|
+ vm_flags_clear(vma, VM_WRITE);
|
||||||
|
+ vm_flags_clear(vma, VM_MAYWRITE);
|
||||||
|
}
|
||||||
|
|
||||||
|
vma->vm_ops = &nv_vm_ops;
|
||||||
|
--
|
||||||
|
2.39.2
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user