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=1794591221; b=kKGGWPxTObdvN1STciWkfN7+kt/bcvolCQnu+YJer6kWTM4q9Ir/W70LQGAxZOqeGZ5i hxBzxKN0xx7PbU4REXnCHCAB6Wug9YoRJcADjUk3whH07hx4ZMJTIbobOle7PQT7AN6AQ bC7I0oWpjzOe/TeBjm7oK7wNQPo08vmhYCehkc8LNf0Lrlmb6WbVqErAwcu0CivIf/wGH 8erwM/OPvgJIpLRsd3BZ1ac/4t3Zi7nIXAFXtqaVyLnOM7CS+HRvPc8szaYJuq4hJ9sof 1d2KHMuLS3DUAp5cWwoA0RlNXDffkmsiNErlB86rcDRO9zcCW/SLVnumDDZuBhvgw1Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794591221; 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=RcvVB7Kjyr8S+KWjNcImNL7WmIGi+BjhXZEKi80Dd/w=; b=c9biEy6sFJ3uD6WpBc9WKBI3O95DEm5qybzFS3GJ2JLtd4nAikTj3KNT2e/shQVJUt0L Pq7McbUqHPetzZ8F+kWdPyyH3PWK5ZBS0xgFerNIyW/Jmxi2VfUuvwaW3cS0/OG8fkWxZ QGfL/eFpeDyU0GQSlEf6oe+wt2Nubs4y3aL1niUgrI+m3P6ijBbttMureAcjijGN5bmr1 3mRdK5Hu4O8ZKFem77+8AjZ/7vGUZVKLVPdxr5nqBIatXURG6jOzXbL5u4SSR1HmNC7R6 bVeXLUONpU4Q0EUWLEACNndFX+W0Pg9fzHT6gQxifxgeY1FEAkXbJmlMjReZOPNmdtg== 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=RcjwQOzm; 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 E5DEE6075E18; Fri, 13 Nov 2026 17:33:40 +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=RcjwQOzm Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90B4E1F000CF; Fri, 13 Nov 2026 17:33:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794591220; bh=RcvVB7Kjyr8S+KWjNcImNL7WmIGi+BjhXZEKi80Dd/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RcjwQOzm2RC3xVKvQO8lB6i/IOwqa3dto3kzgTFuAy/2h/2DLiY1eHxWfzBWwcphx FKJWd7Il248laJgurXgQ0wGgSelw7X5YRGCmDLTVauG6+H1za+dLT8iDA15m0P2VUb xfZK3dqdWR+cevije0WIyY3cK2pNWiijKA4AW4wc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Deucher , renpanpan , Sasha Levin Subject: [PATCH 6.12 353/670] drm/amdgpu: Only enable HDMI audio if display supports it Date: Fri, 13 Nov 2026 10:48:37 -0500 Message-ID: <20261113153823.787758677@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153811.177190860@linuxfoundation.org> References: <20261113153811.177190860@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore 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-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: renpanpan [ Upstream commit 0de95c96655c8a12df62e47871016f49e5cd8618 ] 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 Signed-off-by: Sasha Levin --- 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 daed4a8439cc8..8bfa0b07dec7c 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c @@ -1736,8 +1736,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 1e15348a5c7df..9b39518a3e11c 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c @@ -1721,8 +1721,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 7e92f322bc339..c22bb261d0ffb 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c @@ -1683,8 +1683,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