linux6.12: update to 6.12.33.

This commit is contained in:
Duncaen 2025-06-13 02:42:58 +02:00
parent 39874a4484
commit 15d10c2de4
No known key found for this signature in database
GPG key ID: 335C1D17EC3D6E35
5 changed files with 5 additions and 53 deletions

View file

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.12.32 Kernel Configuration # Linux/arm64 6.12.33 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 14.2.1 20250405" CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 14.2.1 20250405"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y

View file

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/i386 6.12.32 Kernel Configuration # Linux/i386 6.12.33 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405" CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y

View file

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 6.12.32 Kernel Configuration # Linux/x86_64 6.12.33 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405" CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y

View file

@ -1,48 +0,0 @@
From 30dd9945fd79d33a049da4e52984c9bc07450de2 Mon Sep 17 00:00:00 2001
From: Aurabindo Pillai <aurabindo.pillai@amd.com>
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 <aurabindo.pillai@amd.com>
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);
}
/*

View file

@ -1,6 +1,6 @@
# Template file for 'linux6.12' # Template file for 'linux6.12'
pkgname=linux6.12 pkgname=linux6.12
version=6.12.32 version=6.12.33
revision=1 revision=1
short_desc="Linux kernel and modules (${version%.*} series)" short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Duncaen <duncaen@voidlinux.org>" maintainer="Duncaen <duncaen@voidlinux.org>"
@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
fi fi
checksum="b1a2562be56e42afb3f8489d4c2a7ac472ac23098f1ef1c1e40da601f54625eb checksum="b1a2562be56e42afb3f8489d4c2a7ac472ac23098f1ef1c1e40da601f54625eb
4f200514506e8fdaaf188f253263fe2ed2716b61aec75ea688c03e59aa5f9ec8" f35ac68436097a19e76d1909b9328c8ea4b55bde9479262b2b3ae810b558a0f0"
python_version=3 python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR. # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.