From patchwork Wed Mar 12 15:40:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Turner X-Patchwork-Id: 14013646 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 004C9C28B28 for ; Wed, 12 Mar 2025 15:41:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D98C610E31B; Wed, 12 Mar 2025 15:41:24 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="AQ/6K4m3"; dkim-atps=neutral Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id A47CA10E31B for ; Wed, 12 Mar 2025 15:41:22 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-38dcac27bcbso698714f8f.0 for ; Wed, 12 Mar 2025 08:41:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1741794081; x=1742398881; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=gb46eQM7+CVkQmzVbS3/lfDcFEqWkPNQKqTN3kDSSdM=; b=AQ/6K4m3zMwTsu2r7Eoz3/k68Dt1miOvYGZjemM03SIZW6FZClxdkDsf3ArLE8QdvA 0RV0Y9ZKvhKPIFTmMAAlFAzrGoeNLhiZTJjIyQ0IN5P5h0OmkbNGU2ZE9b/xzpDFvpM4 CRPtzuO1YPbOrW+Kgsiqk7WP8CiWat34F0ukP4u9xOfabGkkYDDGyLoXNgxuaO5/ci/4 fDIUWM3atFts7c7NxWdy7Hg1WsF3yq/R+lQaJZw2qIHyYRqorCzoGHe9pmDBoWVbF6E1 Oi8zLebY71J9hC3t/LwCAXalqSxsGqyx1CLFW2XTu4bXaP2hv2n89NOA95bFGCbJjzVM lqPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741794081; x=1742398881; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gb46eQM7+CVkQmzVbS3/lfDcFEqWkPNQKqTN3kDSSdM=; b=AQ8G+CSemI5cRnZicnIKnmmOHtKcHKrI/abfpIIhtIzrHc50knrtYDRJclQPh7CDHj SU0LQaTJPnaopw12YMwkoIYPMp5imcaU/9rCyV8gCPF2QLJjC08YemUM+PffYKSdKJQ1 gHLd0CFf0ik+zoPdnxznRdGMxSA5ftRHgrS3csRc2Mf9ofp58DQAhZHOpsGXGKOzlwR1 aYZlCoyGPEH2vwCpbNtduLvTR79zoKXeAhQq7Hft1WinqMxjckA+/jTcZnrRBS53tlT8 gPoLIscekX0Ttxe7hM6xXQpn15xcemcvl/f8De6kHe20pibwm3WDNroK11fB2XeT7Alf vIsw== X-Gm-Message-State: AOJu0YxewearsrBhEMvES8Cwwe/ufK/CrkFF4OmJehYp7lygbWmVwkvo t93nxQewvQjPngw9CSFfBqb/i8Xgxo71hwpxwrsjhjFt9I/Dbs2n37+loqjeLkE= X-Gm-Gg: ASbGncvtVyCceVldbehEfh02U6FsrgfT+P7m9WDC77wT03tEy5o2gXYIOcCE0B49aK+ 49JoyG7txOHp8fXcHmwQ2+uycGW2wh2Cqr8iC77e7tFQQ+VsN+JiLKPkIHenD/zQv+7L3wfOHPn 7fstVenqmNtIegbIL4yan0xoHFsRMOIwRU7ltzfq9Hxvu67IMyjgtccFip/zqyeXouNo+alI0Y3 EDjKdEffVpbfF8ZZeT5iukAgV1mOPJd9d8HYrhB8Q276oFrTMhozwr4xBgnJhEi/DGXjYvq2oIK cEfxFboTAFDqoZj8chiEbJqECqMb3NEu+g== X-Google-Smtp-Source: AGHT+IHO2xtqa0eKA3kIWpS01nWKqjAWxmL8m4XDQ+natRRteVkEJfnmAkGJbqtsK8K6YGcTWKcKdw== X-Received: by 2002:a05:6000:186b:b0:391:2884:9dfa with SMTP id ffacd0b85a97d-395677a841dmr101808f8f.13.1741794081200; Wed, 12 Mar 2025 08:41:21 -0700 (PDT) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d0a78bdbfsm24374915e9.25.2025.03.12.08.41.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Mar 2025 08:41:20 -0700 (PDT) From: David Turner Date: Wed, 12 Mar 2025 15:40:55 +0000 Subject: [PATCH v3 1/2] drm/vc4: hdmi: Call HDMI hotplug helper on disconnect MIME-Version: 1.0 Message-Id: <20250312-vc4_hotplug-v3-1-d75878677de8@raspberrypi.com> References: <20250312-vc4_hotplug-v3-0-d75878677de8@raspberrypi.com> In-Reply-To: <20250312-vc4_hotplug-v3-0-d75878677de8@raspberrypi.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Cana?= =?utf-8?q?l?= , Raspberry Pi Kernel Maintenance , Dmitry Baryshkov Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, David Turner , Stefan Wahren X-Mailer: b4 0.14.2 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Stefan Wahren drm_atomic_helper_connector_hdmi_hotplug() must be called regardless of the connection status, otherwise the HDMI audio disconnect event won't be notified. Also update the comment on drm_atomic_helper_connector_hdmi_hotplug() to explain that this is necessary. Fixes: 2ea9ec5d2c20 ("drm/vc4: hdmi: use drm_atomic_helper_connector_hdmi_hotplug()") Suggested-by: Dmitry Baryshkov Signed-off-by: Stefan Wahren Signed-off-by: David Turner --- drivers/gpu/drm/display/drm_hdmi_state_helper.c | 3 ++- drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/drm/display/drm_hdmi_state_helper.c index c205f37da1e12b11c384670db83e43613e031340..d26d51902ba1a73175b23eec71562a30ceda1082 100644 --- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c @@ -816,7 +816,8 @@ drm_atomic_helper_connector_hdmi_update(struct drm_connector *connector, * @status: Connection status * * This function should be called as a part of the .detect() / .detect_ctx() - * callbacks, updating the HDMI-specific connector's data. + * callbacks, updating the HDMI-specific connector's data. It also needs to be + * called for disconnects to notify audio users of the unplug. */ void drm_atomic_helper_connector_hdmi_hotplug(struct drm_connector *connector, enum drm_connector_status status) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 37238a12baa58a06a5d6f40d1ab64abc7fac60d7..37a7d45695f236d3ab281d9a8676921fd434955c 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -372,13 +372,13 @@ static void vc4_hdmi_handle_hotplug(struct vc4_hdmi *vc4_hdmi, * the lock for now. */ + drm_atomic_helper_connector_hdmi_hotplug(connector, status); + if (status == connector_status_disconnected) { cec_phys_addr_invalidate(vc4_hdmi->cec_adap); return; } - drm_atomic_helper_connector_hdmi_hotplug(connector, status); - cec_s_phys_addr(vc4_hdmi->cec_adap, connector->display_info.source_physical_address, false); From patchwork Wed Mar 12 15:40:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Turner X-Patchwork-Id: 14013644 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0E212C28B28 for ; Wed, 12 Mar 2025 15:41:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3DF8110E2C5; Wed, 12 Mar 2025 15:41:24 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="NnEdsyWT"; dkim-atps=neutral Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by gabe.freedesktop.org (Postfix) with ESMTPS id A690710E315 for ; Wed, 12 Mar 2025 15:41:23 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-43cebe06e9eso27425355e9.3 for ; Wed, 12 Mar 2025 08:41:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1741794082; x=1742398882; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=1oEmtbJbAjDfE5NhrrJZgMsbc4ZNOupTbBSety67qvQ=; b=NnEdsyWTXrlKpuJuNqjnL/r6h3lgwm0FX8qS8WTJY7iKL2bnQ0qOl9jzaOirqhKgjR Elie7hR7LlyxKJfP/1/Dl9ceNNpGLFwe3F1zncKr1a3EgHa6/AU/epJZX5+pwpTnjV/y WADzQKN90YFtLmxZ0XhP2d3jhm2ZoSKQLrohEQ3JMvxCw11zXa9PSRnCJVQ+8m1wctu9 VAh2Sux+xNSyuE6oPkM1093afBqCEittoLiOACpjlfLbCqVP4CzXDfbqopCetFkz6qAq e4B81QbC2/H+c4/kEkZhKisezTV0k6ki93ScuwT3AqDZXq++qVgFauXk7/kQR8aKC5rD EJZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741794082; x=1742398882; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1oEmtbJbAjDfE5NhrrJZgMsbc4ZNOupTbBSety67qvQ=; b=weECIj9Y+qco3Fi1zqlrJ0xRTaUjQrn1uajz+DmSDezHR47u0Xx+lyqDqBTEaCuNtA EozcgUfudIkjZlthhzFEIjGo5/UhgbRA5KaAloXTj4Fm5LB9TPRPslyw2lmZM9gbCMnl qOgp4JLzaKFEyb5WVuj7QKUIeAHkwQWyakXVL3eJlT0uIZWKacRD/kJfYFq+tKWEoGd0 A3yhvKWhLkT2EqKRA5jvIPXfWR3BsCKa94KbxvPVBF11dmbqgvRmvsM1TIrFx9kAVMtn DbGp7sdjC9bx8QZm439iqXenEZeGvfDjD0LcO3szz/IoNyuiLTzCL22UV4hbbXPngM7q NB+Q== X-Gm-Message-State: AOJu0Yxjdnu8qkqFLl1drmVJr8UzoXk9zjE4FrPK3l0VzP5Ou5EU8X93 0mpuErVFyPNMAY4gmwFpp4XiBvwwHMUgq8KH3MfG6jtuFEhCCCXjBqjXbqE+7O0= X-Gm-Gg: ASbGncvFyChQuVT5IiJLbDiZVRzSxVv6KqrxBLTtQKxlzXrIxnAHfKH3JGfkDgIWaIa ZfrqPH7Fu+IRvebPFEuTjZ2jegkDYAq9iXCIXOHdwTrh7YiwBezEmlwHGQ8ryrfOtHWxWBFndgy O/wGFyISuY+cP1UQC1yTMAMt0HhjjIk310DUXN3rU9BaiGe0hCiq11HaoEYgk8QawonWInqbFK0 tF2KYcg5caaYBn2Cbtb0WzK9N+1hqKCw0Iz1LeUvC6GslqsCAJHcZwCRYdXeYfIFDnXns/cCyrV 5nS8aGNe+i2uSGJ4IGoxSARz9j7bL19qlmv/bA4x5TEV X-Google-Smtp-Source: AGHT+IEuj+E29WQ/OOpJvqQ3EDVSbJiu5HyHbTRxHeTQ9s89qRgpRlIWvsn6eHPGJl3Ru6tmiOdhpg== X-Received: by 2002:a05:600c:3b94:b0:43c:f8fc:f69a with SMTP id 5b1f17b1804b1-43cf8fcf902mr113708705e9.4.1741794082171; Wed, 12 Mar 2025 08:41:22 -0700 (PDT) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d0a78bdbfsm24374915e9.25.2025.03.12.08.41.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Mar 2025 08:41:21 -0700 (PDT) From: David Turner Date: Wed, 12 Mar 2025 15:40:56 +0000 Subject: [PATCH v3 2/2] drm/vc4: hdmi: Add jack detection to HDMI audio driver MIME-Version: 1.0 Message-Id: <20250312-vc4_hotplug-v3-2-d75878677de8@raspberrypi.com> References: <20250312-vc4_hotplug-v3-0-d75878677de8@raspberrypi.com> In-Reply-To: <20250312-vc4_hotplug-v3-0-d75878677de8@raspberrypi.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Cana?= =?utf-8?q?l?= , Raspberry Pi Kernel Maintenance , Dmitry Baryshkov Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, David Turner , Stefan Wahren X-Mailer: b4 0.14.2 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add ALSA jack detection to the vc4-hdmi audio driver so userspace knows when to add/remove HDMI audio devices. Signed-off-by: Stefan Wahren Signed-off-by: David Turner --- drivers/gpu/drm/vc4/vc4_hdmi.c | 18 ++++++++++++++++++ drivers/gpu/drm/vc4/vc4_hdmi.h | 7 +++++++ 2 files changed, 25 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 37a7d45695f236d3ab281d9a8676921fd434955c..a29a6ef266f9a5952af53030a9a2d313e2ecdfce 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -2175,6 +2176,22 @@ static const struct drm_connector_hdmi_audio_funcs vc4_hdmi_audio_funcs = { .shutdown = vc4_hdmi_audio_shutdown, }; +static int vc4_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd) +{ + struct vc4_hdmi *vc4_hdmi = snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; + int ret; + + ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT, + &vc4_hdmi->hdmi_jack); + if (ret) { + dev_err(rtd->dev, "HDMI Jack creation failed: %d\n", ret); + return ret; + } + + return snd_soc_component_set_jack(component, &vc4_hdmi->hdmi_jack, NULL); +} + static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) { const struct vc4_hdmi_register *mai_data = @@ -2288,6 +2305,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) dai_link->cpus->dai_name = dev_name(dev); dai_link->codecs->name = dev_name(&vc4_hdmi->connector.hdmi_audio.codec_pdev->dev); dai_link->platforms->name = dev_name(dev); + dai_link->init = vc4_hdmi_codec_init; card->dai_link = dai_link; card->num_links = 1; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h index e3d989ca302b72533c374dfa3fd0d5bd7fe64a82..a31157c99bee6b33527c4b558fc72fff65d2a278 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -4,6 +4,7 @@ #include #include #include +#include #include #include "vc4_drv.h" @@ -211,6 +212,12 @@ struct vc4_hdmi { * KMS hooks. Protected by @mutex. */ enum hdmi_colorspace output_format; + + /** + * @hdmi_jack: Represents the connection state of the HDMI plug, for + * ALSA jack detection. + */ + struct snd_soc_jack hdmi_jack; }; #define connector_to_vc4_hdmi(_connector) \