From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794272744; b=lfaExsaj7xNYuk9iOF12izcaRwYkK+J6wNMPfhkBuCFsIaLY2NOviALLecpW5YBGUs2f Rp/ouP7wd+USq4E2i+o4ulxRMLPOEr642kEBWG4rZppCsYXSvPjEKm5QmX6/v2X7TUDoJ 5RyXU0xsSgP+gYAnfbRoqtO95Tf/IfNxFs611dOpYayHcUSQng3MREtzreCywiccoKChx OF7+6BY5xR5V0neDUKPJDpDmV9qTEHGNRTcoXRHb3l6U+pp6VUYkYXfMofvkQVZcc+PuU gb+Aw7SO7dx54ptiRQCyq7wcFNxyuktXeUXrAqoWxziMkzsoVKbcp7iUi3tfLj+2nwA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794272744; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=760FV3uYduRO6ugUlgylhOnvfGCeyyp+VOfLN0Rbtrw=; b=fVtynd+bpaxTahN9ZEe/0QBZ3RvbQA6IKr8/mkS6uqogJzjPXhVn2tI9fGiy6TkL1TP4 f1sVUepjeP0AjC+a8gngQ9HnEoF6Aj3z+MQHnRvVJuCgVnl/IGTSUUEqgkRLFLHgxxJaI tCFl44lwQUsCG2E8CirAtP+EH3Z3UCPuFUPWn1NzgxiO5kttjoq1X6fgTfoBRZ4yKgICw y12qu98j+q/5XmSle4xn+AIeHytMiDnO07VnYpHlMQ60PLN3/piE0wZ8yGQKhd9T32D6O v2PRO5zcboJMETbtu/ijOo45cRuJ8NoIs+heT7NcixqelVf92LccdyoLYWod1jz5WRQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=La8IYUnf; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6452F606A31C for ; Tue, 10 Nov 2026 01:05:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=La8IYUnf Received: by smtp.kernel.org (Postfix) with ESMTPSA id A073E1F0089F; Tue, 10 Nov 2026 01:05:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794272744; bh=760FV3uYduRO6ugUlgylhOnvfGCeyyp+VOfLN0Rbtrw=; h=From:To:Cc:Subject:Date; b=La8IYUnf8LFZIKr4LCgeal0gz/vEFuVUjnSW9W3g3kRjo8oDEELt+RLBxwyqjWXf6 DMg4DafNijYRzr1PJ8vv+zFn7ZW61o9pG0ZdBll3xh4rvoroh92wIA4s0v6CfyXSA0 4oDOzUdEV27gT5OUbWbHGXHeyTTpu6ZJ0xUovm57ZoAeN71q3w2lGv2iMeaYOosOg1 v5KxOSt/zzo2+Wx/GvqFq5MSNzwnQpVYYRYpR7wC42NwUs7/mGYqoJKKvYLgBwYMzK qmJhLstFGM2KXMykZ09wMxumEZpREpYa0Co68EjRyxblSRuRg/KwDLqNk0mEyWojuH JMw9ClOS3XB/Q== From: Sasha Levin To: mikhail.v.gavrilov@gmail.com, jkasten@gmail.com, alex.hung@amd.com, alexander.deucher@amd.com Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] drm/amd/display: set allow_freesync before validating a new stream" failed to apply to 6.18-stable tree Date: Mon, 9 Nov 2026 20:05:42 -0500 Message-ID: <20261109200542-failed-6.18-ab18dd3061eb@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y git checkout FETCH_HEAD git cherry-pick -x ab18dd3061eb2d92e60c8bbf9a435c25962e449f # git commit -s git send-email --to '' --in-reply-to '20261109200542-failed-6.18-ab18dd3061eb@kernel.org' --subject-prefix 'PATCH 6.18.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From ab18dd3061eb2d92e60c8bbf9a435c25962e449f Mon Sep 17 00:00:00 2001 From: Mikhail Gavrilov Date: Mon, 26 Oct 2026 12:33:45 +0500 Subject: [PATCH] drm/amd/display: set allow_freesync before validating a new stream After resume from S3, DC enables SubVP on a single FreeSync display at a high refresh rate, although dcn32_allow_subvp_high_refresh_rate() is meant to keep SubVP off that configuration ("For single display cases, freesync must be disabled"). On an RX 7900 XTX driving a FreeSync TV at 3840x2160@120, amdgpu_dm_capabilities reports sub-viewport disabled after boot and enabled after "rtcwake -m mem", and the memory clock starts switching. It stays that way until a later commit re-validates the state; a CRTC gamma change (toggling Night Light) turns SubVP off again. The policy reads dc_stream_state::allow_freesync while the new state is validated, but amdgpu_dm sets that field only in amdgpu_dm_update_freesync_state_on_stream(), on the first flip after the commit. A stream created by a modeset is therefore validated as if FreeSync were off. On resume, dm_destroy_cached_state() drops the streams and forces a modeset, so the resumed state is validated without FreeSync. Set allow_freesync in amdgpu_dm_get_freesync_config_for_crtc(), which atomic check calls for every active CRTC and which already writes ignore_msa_timing_param to the stream. It uses vrr_supported, the condition the flip-time value is derived from. With this change the same TV keeps SubVP disabled across "rtcwake -m mem". On this machine SubVP is also what exposes the single-frame scanout corruption reported in the thread linked below, so the FreeSync setting stopped working as a workaround after every suspend. Fixes: 87f0c16e0eeb ("drm/amd/display: Enable SubVP for high refresh rate displays") Link: https://lore.kernel.org/all/20260829010525.29935-1-mikhail.v.gavrilov@gmail.com/ Link: https://gitlab.freedesktop.org/drm/amd/-/work_items/5714#note_3736349 Tested-by: Josh Kasten Signed-off-by: Mikhail Gavrilov Reviewed-by: Alex Hung Signed-off-by: Alex Deucher (cherry picked from commit 29793918b0eb63b6810b248a906f87dd79b70be5) Cc: stable@vger.kernel.org --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c index ab9cfbce8d73c..4620135437c5e 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c @@ -131,6 +131,14 @@ void amdgpu_dm_get_freesync_config_for_crtc( vrefresh >= aconnector->min_vfreq && vrefresh <= aconnector->max_vfreq; + /* + * DC reads allow_freesync while validating the new state, for example + * to keep SubVP off a single FreeSync display, but it is otherwise set + * only on the first flip after the commit. Set it here, so that a + * stream created by this commit is not validated without it. + */ + new_crtc_state->stream->allow_freesync = new_crtc_state->vrr_supported; + if (new_crtc_state->vrr_supported) { new_crtc_state->stream->ignore_msa_timing_param = true; fs_vid_mode = new_crtc_state->freesync_config.state == VRR_STATE_ACTIVE_FIXED; -- 2.53.0