diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD index 30eff2ee..03e4e72e 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -217,7 +217,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/make-modeset-fbdev-default.patch" + "${_patchsource}/misc/nvidia/6.11-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then @@ -531,6 +532,8 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.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" fi if [ -n "$_build_nvidia_open" ]; then diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD index f07f63ed..222b5de0 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -217,7 +217,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/make-modeset-fbdev-default.patch" + "${_patchsource}/misc/nvidia/6.11-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then @@ -531,6 +532,8 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.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" fi if [ -n "$_build_nvidia_open" ]; then diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index eaba26c8..ec5cc3b3 100644 --- a/linux-cachyos-rt-bore/PKGBUILD +++ b/linux-cachyos-rt-bore/PKGBUILD @@ -217,7 +217,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/make-modeset-fbdev-default.patch" + "${_patchsource}/misc/nvidia/6.11-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then @@ -531,6 +532,8 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.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" fi if [ -n "$_build_nvidia_open" ]; then diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD index 96709439..c101e1d4 100644 --- a/linux-cachyos-sched-ext/PKGBUILD +++ b/linux-cachyos-sched-ext/PKGBUILD @@ -217,7 +217,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/make-modeset-fbdev-default.patch" + "${_patchsource}/misc/nvidia/6.11-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then @@ -531,6 +532,8 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.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" fi if [ -n "$_build_nvidia_open" ]; then diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD index 3457b967..a3ca5087 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -217,7 +217,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/make-modeset-fbdev-default.patch" + "${_patchsource}/misc/nvidia/6.11-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then @@ -531,6 +532,8 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.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" fi if [ -n "$_build_nvidia_open" ]; then diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index 06451259..7268b3da 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -217,7 +217,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/make-modeset-fbdev-default.patch" + "${_patchsource}/misc/nvidia/6.11-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then @@ -531,6 +532,8 @@ prepare() { # Use fbdev and modeset as default patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.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" fi if [ -n "$_build_nvidia_open" ]; then