144 nvidia-470xx/linux-6.2.patch
View file
@@ -0,0 +1,144 @@
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

---
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 <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/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 <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/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 <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
6 nvidia-470xx/nvidia.install
View file
@@ -7,18 +7,18 @@ timestamp=$( date +%F-%T )
# arg 2: the old package version

post_install() {
EXTRAMODULES='extramodules-6.1'
EXTRAMODULES='extramodules-6.2'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
}

post_upgrade() {
EXTRAMODULES='extramodules-6.1'
EXTRAMODULES='extramodules-6.2'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}

post_remove() {
EXTRAMODULES='extramodules-6.1'
EXTRAMODULES='extramodules-6.2'
depmod $(cat /lib/modules/$EXTRAMODULES/version)

}
8 nvidia/PKGBUILD
View file
@@ -1,14 +1,14 @@

_extramodules=extramodules-6.1
_extramodules=extramodules-6.2
_kver=$(cat /lib/modules/${_extramodules}/version)

pkgname=('nvidia' 'khd-nvidia')
pkgver=530.41.03
pkgrel=1
pkgrel=2
epoch=1
arch=('x86_64')
url="https://www.nvidia.com/page/home.html"
makedepends=('linux-headers' 'linux>=6.1.9' 'linux<6.2' "nvidia-utils=1:${pkgver}")
makedepends=('linux-headers' 'linux>=6.2.10' 'linux<6.3' "nvidia-utils=1:${pkgver}")
options=('!strip')
license=('custom')

