From 3ff0ac1fb831bd31366bf30c843afbb0a3c86c0d Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 27 Sep 2024 11:26:46 +0200 Subject: [PATCH] nvidia: Refactor Signed-off-by: Peter Jung --- linux-cachyos-bmq/PKGBUILD | 27 +++++++++++--------- linux-cachyos-bore/PKGBUILD | 36 ++++++++++++++------------ linux-cachyos-deckify/PKGBUILD | 43 ++++++++++++++++++-------------- linux-cachyos-eevdf/PKGBUILD | 36 ++++++++++++++------------ linux-cachyos-hardened/PKGBUILD | 33 ++++++++++++++++-------- linux-cachyos-lts/PKGBUILD | 33 ++++++++++++++++-------- linux-cachyos-rc/PKGBUILD | 36 ++++++++++++++------------ linux-cachyos-rt-bore/PKGBUILD | 36 ++++++++++++++------------ linux-cachyos-sched-ext/PKGBUILD | 36 ++++++++++++++------------ linux-cachyos-server/PKGBUILD | 36 ++++++++++++++------------ linux-cachyos/PKGBUILD | 36 ++++++++++++++------------ 11 files changed, 223 insertions(+), 165 deletions(-) diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD index 8ea07550..ca146d5e 100644 --- a/linux-cachyos-bmq/PKGBUILD +++ b/linux-cachyos-bmq/PKGBUILD @@ -216,8 +216,8 @@ fi # NVIDIA pre-build module support if [ -n "$_build_nvidia" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then @@ -271,10 +271,11 @@ prepare() { src="${src%%::*}" src="${src##*/}" src="${src%.zst}" - [[ $src = make-modeset-fbdev-default.patch ]] && continue - [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = fix-zen5.patch ]] && continue - [[ $src = 6.11-fbdev.patch ]] && continue + [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue + [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue + [[ $src = 0003-Add-IBT-Support.patch ]] && continue + [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue + [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -518,19 +519,21 @@ prepare() { sh "${_nv_pkg}.run" --extract-only # Use fbdev and modeset as default - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" # Fix broken fbdev on 6.11 - patch -Np2 -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np2 -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix broken fbdev on 6.11 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix for 6.12 Module Compilation + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-6.12-drm_outpull_pill-changed-check.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD index c40ad3e6..278374c8 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -216,16 +216,17 @@ fi # NVIDIA pre-build module support if [ -n "$_build_nvidia" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch" + "${_patchsource}/misc/nvidia/0005-6.12-drm_outpull_pill-changed-check.patch") fi ## List of CachyOS schedulers @@ -271,10 +272,11 @@ prepare() { src="${src%%::*}" src="${src##*/}" src="${src%.zst}" - [[ $src = make-modeset-fbdev-default.patch ]] && continue - [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = fix-zen5.patch ]] && continue - [[ $src = 6.11-fbdev.patch ]] && continue + [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue + [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue + [[ $src = 0003-Add-IBT-Support.patch ]] && continue + [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue + [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -518,19 +520,21 @@ prepare() { sh "${_nv_pkg}.run" --extract-only # Use fbdev and modeset as default - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" # Fix broken fbdev on 6.11 - patch -Np2 -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np2 -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix broken fbdev on 6.11 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix for 6.12 Module Compilation + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-6.12-drm_outpull_pill-changed-check.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD index 1a5a63ae..14562d07 100644 --- a/linux-cachyos-deckify/PKGBUILD +++ b/linux-cachyos-deckify/PKGBUILD @@ -12,6 +12,7 @@ _cachy_config=${_cachy_config-y} ### Selecting the CPU scheduler # ATTENTION - only one of the following values can be selected: # 'bore' - select 'Burst-Oriented Response Enhancer' +# 'bmq' - select 'BMQ Scheduler' # 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler # 'cachyos' - select 'Sched-Ext Scheduler Framework Variant Scheduler with BORE Scheduler' # 'eevdf' - select 'EEVDF Scheduler' @@ -219,16 +220,17 @@ fi # NVIDIA pre-build module support if [ -n "$_build_nvidia" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch" + "${_patchsource}/misc/nvidia/0005-6.12-drm_outpull_pill-changed-check.patch") fi ## List of CachyOS schedulers @@ -238,8 +240,8 @@ case "$_cpusched" in "${_patchsource}/sched/0001-bore-cachy-ext.patch");; bore) ## BORE Scheduler source+=("${_patchsource}/sched/0001-bore-cachy.patch");; - echo) ## ECHO Scheduler - source+=("${_patchsource}/sched/0001-echo-cachy.patch");; + bmq) ## Project C Scheduler + source+=("${_patchsource}/sched/0001-prjc-cachy.patch");; eevdf) ## 6.12 EEVDF patches source+=("${_patchsource}/sched/0001-eevdf-next.patch");; rt) ## EEVDF with RT patches @@ -274,10 +276,11 @@ prepare() { src="${src%%::*}" src="${src##*/}" src="${src%.zst}" - [[ $src = make-modeset-fbdev-default.patch ]] && continue - [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = fix-zen5.patch ]] && continue - [[ $src = 6.11-fbdev.patch ]] && continue + [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue + [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue + [[ $src = 0003-Add-IBT-Support.patch ]] && continue + [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue + [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -318,7 +321,7 @@ prepare() { case "$_cpusched" in cachyos) scripts/config -e SCHED_CLASS_EXT -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000;; bore|hardened) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000;; - echo) scripts/config -e ECHO_SCHED;; + bmq) scripts/config -e SCHED_ALT -e SCHED_BMQ;; eevdf) ;; rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; rt-bore) scripts/config -e SCHED_BORE --set-val MIN_BASE_SLICE_NS 1000000 -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -d PREEMPT_RT -d PREEMPT_DYNAMIC -e PREEMPT_BUILD -e PREEMPT_BUILD_AUTO -e PREEMPT_AUTO;; @@ -521,19 +524,21 @@ prepare() { sh "${_nv_pkg}.run" --extract-only # Use fbdev and modeset as default - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" # Fix broken fbdev on 6.11 - patch -Np2 -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np2 -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix broken fbdev on 6.11 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix for 6.12 Module Compilation + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-6.12-drm_outpull_pill-changed-check.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD index 976cefb1..2b0769f6 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -216,16 +216,17 @@ fi # NVIDIA pre-build module support if [ -n "$_build_nvidia" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch" + "${_patchsource}/misc/nvidia/0005-6.12-drm_outpull_pill-changed-check.patch") fi ## List of CachyOS schedulers @@ -271,10 +272,11 @@ prepare() { src="${src%%::*}" src="${src##*/}" src="${src%.zst}" - [[ $src = make-modeset-fbdev-default.patch ]] && continue - [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = fix-zen5.patch ]] && continue - [[ $src = 6.11-fbdev.patch ]] && continue + [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue + [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue + [[ $src = 0003-Add-IBT-Support.patch ]] && continue + [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue + [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -518,19 +520,21 @@ prepare() { sh "${_nv_pkg}.run" --extract-only # Use fbdev and modeset as default - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" # Fix broken fbdev on 6.11 - patch -Np2 -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np2 -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix broken fbdev on 6.11 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix for 6.12 Module Compilation + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-6.12-drm_outpull_pill-changed-check.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD index fbcf1d82..38184492 100644 --- a/linux-cachyos-hardened/PKGBUILD +++ b/linux-cachyos-hardened/PKGBUILD @@ -216,14 +216,17 @@ fi # NVIDIA pre-build module support if [ -n "$_build_nvidia" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch" + "${_patchsource}/misc/nvidia/0005-6.12-drm_outpull_pill-changed-check.patch") fi ## List of CachyOS schedulers @@ -267,9 +270,11 @@ prepare() { src="${src%%::*}" src="${src##*/}" src="${src%.zst}" - [[ $src = make-modeset-fbdev-default.patch ]] && continue - [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = fix-zen5.patch ]] && continue + [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue + [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue + [[ $src = 0003-Add-IBT-Support.patch ]] && continue + [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue + [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -514,15 +519,21 @@ prepare() { sh "${_nv_pkg}.run" --extract-only # Use fbdev and modeset as default - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" + # Fix broken fbdev on 6.11 + patch -Np2 -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix broken fbdev on 6.11 + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix for 6.12 Module Compilation + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-6.12-drm_outpull_pill-changed-check.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD index d6a6c27f..b83d562f 100644 --- a/linux-cachyos-lts/PKGBUILD +++ b/linux-cachyos-lts/PKGBUILD @@ -239,14 +239,17 @@ fi # NVIDIA pre-build module support if [ -n "$_build_nvidia" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch" + "${_patchsource}/misc/nvidia/0005-6.12-drm_outpull_pill-changed-check.patch") fi ## List of CachyOS schedulers @@ -294,9 +297,11 @@ prepare() { src="${src%%::*}" src="${src##*/}" src="${src%.zst}" - [[ $src = make-modeset-fbdev-default.patch ]] && continue - [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = fix-zen5.patch ]] && continue + [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue + [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue + [[ $src = 0003-Add-IBT-Support.patch ]] && continue + [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue + [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -597,15 +602,21 @@ prepare() { sh "${_nv_pkg}.run" --extract-only # Use fbdev and modeset as default - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" + # Fix broken fbdev on 6.11 + patch -Np2 -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix broken fbdev on 6.11 + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix for 6.12 Module Compilation + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-6.12-drm_outpull_pill-changed-check.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD index 7df85920..f917395c 100644 --- a/linux-cachyos-rc/PKGBUILD +++ b/linux-cachyos-rc/PKGBUILD @@ -216,16 +216,17 @@ fi # NVIDIA pre-build module support if [ -n "$_build_nvidia" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch" + "${_patchsource}/misc/nvidia/0005-6.12-drm_outpull_pill-changed-check.patch") fi ## List of CachyOS schedulers @@ -271,10 +272,11 @@ prepare() { src="${src%%::*}" src="${src##*/}" src="${src%.zst}" - [[ $src = make-modeset-fbdev-default.patch ]] && continue - [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = fix-zen5.patch ]] && continue - [[ $src = 6.11-fbdev.patch ]] && continue + [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue + [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue + [[ $src = 0003-Add-IBT-Support.patch ]] && continue + [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue + [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -518,19 +520,21 @@ prepare() { sh "${_nv_pkg}.run" --extract-only # Use fbdev and modeset as default - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" # Fix broken fbdev on 6.11 - patch -Np2 -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np2 -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix broken fbdev on 6.11 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix for 6.12 Module Compilation + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-6.12-drm_outpull_pill-changed-check.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index 2fdb5ff5..ec4959ac 100644 --- a/linux-cachyos-rt-bore/PKGBUILD +++ b/linux-cachyos-rt-bore/PKGBUILD @@ -216,16 +216,17 @@ fi # NVIDIA pre-build module support if [ -n "$_build_nvidia" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch" + "${_patchsource}/misc/nvidia/0005-6.12-drm_outpull_pill-changed-check.patch") fi ## List of CachyOS schedulers @@ -271,10 +272,11 @@ prepare() { src="${src%%::*}" src="${src##*/}" src="${src%.zst}" - [[ $src = make-modeset-fbdev-default.patch ]] && continue - [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = fix-zen5.patch ]] && continue - [[ $src = 6.11-fbdev.patch ]] && continue + [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue + [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue + [[ $src = 0003-Add-IBT-Support.patch ]] && continue + [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue + [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -518,19 +520,21 @@ prepare() { sh "${_nv_pkg}.run" --extract-only # Use fbdev and modeset as default - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" # Fix broken fbdev on 6.11 - patch -Np2 -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np2 -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix broken fbdev on 6.11 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix for 6.12 Module Compilation + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-6.12-drm_outpull_pill-changed-check.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD index 43262539..b9c39b6d 100644 --- a/linux-cachyos-sched-ext/PKGBUILD +++ b/linux-cachyos-sched-ext/PKGBUILD @@ -216,16 +216,17 @@ fi # NVIDIA pre-build module support if [ -n "$_build_nvidia" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch" + "${_patchsource}/misc/nvidia/0005-6.12-drm_outpull_pill-changed-check.patch") fi ## List of CachyOS schedulers @@ -271,10 +272,11 @@ prepare() { src="${src%%::*}" src="${src##*/}" src="${src%.zst}" - [[ $src = make-modeset-fbdev-default.patch ]] && continue - [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = fix-zen5.patch ]] && continue - [[ $src = 6.11-fbdev.patch ]] && continue + [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue + [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue + [[ $src = 0003-Add-IBT-Support.patch ]] && continue + [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue + [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -518,19 +520,21 @@ prepare() { sh "${_nv_pkg}.run" --extract-only # Use fbdev and modeset as default - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" # Fix broken fbdev on 6.11 - patch -Np2 -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np2 -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix broken fbdev on 6.11 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix for 6.12 Module Compilation + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-6.12-drm_outpull_pill-changed-check.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD index 5d13cee1..3af4d4ab 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -216,16 +216,17 @@ fi # NVIDIA pre-build module support if [ -n "$_build_nvidia" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch" + "${_patchsource}/misc/nvidia/0005-6.12-drm_outpull_pill-changed-check.patch") fi ## List of CachyOS schedulers @@ -271,10 +272,11 @@ prepare() { src="${src%%::*}" src="${src##*/}" src="${src%.zst}" - [[ $src = make-modeset-fbdev-default.patch ]] && continue - [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = fix-zen5.patch ]] && continue - [[ $src = 6.11-fbdev.patch ]] && continue + [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue + [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue + [[ $src = 0003-Add-IBT-Support.patch ]] && continue + [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue + [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -518,19 +520,21 @@ prepare() { sh "${_nv_pkg}.run" --extract-only # Use fbdev and modeset as default - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" # Fix broken fbdev on 6.11 - patch -Np2 -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np2 -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix broken fbdev on 6.11 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix for 6.12 Module Compilation + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-6.12-drm_outpull_pill-changed-check.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index 5eca7558..d739cc49 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -216,16 +216,17 @@ fi # NVIDIA pre-build module support if [ -n "$_build_nvidia" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch" + "${_patchsource}/misc/nvidia/0005-6.12-drm_outpull_pill-changed-check.patch") fi ## List of CachyOS schedulers @@ -271,10 +272,11 @@ prepare() { src="${src%%::*}" src="${src##*/}" src="${src%.zst}" - [[ $src = make-modeset-fbdev-default.patch ]] && continue - [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = fix-zen5.patch ]] && continue - [[ $src = 6.11-fbdev.patch ]] && continue + [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue + [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue + [[ $src = 0003-Add-IBT-Support.patch ]] && continue + [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue + [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -518,19 +520,21 @@ prepare() { sh "${_nv_pkg}.run" --extract-only # Use fbdev and modeset as default - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" # Fix broken fbdev on 6.11 - patch -Np2 -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np2 -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix broken fbdev on 6.11 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix for 6.12 Module Compilation + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-6.12-drm_outpull_pill-changed-check.patch" -d "${srcdir}/${_nv_open_pkg}" fi }