Add 6.2-rc support (#138)

pull/139/head
timocapa 1 year ago committed by GitHub
parent 38caa4222f
commit 2dffc6fb18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -281,7 +281,7 @@ fi
pkgname=("${_pkgname_array[@]}")
pkgver=$_driver_version
pkgrel=232
pkgrel=233
arch=('x86_64')
url="http://www.nvidia.com/"
license=('custom:NVIDIA')
@ -345,6 +345,7 @@ source=($_source_name
'kernel-5.17.patch' # 5.17 workaround
'kernel-6.0.patch'
'kernel-6.0-470.patch' # acpi backports from 515.x for 470.x
'kernel-6.2.patch'
)
msg2 "Selected driver integrity check behavior (md5sum or SKIP): $_md5sum" # If the driver is "known", return md5sum. If it isn't, return SKIP
@ -387,7 +388,8 @@ md5sums=("$_md5sum"
'0f987607c98eb6faeb7d691213de6a70'
'a70bc9cbbc7e8563b48985864a11de71'
'31128900574dec9ebdb753db50ef4f16'
'0b9b855d9be313153a5903e46e774a30')
'0b9b855d9be313153a5903e46e774a30'
'f3c1e3ffc7c3fe5048d9844af41776c9')
if [ "$_open_source_modules" = "true" ]; then
source+=("$pkgname-$pkgver.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${pkgver}.tar.gz")
@ -781,6 +783,12 @@ DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
_whitelist60=( 515.6* 470.4* 470.5* 470.6* 470.7* 470.8* 470.9* 470.10* 470.12* 470.14* )
fi
# 6.2
if (( $(vercmp "$_kernel" "6.2") >= 0 )); then
_kernel62="1"
_whitelist62=( 525.* )
fi
# Loop patches (linux-4.15.patch, lol.patch, ...)
for _p in $(printf -- '%s\n' ${source[@]} | grep .patch); do # https://stackoverflow.com/a/21058239/1821548
# Patch version (4.15, "", ...)
@ -1198,6 +1206,20 @@ DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
fi
fi
# 6.2
if [ "$_kernel62" = "1" ]; then
patchy=0
for yup in "${_whitelist62[@]}"; do
[[ $pkgver = $yup ]] && patchy=1
done
if [ "$patchy" = "1" ]; then
msg2 "Applying kernel-6.2.patch for dkms..."
patch -Np1 -i "$srcdir"/kernel-6.2.patch
else
msg2 "Skipping kernel-6.2.patch as it doesn't apply to this driver version..."
fi
fi
# Legacy quirks
if [ "$_oldstuff" = "1" ]; then
msg2 "Applying 01-ipmi-vm.diff for dkms..."

@ -0,0 +1,28 @@
diff --git a/nvidia-drm/nvidia-drm-connector.c b/nvidia-drm/nvidia-drm-connector.c
index 77a6120..b05dc78 100644
--- a/kernel-dkms/nvidia-drm/nvidia-drm-connector.c
+++ b/kernel-dkms/nvidia-drm/nvidia-drm-connector.c
@@ -98,7 +98,7 @@ __nv_drm_detect_encoder(struct NvKmsKapiDynamicDisplayParams *pDetectParams,
break;
}
- if (connector->override_edid) {
+ if (connector->edid_override) {
const struct drm_property_blob *edid = connector->edid_blob_ptr;
if (edid->length <= sizeof(pDetectParams->edid.buffer)) {
diff --git a/nvidia-drm/nvidia-drm-drv.c b/nvidia-drm/nvidia-drm-drv.c
index ac504ec..cc6626a 100644
--- a/kernel-dkms/nvidia-drm/nvidia-drm-drv.c
+++ b/kernel-dkms/nvidia-drm/nvidia-drm-drv.c
@@ -257,10 +257,6 @@ nv_drm_init_mode_config(struct nv_drm_device *nv_dev,
dev->mode_config.preferred_depth = 24;
dev->mode_config.prefer_shadow = 1;
- /* Currently unused. Update when needed. */
-
- dev->mode_config.fb_base = 0;
-
#if defined(NV_DRM_CRTC_STATE_HAS_ASYNC_FLIP) || \
defined(NV_DRM_CRTC_STATE_HAS_PAGEFLIP_FLAGS)
dev->mode_config.async_page_flip = true;
Loading…
Cancel
Save