From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 15A5E15807A for ; Thu, 05 Jun 2025 19:13:31 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 0429D343188 for ; Thu, 05 Jun 2025 19:13:31 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 07E4F1102BE; Thu, 05 Jun 2025 19:13:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id F141B1102BE for ; Thu, 05 Jun 2025 19:13:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A10F6343188 for ; Thu, 05 Jun 2025 19:13:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1441020FB for ; Thu, 05 Jun 2025 19:13:28 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1749150741.8e6513be962044e2cb5eb27aa86b6281090e747b.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:6.15 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 2700_amd-revert-vmin-vmax-for-freesync.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 8e6513be962044e2cb5eb27aa86b6281090e747b X-VCS-Branch: 6.15 Date: Thu, 05 Jun 2025 19:13:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b97c413c-74cb-44e0-9932-d26476716a8f X-Archives-Hash: c382c01142a9b91b4f24cd2faeeb3849 commit: 8e6513be962044e2cb5eb27aa86b6281090e747b Author: Mike Pagano gentoo org> AuthorDate: Thu Jun 5 19:12:21 2025 +0000 Commit: Mike Pagano gentoo org> CommitDate: Thu Jun 5 19:12:21 2025 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=8e6513be Revert: "drm/amd/display: more liberal vmin/vmax update for freesync" Signed-off-by: Mike Pagano gentoo.org> 0000_README | 4 +++ 2700_amd-revert-vmin-vmax-for-freesync.patch | 48 ++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/0000_README b/0000_README index 61b05f13..4206c43f 100644 --- a/0000_README +++ b/0000_README @@ -62,6 +62,10 @@ Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@holtmann.org/raw Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 +Patch: 2700_amd-revert-vmin-vmax-for-freesync.patch +From: https://github.com/archlinux/linux/commit/30dd9945fd79d33a049da4e52984c9bc07450de2.patch +Desc: Revert "drm/amd/display: more liberal vmin/vmax update for freesync" + Patch: 2901_permit-menuconfig-sorting.patch From: https://lore.kernel.org/ Desc: menuconfig: Allow sorting the entries alphabetically diff --git a/2700_amd-revert-vmin-vmax-for-freesync.patch b/2700_amd-revert-vmin-vmax-for-freesync.patch new file mode 100644 index 00000000..b0b80885 --- /dev/null +++ b/2700_amd-revert-vmin-vmax-for-freesync.patch @@ -0,0 +1,48 @@ +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); + } + + /*