From nobody Wed Dec 17 12:06:35 2025 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03677199EBB for ; Mon, 17 Mar 2025 17:13:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742231614; cv=none; b=CT5V98ZWuCkazuQcAEStHey4MRoHNqaI+06nHhdi0UYI4FXAXGq3levzxJscA/s8X9yi9alja2Nr7+xa2G22kJPhdoiuvOC7btv6nwNbVc4TrUFvBHyFfxGyNGOBzLqpx47GBRMR0PgFurUsjJ7ITzrehGGCCQKSh00HO1lNjS8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742231614; c=relaxed/simple; bh=X4Y16gQO1I9hR6tCJlQp3S0GEXb/4985/QrdFJI9Zh4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Txx67jD/ENbf7P8S+yG7Kv+4pvjEPlk8iMnque1fVpBkIWUyEk3Jp06do+WILcJluHaoWwwwtJR8D+LguDEkcX/qRUH2PMC0/1ZOxVvaGJg59Q2N8PpErOZ9+wtOEXmRU56IqWMUxtQ0vp56+IEdKYe3Up4IFJXuFNM82e+P4nI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com; spf=pass smtp.mailfrom=raspberrypi.com; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b=JdZmt0wa; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="JdZmt0wa" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-43cfe574976so15009915e9.1 for ; Mon, 17 Mar 2025 10:13:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1742231611; x=1742836411; darn=vger.kernel.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=lRDTsBjDbCS/Pgq7ZICBGwt1MaN5NlT93wkTd9DN6xA=; b=JdZmt0waaaTaysSC4aXHHE++i2ta6q8IxGBrrQ0Mbnv3DYLcNUYaVzyBVg3gmn/3Zk lCtsRxo3MC0cDWhWt/mtwll/v2wAD/+JgYnYKtf3Hf3o/KkXF1G41kWNooMjZ247ZjDQ YO7ICtab//+Ip3LwxF36u2BKHH1NKFCR93J0S6JylFyf65bxDEvXmJlAKPneKoqoinzA BwoflPEDwe24IDzqoj2+eGSEJnVD4O7Sp6elD50obHcYsPyT0a3MVA4Q3vtKawwwqI+1 pE2ph/lX0eWZ4EOebcGRk6tAqS9N6kDLlqtyPW82IJ7tWWoikP8VIycuV2BhlEh9aHt6 U15w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742231611; x=1742836411; 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=lRDTsBjDbCS/Pgq7ZICBGwt1MaN5NlT93wkTd9DN6xA=; b=KSHvcej59XOtD6EDjLENzqfTdiamwYWLIJ0ZBrUYZccUeTtBreKy7CR2ksx6UcXKxJ ozlk1+2//mU6nsrzufnkHpJz0T5uWkiNPPTf7bzW9r2Vu61ptrLk9/9UML9MJQ6RE4bz f1CgHSGhAGlCjcCT63UD/3kypIwSXpMaGhU/oAfdK1/rHp3uAoiFt4LbBpOmVyOMfHwn x1IAhp07pi1+Fe0Dph+9OSqQSb/syIXadlRjRRz1VJAaE4wbCX0m0Pxu2FrGfiH/e8e9 3LYnAgwTSNbbEB/+fb9R9Ec8qfPmFTUMg1Um5ElcxvQ1jAcxsMPYTUUFgwYo8ZSmXR0D eaFg== X-Forwarded-Encrypted: i=1; AJvYcCWnou5ZFq8dzpHUlB3JuzAdYkY4VNJNCHexw5bH6wHAGWilMxTjTXCKg+UiaaWp9094Nli+HnXzwgybrbQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yxp88dHgA5chXEM431/B3hSP3bkd4L+/5M2FWv0upPrfMGiSJwe G5J0DuaU4lyBGmFlUSrGZA9U5cwlT9tnQX/7OJ9QZTyhUyOUurPqffospuPH2OI= X-Gm-Gg: ASbGncsZyLGrwHaR4RgcWpM2PUX+rBw99LYvPpKfDF+9yGw6Fobh7XUYBfxFaAeYCXU ySU2wYT090mqlTpL0RtvR0kPUK+ieXM9fOjBC9bs/c54QqBDRLxNArnSA8++OUCw5yEbRwh1lw8 WZF1lc0An1IcdKSF8WFoIkxYfOuM7x1EmEhbc3Tq2NmVYAfm7Yo0Dj98OvdEhD1WxfnlJQxOgNP L5P9d/AVu+ywpK2Vy6NASxXGVoIXnqXnwHf6R1GNQrdFTXyqAa+zE34mKwO3/Vn8oKPRf8OnojL s/xTXrWB9h3f5I0pjDd9McZSB8ZEyDwjhA== X-Google-Smtp-Source: AGHT+IHaQFEGmNJHvYPiwKVLfVH0wjBZjXXR2bM1ay2xIHNWMsAaGkue/Sb8FK6LJoE+P8Wy8OzqnQ== X-Received: by 2002:a05:600c:3d0e:b0:43c:fe5e:f040 with SMTP id 5b1f17b1804b1-43d2bb4d786mr47087915e9.23.1742231611236; Mon, 17 Mar 2025 10:13:31 -0700 (PDT) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d1fdda15dsm112003365e9.3.2025.03.17.10.13.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 10:13:29 -0700 (PDT) From: David Turner Date: Mon, 17 Mar 2025 17:12:22 +0000 Subject: [PATCH v4 1/3] drm/display: Update comment on hdmi hotplug helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250317-vc4_hotplug-v4-1-2af625629186@raspberrypi.com> References: <20250317-vc4_hotplug-v4-0-2af625629186@raspberrypi.com> In-Reply-To: <20250317-vc4_hotplug-v4-0-2af625629186@raspberrypi.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Dmitry Baryshkov Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, David Turner X-Mailer: b4 0.14.2 Update the comment on drm_atomic_helper_connector_hdmi_hotplug() to clarify that it must be called for all status updates. Signed-off-by: David Turner Reviewed-by: Maxime Ripard --- drivers/gpu/drm/display/drm_hdmi_state_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/= drm/display/drm_hdmi_state_helper.c index c205f37da1e12b11c384670db83e43613e031340..cac819ac468de020e4e75b3bcb0= 9c31f909bd61e 100644 --- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c @@ -816,7 +816,7 @@ drm_atomic_helper_connector_hdmi_update(struct drm_conn= ector *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 for all status changes. */ void drm_atomic_helper_connector_hdmi_hotplug(struct drm_connector *connec= tor, enum drm_connector_status status) --=20 2.34.1 From nobody Wed Dec 17 12:06:35 2025 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE65E1FC7D4 for ; Mon, 17 Mar 2025 17:13:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742231617; cv=none; b=kj+1/T42kEEgaf/ltFZL3lP1s9mlI39MafpFaRf37U2gIiqBt3aHLgfwCj4lqT+Rpylmg7noUCYE7/auRMWHRnM6TFy1oh+SihIkuU3/MfY4n0SaSMkQ3zljorCdZOtbKq2kahPZ9rJAzKRXi+vscXu5kT8hCEBW2vhyA6iBWpg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742231617; c=relaxed/simple; bh=/PhSLHjROc73cBrttIeJVRJfk7frKRuzF6sp6s4Lcj0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WzFO1pSVd8n+puTlxIAARa1QKB7V+3EAMiZ3R4BFBwaHvIbi3yGiqZd+qFTuJpMJbHZ3GnwZX+hVFvwtm1qI1OUjBcweL+o4dET6Jxd7+PLqpj3venbo0TwryMEm5CPoDwPqhOatEmel6f4eXrvWMPY+KYnTo5QPiyRfLFfSzIQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com; spf=pass smtp.mailfrom=raspberrypi.com; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b=dg7AvUsE; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="dg7AvUsE" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-390e3b3d3f4so2803761f8f.2 for ; Mon, 17 Mar 2025 10:13:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1742231614; x=1742836414; darn=vger.kernel.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=7fMIytW0SxfPTGP9LvPWkChZq/hvsCkhhTHxMZ6OSLw=; b=dg7AvUsEJ/EVnIymMSypm3edND7apl5j1Y48GAo0U83l41qRZbnylKCtiwbfVdLB3K VJ3x0cJxmZ7Y6E3m02AsxgFcEF84tm1mD6AvbMGhyjks4jxxpvCu3yXP9MDPNbZ6XENd iNSGHOLuVJ1KzwqIRjHEkhStAtYlu3SJMRTCVy/13KJdbaKFL6TvLfZNdu0AvJllx60m WPSthiLLetLjFKpeAV07fguvTMbPEBhQEHPFcsFEDR2FZaqHg5KhwmCL2sR6GLN9QRe+ YzMkzVxaX0U0V6zFIazXloA0ZnsaszTs4aDF1OzNFJOe8bpjDO1QkQy1ks1cBdj2EZKF GftQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742231614; x=1742836414; 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=7fMIytW0SxfPTGP9LvPWkChZq/hvsCkhhTHxMZ6OSLw=; b=vXFo7qYfONqG9V7v5pmgilg84Mh3qJffD2AMHcP5AHfRYHonnTkT8qKWwuCYuBEVgg SFkIYejS4OPlQRmXnXdIwCz0Phpz4bnKyTFW6VA4QQuEZqIXZHKNYl2f7NbzHBWohP9r 16tvnlEl4ZVf47rax5Wh6OAf+Cj93NFoTHr8hW9gifySgznZpYWcCWpnLrMWqMZ3QqXq BNkb+oDHnDGZjlQ3mhlXZfwAai0lT3eg8xeFUj23murN+4bOSUVkQWcBnyw6xiVs9mgc OOewWJ4BxLMxtXisgvnkz3ah+j8Ssl9NpyAqIwZ+J5NHuFWlPfU83/Cq7ogh0FzieKVi 8Azw== X-Forwarded-Encrypted: i=1; AJvYcCXNY7r4o+FYC5edkth3Q3uFfQAVl/F88Yyh50Udro9BvwkLYH9qkstN5WmG5HGx/anE6xIDsuIEx+joYbc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1H+QjKprSP2mXpHkSfkj/9J7FEHARZfS9g60tr7QAR3HZFE0V kfjlLPr/dNw+FBX8hUAi3Wq/zUBm6NmmQIQ+LfLL99IKKQHpadPNtYpNdsZW7AI= X-Gm-Gg: ASbGncszjoqbkgv7C7mWrPm177Yo3IGAjrfwXc/xCYjiW8IP640Byrb6EHOMaT45rO6 P3+dMxXxeMa5ebtJ4c1A+HUTamIHSLyl/5vLKvwSD+WnqjWya4eclvzUXQQ/VzjrAZQ4XLzeV7J AkiYlyNUilpot5f0KUH8R/MA4WRoSGUwYd1Ojb4LOLl2tcIsBWQnMrQIaYzOPyhpuQWgHqV4DRv TK9uAQ4h+xp16US/vw2WBHB6I5cGuprRzVwXHt0z9C4f6YbaXqbT8OHqnSPDq7K7Z34ZLO7HqY3 kp7+CbB2LGPblGyJtFsD1mtdQXnry5q6TA== X-Google-Smtp-Source: AGHT+IGkP+dmpLKkzo04mu9JfjO/ZA5KdaifD/QSaC1iHJgfbvWe2OU5XBzjuXxpITQViZF/cOe/8Q== X-Received: by 2002:adf:9b89:0:b0:391:3fa7:bf66 with SMTP id ffacd0b85a97d-3996b46892bmr399853f8f.31.1742231613968; Mon, 17 Mar 2025 10:13:33 -0700 (PDT) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d1fdda15dsm112003365e9.3.2025.03.17.10.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 10:13:32 -0700 (PDT) From: David Turner Date: Mon, 17 Mar 2025 17:12:23 +0000 Subject: [PATCH v4 2/3] drm/vc4: hdmi: Call HDMI hotplug helper on disconnect Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250317-vc4_hotplug-v4-2-2af625629186@raspberrypi.com> References: <20250317-vc4_hotplug-v4-0-2af625629186@raspberrypi.com> In-Reply-To: <20250317-vc4_hotplug-v4-0-2af625629186@raspberrypi.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , 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 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. Fixes: 2ea9ec5d2c20 ("drm/vc4: hdmi: use drm_atomic_helper_connector_hdmi_h= otplug()") Suggested-by: Dmitry Baryshkov Signed-off-by: Stefan Wahren Reviewed-by: Maxime Ripard Signed-off-by: David Turner --- drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 37238a12baa58a06a5d6f40d1ab64abc7fac60d7..37a7d45695f236d3ab281d9a867= 6921fd434955c 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. */ =20 + drm_atomic_helper_connector_hdmi_hotplug(connector, status); + if (status =3D=3D connector_status_disconnected) { cec_phys_addr_invalidate(vc4_hdmi->cec_adap); return; } =20 - drm_atomic_helper_connector_hdmi_hotplug(connector, status); - cec_s_phys_addr(vc4_hdmi->cec_adap, connector->display_info.source_physical_address, false); =20 --=20 2.34.1 From nobody Wed Dec 17 12:06:35 2025 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA61C1FECB8 for ; Mon, 17 Mar 2025 17:13:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742231618; cv=none; b=ZGq9oI1FC0IZveKu4sM/o49XlpsLcAGMPNqlX7eSDMOZWUs0at++0kVfsBdQ5aPVLa8/LTt/y3ED3urtBnYL/BUEOTOl6JmdjKJRn8bYMHdUCRcu2fv+bU6vOO6N1PfUt/ZWMBcWcY0WTYNC6DaB1qOc2zt422Fr5xcTONxys8c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742231618; c=relaxed/simple; bh=Yrp2WBDWbyS4CuMObPwAXQhUd31qFj3zSfQP0EjWyTU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Nu4yBeX/KJwAD5SLyZkjBS1V5HQipPab+yrNXFU/baIheLt9VC/SdglIKEuTKnFibdy70MwDk616YFeO1ex/XcSFLJ8l75HXLRDGPOXchadYkHo1rjltO6GS5vRrHj+j/rPmaOlr5UjcvdXiwgr8xkcr2PdNUt1qXZr6mdDlp60= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com; spf=pass smtp.mailfrom=raspberrypi.com; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b=ssdTqcTG; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="ssdTqcTG" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-43cf58eea0fso12605455e9.0 for ; Mon, 17 Mar 2025 10:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1742231615; x=1742836415; darn=vger.kernel.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=IDlaYwRgBjONniOC+WQROb7al/p94+af7oPPA6nLeCw=; b=ssdTqcTGmeiC2kxcs+fjj9ME7lWwHszT86P0W7Ze7jxXPA9jN37WcpkGdGMYmr7OFr JHZb4UxIshe6GBLulTJN2+3h3JcL3UYbLQXJghYu7xFTi5sOf2MvtBYWSRtqaHz2624C Pz3cUJsQrYPElYMpsq7s3sTmKsLuOkAnffiSo2aZd7+iFxgHOypBfBmDNhf4csEqmcoz W4YqYZDtGX83MEwjTfd/BlChbY3FdFaoXKq/Sjo8tvV3KbIdRS3ndJAU/73bEzc9CVPy Aoh2ctE6xNa6hwlrSjVGc5OLjXe848NL9PQNCtddHyVyAP1nnjaYWgm0r+SvDPqAMxAE VEUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742231615; x=1742836415; 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=IDlaYwRgBjONniOC+WQROb7al/p94+af7oPPA6nLeCw=; b=AcEFPovVvrbrplo1THfDWLPPZnYnZTyW4n7YR1Q07OcApwuZE84e2fUYVxoYJj0UDm UvtHbHuBiYGHs353VFiHpcA/A1f/2NXAuamlz+7kw+j5U1/kUC6mwxdUHWvfT6cNdCaw bY0dZhsmZJEMIV42kSYWj7I0AQSoXZsTjcJ9Kg8GOmWvgZssMKsYLKfE0jUvdeuMF3mk dDUoWxFWXeiDwIhehWm+gyVU3yuQMIVGZ0krPLvQWVdXc/Wi+LU6uNpxrxqmi5COZvN1 41TpK1q5NSe2Z9m6PLWfnuigO1lYzoHE+Njg5GqR20LrB0nMh6uxWKLMVl2TNOL+t9gx IFLA== X-Forwarded-Encrypted: i=1; AJvYcCWvt4MSloHYSH/bGvbsedlHvXJLl1lbbKKPJ2U9RVlQGfT/GKXMcMI8XWjmcLIJHJC9+xiRqMX/C9MSsnc=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2cDnrCA7SpP7Uh9hiB9kHEVU8EZoL6TZeHIVOa7oLprDxKIx5 xfItC8TMGXfsPTajYvDI/K0YeiOD69LbGzI8NbvxjvALyQ1irxvN3Lpkpmbc6wk= X-Gm-Gg: ASbGncuQpP1+kvWScj9ojMUj+4We2NEBmJEXP5W9Af8slC9W+E7O8JIyuY1kN3OGcip aR0BNfDJqxuMceo1UzSwcbbVv8DytGkfqFeBv6X7HEud1uYrLywBsmmLWqNCOA0byMRly92VOqw lxDclNn8usLNdnPNIgeHbsPsvmpdCpuym6iApq5QMbADXvSOvgghnxNXH7cW9vET45bg8JNI00b As8mX8DhZR6FrXG7LfdmgUDwsX0TGDgtoN8OxFvbQrxpGUoYBFLE7CVVy1JxVa9rtg712Y3WLc5 jqy+az0U8gjYdxSEaFB0J1lo6A0TfyuvNQ== X-Google-Smtp-Source: AGHT+IFvMG8C/DswjrgMcrIcB5vcUNJhIfY6inhq7RlXMQ5STO4yZJWkrfjDg2k3WPUIILjObGT+xQ== X-Received: by 2002:a05:600c:511c:b0:43c:fbba:41ba with SMTP id 5b1f17b1804b1-43d1ecd60c1mr126561595e9.28.1742231614956; Mon, 17 Mar 2025 10:13:34 -0700 (PDT) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d1fdda15dsm112003365e9.3.2025.03.17.10.13.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 10:13:34 -0700 (PDT) From: David Turner Date: Mon, 17 Mar 2025 17:12:24 +0000 Subject: [PATCH v4 3/3] drm/vc4: hdmi: Add jack detection to HDMI audio driver Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250317-vc4_hotplug-v4-3-2af625629186@raspberrypi.com> References: <20250317-vc4_hotplug-v4-0-2af625629186@raspberrypi.com> In-Reply-To: <20250317-vc4_hotplug-v4-0-2af625629186@raspberrypi.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , 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 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 Reviewed-by: Maxime Ripard 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..a29a6ef266f9a5952af53030a9a= 2d313e2ecdfce 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 v= c4_hdmi_audio_funcs =3D { .shutdown =3D vc4_hdmi_audio_shutdown, }; =20 +static int vc4_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd) +{ + struct vc4_hdmi *vc4_hdmi =3D snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_component *component =3D snd_soc_rtd_to_codec(rtd, 0)->com= ponent; + int ret; + + ret =3D 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 =3D @@ -2288,6 +2305,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_h= dmi) dai_link->cpus->dai_name =3D dev_name(dev); dai_link->codecs->name =3D dev_name(&vc4_hdmi->connector.hdmi_audio.codec= _pdev->dev); dai_link->platforms->name =3D dev_name(dev); + dai_link->init =3D vc4_hdmi_codec_init; =20 card->dai_link =3D dai_link; card->num_links =3D 1; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h index e3d989ca302b72533c374dfa3fd0d5bd7fe64a82..a31157c99bee6b33527c4b558fc= 72fff65d2a278 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 =20 #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; }; =20 #define connector_to_vc4_hdmi(_connector) \ --=20 2.34.1