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=1794273570; b=tDUYR96MCoX/XTRcVBYTBvMO8JtAm9uRUvwh9sXoYgBcdZFU9L8NWM8hsW/yajejFKuY 6Pkm4ZU+n1Tr7Orrfzq+H+jUbEgKGyPgfaVl5xLzj40SCTzHNzl5hP1ghHcmncE9gHwfU 5HZqFqIx6hEdjt7xl0IZqAzzeMiVIdpSBPCddnKL5zibtcnGEgmTVvbqoGTJ2rLBjIHNE aDQNkGpWN/xtnD/s8QrACF7Y43UmqKm6e6yvEA5OQyNCxr2Z6RyxcZp2jScqY3fn4XLnG 8CugQ2+GuQEZUGafVRSRsxueSOkmaj3KXvCexXrlCPRBzrHwN9j2J5I1g9RfDjS5H8Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794273570; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=dRqbCpHrLxYrW1AhwAM+mnJ4UhyH6WMSxTkGv/92pNY=; b=qYLidNM53eeUem3v4WYnHlrgd8QNhRJzNrReI1Bmpj4BAxm+8LDH44TColEgLXdLBurC gOGdBvm8C05xD4kITEWb4weK7tvY43JxP7di54RXLorG7kBqFlLXJb3b0q0K+eMiTvZmf EQaeVesEUvFVTJ95BTaK/T7TmVP2gyZvrn9d6J5KeOIyz3JFtY9VfZuKaQdOamZgvh+Py jrIZkm7EIx6VAFBehStm8+wcKD05EjzFxY+hRe8VfiBPYfU/aDtSd6kQrWxux/3Sv2S8V jnADxdLyWGgNG6fbz4cVTrOIv/k617DpDHeMHFkzyFBj7lzhdEi1rX5Z16uX8Mv0dqQ== 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=Lk+8fNsb; 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 DBFBD606A31C for ; Tue, 10 Nov 2026 01:19:29 +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=Lk+8fNsb Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D9541F0089F; Tue, 10 Nov 2026 01:19:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794273569; bh=dRqbCpHrLxYrW1AhwAM+mnJ4UhyH6WMSxTkGv/92pNY=; h=From:To:Cc:Subject:Date; b=Lk+8fNsblzOZWKyzwX4rXf+n9zz62ODu6HDz1s+53Ykpxrg2qCLPbgi4z4onkz+X5 CVMXDCheGZoC2N747ia6/fWVPFEGrK14WYHKAaeAwwPRshajAzr++RMeUSyAO1s6Xn +1DsyKcvD+FE/TtXDv72EbaxyVqAPIHUIeaA+eygKo/MsFS2IINwbXlUARAPHR7Rpg Tv4xvOhpDx9FsVCjU8AXd6ytywjng1EGDQlfRcK3eTykhkZv+8Cs0vMPLWJ5e728IZ xcCPEisHTVK54aLtAng0sHjlh4bb2rMcodjGG+wxexW7O6yYhAYRdTMNjAxR9iCrHg B/osjLAWBf/VA== From: Sasha Levin To: renpanpan@kylinos.cn, alexander.deucher@amd.com Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] drm/amdgpu: Only enable HDMI audio if display supports it" failed to apply to 6.1-stable tree Date: Mon, 9 Nov 2026 20:19:28 -0500 Message-ID: <20261109201928-failed-6.1-0de95c96655c@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.1-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.1.y git checkout FETCH_HEAD git cherry-pick -x 0de95c96655c8a12df62e47871016f49e5cd8618 # git commit -s git send-email --to '' --in-reply-to '20261109201928-failed-6.1-0de95c96655c@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 0de95c96655c8a12df62e47871016f49e5cd8618 Mon Sep 17 00:00:00 2001 From: renpanpan Date: Mon, 2 Nov 2026 17:49:29 +0800 Subject: [PATCH] drm/amdgpu: Only enable HDMI audio if display supports it The amdgpu legacy DCE audio path (dce_v6/v8/v10) unconditionally calls audio_enable(pin, true) at the end of afmt_setmode(), regardless of whether the connected display advertises audio support in its EDID. This causes a phantom HDMI audio output to appear for displays that have no audio capability (no basic audio bit, no Audio Data Block in EDID), because the GPU sets the AUDIO_ENABLED register bit, which drives the HDA codec's ELDV pin sense, making the codec report the jack as audio-available. The radeon, nouveau, and dw-hdmi drivers all gate audio enablement on display_info.has_audio. Apply the same check to amdgpu's DCE afmt_setmode functions. Reviewed-by: Alex Deucher Signed-off-by: renpanpan Signed-off-by: Alex Deucher (cherry picked from commit 842a45c68e0355eea47796551c8761c0c77e8ce0) Cc: stable@vger.kernel.org --- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 5 +++-- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 5 +++-- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c index 7de7adc8f225c..05d7da888f492 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c @@ -1705,8 +1705,9 @@ static void dce_v10_0_afmt_setmode(struct drm_encoder *encoder, WREG32(mmAFMT_RAMP_CONTROL2 + dig->afmt->offset, 0x00000001); WREG32(mmAFMT_RAMP_CONTROL3 + dig->afmt->offset, 0x00000001); - /* enable audio after to setting up hw */ - dce_v10_0_audio_enable(adev, dig->afmt->pin, true); + /* Only enable audio if the display supports it */ + if (connector->display_info.has_audio) + dce_v10_0_audio_enable(adev, dig->afmt->pin, true); } static void dce_v10_0_afmt_enable(struct drm_encoder *encoder, bool enable) diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c index 3c1d6901127d1..f0722bdaeab61 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c @@ -1748,8 +1748,9 @@ static void dce_v6_0_afmt_setmode(struct drm_encoder *encoder, dce_v6_0_audio_dp_enable(encoder, 1); } - /* enable audio after setting up hw */ - dce_v6_0_audio_enable(adev, dig->afmt->pin, true); + /* Only enable audio if the display supports it */ + if (connector->display_info.has_audio) + dce_v6_0_audio_enable(adev, dig->afmt->pin, true); } static void dce_v6_0_afmt_enable(struct drm_encoder *encoder, bool enable) diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c index a17944d5e8434..3f5247314edee 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c @@ -1653,8 +1653,9 @@ static void dce_v8_0_afmt_setmode(struct drm_encoder *encoder, WREG32(mmAFMT_RAMP_CONTROL2 + offset, 0x00000001); WREG32(mmAFMT_RAMP_CONTROL3 + offset, 0x00000001); - /* enable audio after setting up hw */ - dce_v8_0_audio_enable(adev, dig->afmt->pin, true); + /* Only enable audio if the display supports it */ + if (connector->display_info.has_audio) + dce_v8_0_audio_enable(adev, dig->afmt->pin, true); } static void dce_v8_0_afmt_enable(struct drm_encoder *encoder, bool enable) -- 2.53.0