@@ -37,7 +37,7 @@ build() {

package_nvidia() {
pkgdesc="NVIDIA drivers for linux."
depends=('linux>=6.1.9' 'linux<6.2' "nvidia-utils=1:${pkgver}")
depends=('linux>=6.2.10' 'linux<6.3' "nvidia-utils=1:${pkgver}")
conflicts=('nvidia-470xx' 'nvidia-390xx' 'nvidia-bumblebee')
provides=('nvidia-bumblebee')
replaces=('nvidia-bumblebee')
6 nvidia/nvidia.install
View file
@@ -7,13 +7,13 @@ timestamp=$( date +%F-%T )
# arg 2: the old package version

post_install() {
EXTRAMODULES='extramodules-6.1'
EXTRAMODULES='extramodules-6.2'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
}

post_upgrade() {
EXTRAMODULES='extramodules-6.1'
EXTRAMODULES='extramodules-6.2'
depmod $(cat /lib/modules/$EXTRAMODULES/version)

if [[ $(vercmp ${2} 1:495.44-1) -eq -1 ]]; then
@@ -53,7 +53,7 @@ post_upgrade() {
}

post_remove() {
EXTRAMODULES='extramodules-6.1'
EXTRAMODULES='extramodules-6.2'
depmod $(cat /lib/modules/$EXTRAMODULES/version)

}
6 pipewire/PKGBUILD
View file
@@ -1,7 +1,7 @@

pkgname=pipewire
pkgver=0.3.67
pkgrel=2
pkgver=0.3.68
pkgrel=1
pkgdesc="Project that aims to greatly improve handling of audio and video under Linux"
url="https://pipewire.org"
arch=("x86_64")
@@ -13,7 +13,7 @@ makedepends=('meson' 'ninja' 'vulkan-headers' 'wireplumber')
install=pipewire.install
source=("https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
"https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/9af94508886b19bb398f4e2a777447ca42907c2f.diff")
md5sums=('2c9807b2878418be900a220aa4ff6974'
md5sums=('e0572cb5ff19411fb51c88b9b156acca'
'b470ddcf6491c23f69ca6ae2603db071')

prepare() {
8 rtl8192eu/PKGBUILD
View file
@@ -1,17 +1,17 @@

_extramodules=extramodules-6.1
_extramodules=extramodules-6.2
_kver=$(cat /lib/modules/${_extramodules}/version)

pkgname=rtl8192eu
_pkgname=rtl8192eu-linux-driver
pkgver=4.4.1.11
_commit=a4a3f5291292969e36d7174482166e75f18f433a
pkgrel=3
pkgrel=4
pkgdesc="Drivers for the rtl8192eu chipset for wireless adapters (D-Link DWA-131 rev E1 included)"
arch=('x86_64')
url="https://github.com/Mange/rtl8192eu-linux-driver"
license=('GPL')
depends=('linux>=6.1.9' 'linux<6.2')
depends=('linux>=6.2.10' 'linux<6.3')
makedepends=('linux-headers' 'elfutils')
install=rtl8192eu.install
options=('!strip')
@@ -24,7 +24,7 @@ md5sums=('d90ddf95e4af573f66158f53ba44000e'
build() {
cd ${_pkgname}-${_commit}

sed -i -e 's|$(shell uname -r)|6.1.11-1|' Makefile
sed -i -e 's|$(shell uname -r)|6.2.10-1|' Makefile
#patch -p1 -i ${srcdir}/56124022d6604b199c8f24f9d14a3c64386b6a5b.diff

make
6 rtl8192eu/rtl8192eu.install
View file
@@ -1,16 +1,16 @@
post_install() {
EXTRAMODULES='extramodules-6.1'
EXTRAMODULES='extramodules-6.2'
depmod -a $(cat /lib/modules/$EXTRAMODULES/version)
echo 'In order to use the rtl8192 module, reboot the system.'
}

post_upgrade() {
EXTRAMODULES='extramodules-6.1'
EXTRAMODULES='extramodules-6.2'
depmod -a $(cat /lib/modules/$EXTRAMODULES/version)
}

post_remove() {
EXTRAMODULES='extramodules-6.1'
EXTRAMODULES='extramodules-6.2'
depmod -a $(cat /lib/modules/$EXTRAMODULES/version)

}
8 rtl88x2bu/PKGBUILD
View file
@@ -1,17 +1,17 @@

_extramodules=extramodules-6.1
_extramodules=extramodules-6.2
_kver=$(cat /lib/modules/${_extramodules}/version)

pkgname=rtl88x2bu
_pkgname=RTL88x2BU-Linux-Driver
pkgver=2022.12.13
_commit=a2ac3b220db7ac38fb85d5f24730429ec2e68910
pkgrel=3
pkgrel=4
pkgdesc="RealTek 88x2bu wifi driver."
arch=('x86_64')
url="https://github.com/RinCat/RTL88x2BU-Linux-Driver"
license=('GPL-2.0')
depends=('linux>=6.1.9' 'linux<6.2' 'bc')
depends=('linux>=6.2.10' 'linux<6.3' 'bc')
makedepends=('linux-headers' 'elfutils')
install=rtl88x2bu.install
options=('!strip')
@@ -21,7 +21,7 @@ md5sums=('dbf738ccd4e427f4b9a1aa71b30756a0')
build() {
cd ${_pkgname}-${_commit}

sed -i -e 's|$(shell uname -r)|6.1.11-1|' Makefile
sed -i -e 's|$(shell uname -r)|6.2.10-1|' Makefile
#patch -p1 -i ${srcdir}/80a0cb2c1aa10e52bc653e7455a6f1b64fdccd09.diff

make
6 rtl88x2bu/rtl88x2bu.install
View file
@@ -1,16 +1,16 @@
post_install() {
EXTRAMODULES='extramodules-6.1'
EXTRAMODULES='extramodules-6.2'
depmod -a $(cat /lib/modules/$EXTRAMODULES/version)
echo 'In order to use the rtl88x2bu module, reboot the system.'
}

post_upgrade() {
EXTRAMODULES='extramodules-6.1'
EXTRAMODULES='extramodules-6.2'
depmod -a $(cat /lib/modules/$EXTRAMODULES/version)
}

post_remove() {
EXTRAMODULES='extramodules-6.1'
EXTRAMODULES='extramodules-6.2'
depmod -a $(cat /lib/modules/$EXTRAMODULES/version)

}
4 tomoyo-tools/PKGBUILD
View file
@@ -4,12 +4,12 @@ _basever=2.6.1
_timestamp=20210910
_file=70710
pkgver=${_basever}.${_timestamp}
pkgrel=10
pkgrel=11
pkgdesc='TOMOYO Linux 2.5.x userspace tools for Linux kernel 3.2 and above'
arch=('x86_64')
url='http://tomoyo.osdn.jp/'
license=('GPL')
depends=('ncurses' 'linux>=6.1.9')
depends=('ncurses' 'linux>=6.2.10')
makedepends=('help2man')
install=tomoyo-tools.install
source=("https://jaist.dl.osdn.jp/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz")
6 tp_smapi/PKGBUILD
View file
@@ -1,13 +1,13 @@

pkgname=tp_smapi
pkgver=0.43
pkgrel=87
pkgrel=88
_extramodules=/lib/modules/extramodules-6.1
pkgdesc="Modules for ThinkPad's SMAPI functionality"
arch=('x86_64')
url='https://github.com/evgeni/tp_smapi'
license=('GPL')
depends=('linux>=6.1.9' 'linux<6.2')
depends=('linux>=6.2.10' 'linux<6.3')
makedepends=('linux-headers' 'elfutils')
install="${pkgname}.install"
source=("https://github.com/evgeni/tp_smapi/releases/download/tp-smapi%2F${pkgver}/${pkgname}-${pkgver}.tgz"
@@ -21,7 +21,7 @@ build() {

_kernver=$(< "${_extramodules}/version")

sed -i -e 's|$(shell uname -r)|6.1.11-1|' Makefile
sed -i -e 's|$(shell uname -r)|6.2.10-1|' Makefile

make HDAPS=1
}