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=1795022584; b=1fG9kFJj+w6U0D5shE9o4yNtZOUmju+/StHPeKdHy111fO4SGeN7v+o+x/rGyuytzThs U6lXT/aCw3CtN/NK4E80WbYuldFq6Hc3r4lmOz7JiMpmjxaeErOgYRDTUZ1lK6mR9lrVr muWsjg0Mr/1NORkgLDg5rEJYnq117BrcLK9yToaAtCpyvcIjaQfTJhLRMOs1AWRY7HD88 QYXTZt8qmGtYS0u5M9rCW2+LG2crXmq905jwFY+iKbjYSwo77wK/ydlUp8aRHqfN/22Du U9Nn16O0KbqiodeKQosq6Q+bUGqvsLiWogkDriRS2t4cyR/3EEugge0dxL6uDM9uJxA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795022584; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=r0ev9OxbPokwjU9eH0rGmsq9UU9pq7vcblWVoSAEAQE=; b=U4QuMeHMm54qty7sUICq20v5LrhPN/pNewCz0QmoZkVE1IrB7J/8Ao5XTDU9UlzsGjFK nuuWeLnPr49uQsddJnIuDyOb+g6IgcJfaU3Jw0r7/Zmaw8Lt0sSVpIxcG7O3d4l4zgdO2 +37DBSqDCZn+djRYYYO5PB4Ceo7hKq195WBzZm3sFIHN6KIimwRnAcRBUyKkpib4vvoMq JrCg3i2gObSIzEZVk1kSla7jPdqDpuuH4hiMq1bmjP093lU8H52G9eSarHYv3jonKemLv 3eJTzGKc718GeLAC3wqLN0qnWRXW/0cNRDNyrpMSCUhQ4MrbeLcVdmfhcQQt52U+0EA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=MhC1BCNc; 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 1AED2606A338; Wed, 18 Nov 2026 17:23:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=MhC1BCNc Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6FD451F000C5; Wed, 18 Nov 2026 17:23:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795022584; bh=r0ev9OxbPokwjU9eH0rGmsq9UU9pq7vcblWVoSAEAQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MhC1BCNcCp5hgKaJ86QwiP63hd3A/SFCxpNcxROlcUBfId1t9kGPR5zdcjKdbS6SC HztfmUAKGRlpTwTmdzRxPhzE7X8tm+qp7OK7G2wFVfnzcH2UMybl756NBwK7oP5aAa EbSqBEFcGBny/gQypoTUlsPy5BquBJ9DByyF51U8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Pierre-Loup A. Griffais" , Melissa Wen , Alex Hung , Alex Deucher , Sasha Levin Subject: [PATCH 6.18 0066/2151] drm/amd/display: Signal PQ EOTF in FreeSync infopacket for DP HDR Date: Wed, 18 Nov 2026 15:30:01 +0100 Message-ID: <20261118150124.164793928@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Melissa Wen [ Upstream commit 81f923b065801c7d30042bcda31ccb9449b4f58b ] Commit c2791297013e ("drm/amd/display: Add color bit info to freesync infoframe") created the app_tf interface for FreeSync HDR and commit c21a764a98cb ("drm/amd/display: Send PQ bit in AMD VSIF") used it to set PB9 bit 5 (PQ EOTF) in v2/v3 AMD Freesync infopacket. However, Linux never made use of this interface: DM ignores what userspace sets regarding HDR and always passes TRANSFER_FUNC_UNKNOWN as app_tf, so the PQ bit is never set in the infopacket received by the eDP panel. Check the EOTF in the HDR static metadata and set the PQ bit in Freesync infopacket for DP accordingly. This fixes gray-washed HDR on KDE/GNOME on Framework 13 Pro AI 9 HX 370 (DCN 3.5) and may fix similar issues on other VRR-capable panels that advertise Replay in its AMD VSDB. It doesn't affect color/EOTF bits on infopackets for SDR and native HDMI. Reported-by: Pierre-Loup A. Griffais Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/3200 Signed-off-by: Melissa Wen Reviewed-by: Alex Hung Signed-off-by: Alex Deucher (cherry picked from commit b318f3e13dd73781404670d3b3c6cf2177e0119c) Cc: stable@vger.kernel.org [ sashal: Inlined dm_dp_in_hdr_mode() checks into the existing static update_freesync_state_on_stream() function. ] Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 40ac1a33326fa..d3ec5c11abb18 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -9440,6 +9440,8 @@ static void remove_stream(struct amdgpu_device *adev, acrtc->enabled = false; } +#define DP_HDR_SDP_EOTF_IDX 2 + static void update_freesync_state_on_stream( struct amdgpu_display_manager *dm, struct dm_crtc_state *new_crtc_state, @@ -9455,6 +9457,8 @@ static void update_freesync_state_on_stream( bool pack_sdp_v1_3 = false; struct amdgpu_dm_connector *aconn; enum vrr_packet_type packet_type = PACKET_TYPE_VRR; + enum color_transfer_func app_tf; + const struct dc_info_packet *hdr; if (!new_stream) return; @@ -9506,12 +9510,18 @@ static void update_freesync_state_on_stream( &new_stream->adaptive_sync_infopacket); } + hdr = &new_stream->hdr_static_metadata; + app_tf = dc_is_dp_signal(new_stream->signal) && hdr->valid && + hdr->sb[DP_HDR_SDP_EOTF_IDX] == HDMI_EOTF_SMPTE_ST2084 ? + TRANSFER_FUNC_PQ2084 : + TRANSFER_FUNC_UNKNOWN; + mod_freesync_build_vrr_infopacket( dm->freesync_module, new_stream, &vrr_params, packet_type, - TRANSFER_FUNC_UNKNOWN, + app_tf, &vrr_infopacket, pack_sdp_v1_3); -- 2.53.0