diff --git a/srcpkgs/linux6.15/files/arm64-dotconfig b/srcpkgs/linux6.15/files/arm64-dotconfig index a2747f084b8..7370c57ff7b 100644 --- a/srcpkgs/linux6.15/files/arm64-dotconfig +++ b/srcpkgs/linux6.15/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.15.1 Kernel Configuration +# Linux/arm64 6.15.2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 14.2.1 20250405" CONFIG_CC_IS_GCC=y diff --git a/srcpkgs/linux6.15/files/i386-dotconfig b/srcpkgs/linux6.15/files/i386-dotconfig index c29ff79d516..d9fc8fca3e5 100644 --- a/srcpkgs/linux6.15/files/i386-dotconfig +++ b/srcpkgs/linux6.15/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.15.1 Kernel Configuration +# Linux/i386 6.15.2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405" CONFIG_CC_IS_GCC=y diff --git a/srcpkgs/linux6.15/files/x86_64-dotconfig b/srcpkgs/linux6.15/files/x86_64-dotconfig index 505724fe683..3a9d75eebec 100644 --- a/srcpkgs/linux6.15/files/x86_64-dotconfig +++ b/srcpkgs/linux6.15/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.15.1 Kernel Configuration +# Linux/x86_64 6.15.2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405" CONFIG_CC_IS_GCC=y diff --git a/srcpkgs/linux6.15/patches/fix-amd-regression.patch b/srcpkgs/linux6.15/patches/fix-amd-regression.patch deleted file mode 100644 index b0b80885908..00000000000 --- a/srcpkgs/linux6.15/patches/fix-amd-regression.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 30dd9945fd79d33a049da4e52984c9bc07450de2 Mon Sep 17 00:00:00 2001 -From: Aurabindo Pillai -Date: Wed, 21 May 2025 16:10:57 -0400 -Subject: [PATCH] Revert "drm/amd/display: more liberal vmin/vmax update for - freesync" - -This reverts commit 219898d29c438d8ec34a5560fac4ea8f6b8d4f20 since it -causes regressions on certain configs. Revert until the issue can be -isolated and debugged. - -Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4238 -Signed-off-by: Aurabindo Pillai -Cherry-picked-for: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/139 ---- - .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 16 +++++----------- - 1 file changed, 5 insertions(+), 11 deletions(-) - -diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index 2dbd71fbae28a5..e4f0517f0f2b23 100644 ---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -@@ -668,21 +668,15 @@ static void dm_crtc_high_irq(void *interrupt_params) - spin_lock_irqsave(&adev_to_drm(adev)->event_lock, flags); - - if (acrtc->dm_irq_params.stream && -- acrtc->dm_irq_params.vrr_params.supported) { -- bool replay_en = acrtc->dm_irq_params.stream->link->replay_settings.replay_feature_enabled; -- bool psr_en = acrtc->dm_irq_params.stream->link->psr_settings.psr_feature_enabled; -- bool fs_active_var_en = acrtc->dm_irq_params.freesync_config.state == VRR_STATE_ACTIVE_VARIABLE; -- -+ acrtc->dm_irq_params.vrr_params.supported && -+ acrtc->dm_irq_params.freesync_config.state == -+ VRR_STATE_ACTIVE_VARIABLE) { - mod_freesync_handle_v_update(adev->dm.freesync_module, - acrtc->dm_irq_params.stream, - &acrtc->dm_irq_params.vrr_params); - -- /* update vmin_vmax only if freesync is enabled, or only if PSR and REPLAY are disabled */ -- if (fs_active_var_en || (!fs_active_var_en && !replay_en && !psr_en)) { -- dc_stream_adjust_vmin_vmax(adev->dm.dc, -- acrtc->dm_irq_params.stream, -- &acrtc->dm_irq_params.vrr_params.adjust); -- } -+ dc_stream_adjust_vmin_vmax(adev->dm.dc, acrtc->dm_irq_params.stream, -+ &acrtc->dm_irq_params.vrr_params.adjust); - } - - /* diff --git a/srcpkgs/linux6.15/template b/srcpkgs/linux6.15/template index 3b9cf62afd5..29476b52e1d 100644 --- a/srcpkgs/linux6.15/template +++ b/srcpkgs/linux6.15/template @@ -1,6 +1,6 @@ # Template file for 'linux6.15' pkgname=linux6.15 -version=6.15.1 +version=6.15.2 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Duncaen " @@ -18,7 +18,7 @@ rc*) distfiles="https://git.kernel.org/torvalds/t/linux-${version%.*}-${version# esac checksum="7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764 - 457cea72ac6d958237ee2fe5eaaf4745dd64b5550b1eda5e21d3f648d15e5533" + 0ff99b5765590b019579a61aaff35b7bb3d56deb7013653c45b7a3fb189fe9e3" python_version=3