mirror of
https://github.com/archlinux/aur.git
synced 2026-03-14 23:16:48 +01:00
Hacky patch for kernel 5.18
This commit is contained in:
Jonathon Fernyhough
parent
2177a6dc01
commit
3ef76a1f7f
3 changed files with 161 additions and 2 deletions
4
.SRCINFO
4
.SRCINFO
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = nvidia-390xx-utils
|
||||
pkgver = 390.151
|
||||
pkgrel = 1
|
||||
pkgrel = 2
|
||||
url = https://www.nvidia.com/
|
||||
arch = x86_64
|
||||
license = custom
|
||||
|
|
@ -9,11 +9,13 @@ pkgbase = nvidia-390xx-utils
|
|||
source = nvidia-390xx-utils.sysusers
|
||||
source = nvidia-390xx.rules
|
||||
source = https://us.download.nvidia.com/XFree86/Linux-x86_64/390.151/NVIDIA-Linux-x86_64-390.151.run
|
||||
source = kernel-5.18.patch
|
||||
source = kernel-4.16.patch
|
||||
b2sums = 8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9
|
||||
b2sums = c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be
|
||||
b2sums = 67e32932eeddda8fef667d25c34faf7b3a02f01cf9c15a97e5613bd44a0e8dcf7396e25399a52701f55dd18054c689720f237bb07d5bd580394d8dc8c9d05534
|
||||
b2sums = 8f78ee00d15ffac9f371e8302541eee8b033670953850dd770c6615eb674fcda2adcea52582284c59a9d7e32943a445d65515b1cacd6f8e5fcbe6c9e94080fb0
|
||||
b2sums = 0e0dac30c695811b522c3327a858939744d085b4ac7b6c5de1ff559037f4b16d52eac11a142011f5aef59a22b10ae70c32fcdd2d87c8dd11431a28e249c38a50
|
||||
b2sums = a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05
|
||||
|
||||
pkgname = nvidia-390xx-utils
|
||||
|
|
|
|||
7
PKGBUILD
7
PKGBUILD
|
|
@ -7,7 +7,7 @@
|
|||
pkgbase=nvidia-390xx-utils
|
||||
pkgname=('nvidia-390xx-utils' 'opencl-nvidia-390xx' 'nvidia-390xx-dkms')
|
||||
pkgver=390.151
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('x86_64')
|
||||
url="https://www.nvidia.com/"
|
||||
license=('custom')
|
||||
|
|
@ -17,11 +17,13 @@ source=('nvidia-drm-outputclass.conf'
|
|||
'nvidia-390xx-utils.sysusers'
|
||||
'nvidia-390xx.rules'
|
||||
"https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
|
||||
kernel-5.18.patch
|
||||
kernel-4.16.patch)
|
||||
b2sums=('8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9'
|
||||
'c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be'
|
||||
'67e32932eeddda8fef667d25c34faf7b3a02f01cf9c15a97e5613bd44a0e8dcf7396e25399a52701f55dd18054c689720f237bb07d5bd580394d8dc8c9d05534'
|
||||
'8f78ee00d15ffac9f371e8302541eee8b033670953850dd770c6615eb674fcda2adcea52582284c59a9d7e32943a445d65515b1cacd6f8e5fcbe6c9e94080fb0'
|
||||
'0e0dac30c695811b522c3327a858939744d085b4ac7b6c5de1ff559037f4b16d52eac11a142011f5aef59a22b10ae70c32fcdd2d87c8dd11431a28e249c38a50'
|
||||
'a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05')
|
||||
|
||||
create_links() {
|
||||
|
|
@ -45,6 +47,9 @@ prepare() {
|
|||
# From loqs via https://bugs.archlinux.org/task/58074
|
||||
patch -Np1 -i ../kernel-4.16.patch
|
||||
|
||||
# Restore pci-dma-compat.h removed in kernel 5.18
|
||||
patch -Np1 -i ../kernel-5.18.patch
|
||||
|
||||
cd kernel
|
||||
sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
|
||||
sed -i 's/__JOBS/`nproc`/' dkms.conf
|
||||
|
|
|
|||
152
kernel-5.18.patch
Normal file
152
kernel-5.18.patch
Normal file
|
|
@ -0,0 +1,152 @@
|
|||
diff --git a/common/inc/nv.h b/common/inc/nv.h
|
||||
index def0551..f7db7ed 100644
|
||||
--- a/common/inc/nv.h
|
||||
+++ b/common/inc/nv.h
|
||||
@@ -12,6 +12,11 @@
|
||||
#ifndef _NV_H_
|
||||
#define _NV_H_
|
||||
|
||||
+#include <linux/version.h>
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0))
|
||||
+#include <pci-dma-compat.h>
|
||||
+#endif
|
||||
+
|
||||
#include <nvlimits.h>
|
||||
#include <nvtypes.h>
|
||||
#include <nvCpuUuid.h>
|
||||
diff --git a/common/inc/pci-dma-compat.h b/common/inc/pci-dma-compat.h
|
||||
new file mode 100644
|
||||
index 0000000..4e94d4e
|
||||
--- /dev/null
|
||||
+++ b/common/inc/pci-dma-compat.h
|
||||
@@ -0,0 +1,130 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/* include this file if the platform implements the dma_ DMA Mapping API
|
||||
+ * and wants to provide the pci_ DMA Mapping API in terms of it */
|
||||
+
|
||||
+#ifndef _ASM_GENERIC_PCI_DMA_COMPAT_H
|
||||
+#define _ASM_GENERIC_PCI_DMA_COMPAT_H
|
||||
+
|
||||
+#include <linux/dma-mapping.h>
|
||||
+#include <linux/pci.h>
|
||||
+
|
||||
+/* This defines the direction arg to the DMA mapping routines. */
|
||||
+#define PCI_DMA_BIDIRECTIONAL DMA_BIDIRECTIONAL
|
||||
+#define PCI_DMA_TODEVICE DMA_TO_DEVICE
|
||||
+#define PCI_DMA_FROMDEVICE DMA_FROM_DEVICE
|
||||
+#define PCI_DMA_NONE DMA_NONE
|
||||
+
|
||||
+static inline void *
|
||||
+pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
|
||||
+ dma_addr_t *dma_handle)
|
||||
+{
|
||||
+ return dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC);
|
||||
+}
|
||||
+
|
||||
+static inline void *
|
||||
+pci_zalloc_consistent(struct pci_dev *hwdev, size_t size,
|
||||
+ dma_addr_t *dma_handle)
|
||||
+{
|
||||
+ return dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC);
|
||||
+}
|
||||
+
|
||||
+static inline void
|
||||
+pci_free_consistent(struct pci_dev *hwdev, size_t size,
|
||||
+ void *vaddr, dma_addr_t dma_handle)
|
||||
+{
|
||||
+ dma_free_coherent(&hwdev->dev, size, vaddr, dma_handle);
|
||||
+}
|
||||
+
|
||||
+static inline dma_addr_t
|
||||
+pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, int direction)
|
||||
+{
|
||||
+ return dma_map_single(&hwdev->dev, ptr, size, (enum dma_data_direction)direction);
|
||||
+}
|
||||
+
|
||||
+static inline void
|
||||
+pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr,
|
||||
+ size_t size, int direction)
|
||||
+{
|
||||
+ dma_unmap_single(&hwdev->dev, dma_addr, size, (enum dma_data_direction)direction);
|
||||
+}
|
||||
+
|
||||
+static inline dma_addr_t
|
||||
+pci_map_page(struct pci_dev *hwdev, struct page *page,
|
||||
+ unsigned long offset, size_t size, int direction)
|
||||
+{
|
||||
+ return dma_map_page(&hwdev->dev, page, offset, size, (enum dma_data_direction)direction);
|
||||
+}
|
||||
+
|
||||
+static inline void
|
||||
+pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address,
|
||||
+ size_t size, int direction)
|
||||
+{
|
||||
+ dma_unmap_page(&hwdev->dev, dma_address, size, (enum dma_data_direction)direction);
|
||||
+}
|
||||
+
|
||||
+static inline int
|
||||
+pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,
|
||||
+ int nents, int direction)
|
||||
+{
|
||||
+ return dma_map_sg(&hwdev->dev, sg, nents, (enum dma_data_direction)direction);
|
||||
+}
|
||||
+
|
||||
+static inline void
|
||||
+pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg,
|
||||
+ int nents, int direction)
|
||||
+{
|
||||
+ dma_unmap_sg(&hwdev->dev, sg, nents, (enum dma_data_direction)direction);
|
||||
+}
|
||||
+
|
||||
+static inline void
|
||||
+pci_dma_sync_single_for_cpu(struct pci_dev *hwdev, dma_addr_t dma_handle,
|
||||
+ size_t size, int direction)
|
||||
+{
|
||||
+ dma_sync_single_for_cpu(&hwdev->dev, dma_handle, size, (enum dma_data_direction)direction);
|
||||
+}
|
||||
+
|
||||
+static inline void
|
||||
+pci_dma_sync_single_for_device(struct pci_dev *hwdev, dma_addr_t dma_handle,
|
||||
+ size_t size, int direction)
|
||||
+{
|
||||
+ dma_sync_single_for_device(&hwdev->dev, dma_handle, size, (enum dma_data_direction)direction);
|
||||
+}
|
||||
+
|
||||
+static inline void
|
||||
+pci_dma_sync_sg_for_cpu(struct pci_dev *hwdev, struct scatterlist *sg,
|
||||
+ int nelems, int direction)
|
||||
+{
|
||||
+ dma_sync_sg_for_cpu(&hwdev->dev, sg, nelems, (enum dma_data_direction)direction);
|
||||
+}
|
||||
+
|
||||
+static inline void
|
||||
+pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist *sg,
|
||||
+ int nelems, int direction)
|
||||
+{
|
||||
+ dma_sync_sg_for_device(&hwdev->dev, sg, nelems, (enum dma_data_direction)direction);
|
||||
+}
|
||||
+
|
||||
+static inline int
|
||||
+pci_dma_mapping_error(struct pci_dev *pdev, dma_addr_t dma_addr)
|
||||
+{
|
||||
+ return dma_mapping_error(&pdev->dev, dma_addr);
|
||||
+}
|
||||
+
|
||||
+#ifdef CONFIG_PCI
|
||||
+static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
|
||||
+{
|
||||
+ return dma_set_mask(&dev->dev, mask);
|
||||
+}
|
||||
+
|
||||
+static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
|
||||
+{
|
||||
+ return dma_set_coherent_mask(&dev->dev, mask);
|
||||
+}
|
||||
+#else
|
||||
+static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
|
||||
+{ return -EIO; }
|
||||
+static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
|
||||
+{ return -EIO; }
|
||||
+#endif
|
||||
+
|
||||
+#endif
|
||||
Loading…
Add table
Reference in a new issue