From nobody Mon Oct 6 19:09:19 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 624A22DCF40 for ; Fri, 18 Jul 2025 15:21:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752852095; cv=none; b=pMQ/szJfqpMTHfFzo+RgPHuUBjTczob8EElC4mU/X+ANp7ZOhToR2F/wA1bGWELsOd6XKCLEs8rLLOcRvGq7b4kfjhId1X/RrCWcEG/gYfrGenJ6vtWNcQYKYR7qDx3rJqdniNo8DoNh+8es7zY0W1G+KF/0hjLPFwkhA4J+j7o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752852095; c=relaxed/simple; bh=Q7HopIOTnY6OvjIs/ZdbZ8AVdNk/D/2TLd7Vbpjb/sM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pArRbMUJo3o3/zSi7yr33iekVKD0MbcC/tsuP+t8nMaLMY7shuxbwW+DkHeEMfg8z2AnJ/o2p+b9ZvhKqsTIgyEoe2Hlk7TE7tWdXGrXE8jVmodSIRArvRcc+aD9kZKL1MimdcsH4/l7wKvd2N3PpUyjY9RrXBFOi59rx/8Igzg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=AmltrWNG; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="AmltrWNG" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56I9696t022149 for ; Fri, 18 Jul 2025 15:21:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= OarMjpCIfYSkdkdW6bUdGi1fdmdKOoKfw0cvB3ckh4U=; b=AmltrWNGxBmj1k6t l9UbP6BkHkJ0vnsjLYXr4wIitr05ohWFpIytlM/Tevby84MPsPuIY+SPnVGcQpQW cmy5wMiKyMCiil4fIhvBKKvNIU974RBeIRkiaCf+CaEfwM57SPUBgcjy3PNZy8RA flOLAvwkV15PnN16rJQBTb7LGcDnILIG/Ai9kZNxz1VpRiZ7tJ+Dx8C/DEAcZWgZ F5PA68+8HeAcnPUPupsc/xS3uMzTvez2jeEhp6FRYeD3a278oU/Rrl+yj9l67WgA l27EeKTEjNRiy+bX3tLBJZt3ynF171R3c85Lau/bKOvx0cgw8Dx07aA0jFPr6cHe IooKmQ== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47ufu8kvts-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 18 Jul 2025 15:21:31 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7e095227f5dso349786285a.1 for ; Fri, 18 Jul 2025 08:21:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752852091; x=1753456891; 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=OarMjpCIfYSkdkdW6bUdGi1fdmdKOoKfw0cvB3ckh4U=; b=BQCsSU2Ol42DVL0noYUCncOE5h9k1+cpRRZ8b2sVqauvg3iFrgwQlVyn376ckJZGip W0iLf/9dY8FZk9SpTJq4Hm0+z0mgKyGjCIzN+T1KMYv/gpBLXeLsOkKzTrOHLMLSceIz CX/W1cMgQjEZ+M+M7dZpFPtI2wpU8hpsem71gGz13bSpU4vE/t7YSQM644nU0h3l9DSk 5RABZtwM/OwSmGGWshmgCoDHI0EtCFFg/XSn6j5WPEhRU/QAee1+U+kcfrBlYrcn37eL D5eLW38GvaPE9b0sogKFSS5X+YBv29ZF3fmwd0qxlyF2Ut1GsITSBJDUvMx+3fYPmy4o 4b/g== X-Forwarded-Encrypted: i=1; AJvYcCW99twLsxNMbeYcmPZejjUrIOWfno1fS+uzAViirS2FeofPmxI6+f0gRu4VmKDxvc6kIF+qnrH5QV1lIu0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1TC3XLY3uDfVt7EzYM2nV0QN0wKQW0Y5c+Egw84EAu1p5pwR8 y1CyH5Y3mYSdNCjfvUz15i8+U6nZ9AsK42/gjH31TqnpIgWnnbqfcEeTxJYQOC16VBD7jFonVev roNCt6ajcif+7QIeihJwiKIVAUvGxhgwJlfZ4Afx/6ZEZc8WZfytY3gM3Skvq/r03gLA= X-Gm-Gg: ASbGnctjHiVxuRsSWCqGmUrogM/kS+f31CRVbAQvrtlLIYOAtrm1NTlQHHxZUGkP+ZA Fc9mVKk/Mb6Vi62QXIsh41CScrMTSHeFBXO2vkSAJF3umwOtF/F3/gU4UzCdkDybYOlGboHjq81 IOhpUvPiZfjfQ35FqS3r9xeRVzmXuoqn6A3GxW70f5yAWBN8O865GXDNBJoLNQ8Cepuq9wOxRfX /lXFHwY7+0eKjBbVrqiW0W71M3zfgtLEEF83SnGOMFx2bLJWq1XtWOdUbO3ITPVZh53RbhybUOw Y2586G5nbZi+bpE7iZaKNzoQNQmPf9opTL26kWt0U5YpfmSHTlYkh3Wvh02gx76OvAcsyw4MfLO q2cx/BYgGgsJrfu0ODVSDj9jWqvfwRZlUo344yva47pdUmJipfHud X-Received: by 2002:a05:620a:2603:b0:7d6:f963:8764 with SMTP id af79cd13be357-7e342b37069mr1196336785a.34.1752852090403; Fri, 18 Jul 2025 08:21:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHeURN+rUaIOAwCaTzNTedfaTWOZy5Nxma8It0geQsI3eLuCA+/iQCIFo8edRjZEHH8GcSBIQ== X-Received: by 2002:a05:620a:2603:b0:7d6:f963:8764 with SMTP id af79cd13be357-7e342b37069mr1196330285a.34.1752852089500; Fri, 18 Jul 2025 08:21:29 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-330a91f09a9sm2515041fa.94.2025.07.18.08.21.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 08:21:28 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 18 Jul 2025 18:21:09 +0300 Subject: [PATCH 2/2] drm/bridge: lontium-lt9611uxc: switch to HDMI audio helpers 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: <20250718-lt9611uxc-hdmi-v1-2-0aa8dd26a57a@oss.qualcomm.com> References: <20250718-lt9611uxc-hdmi-v1-0-0aa8dd26a57a@oss.qualcomm.com> In-Reply-To: <20250718-lt9611uxc-hdmi-v1-0-0aa8dd26a57a@oss.qualcomm.com> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , Tomi Valkeinen Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6559; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Q7HopIOTnY6OvjIs/ZdbZ8AVdNk/D/2TLd7Vbpjb/sM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoemZmEnuVxVTiBauoE5GOOhp4UYUNPIRbkjxA+ vP9nSa4LxuJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaHpmZgAKCRCLPIo+Aiko 1ThbCACCWtCZUZEl8wBu44nYByLMT3AoQo5Nv7kagMOgNvKKnel1JkIbcUW4tnGoRpepDUXqyz/ LmSY4a/at4X19BiDN7XVw91+3cuJYXyw3dPZPnbG2LsnSfNWcYvFy75XRVdAoMfz/Vi1rax5Urr PJJWamnVnvyGyz0Gw3OqWnJ0Gep2/a5Ou6W/VGX7NzkoeOssJRObPzVofbsSYaxrLmlaMLaWsGo qkEcwHmKq4KW6j4QV/bLkBngpJS/5YjCZevhWzVWpf7ZiKxp4Z4Tp3021IlsPMHHwNsiLr52dDA RUxmPm0kQRGBEqqfHulxyC2oCt/GSMUdAx9K5KynWD4c+9WF X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzE4MDExOSBTYWx0ZWRfX+z48DnRbz6Ia aA1JdzyGFlr19Y1xbMsLchb+f+0WKm4iLvdHvBY0FlNwq+5JPmebAH896tNI/+bjquUb1Mud/3g D2iMaNJwS6QCEhxY+pxWgRGkCNnN3VlrqlbA1gypRZ9lLFqxwV7oB1ZVSPPSw/Ngw/FB4HtT/rt 6ON5LoMMvktM+lu7F/0K+EPnydsn9cyBhYW/GQgQL34DkGiIs1bDB0f+6S8TOkNe9LzmCUBcl6z OwjJM2ZvtMaxTxLtNLo9tXFo9DeY8oy5xDmX5GgsImstz3K7h/GEPdDlgSR+Wn4IzK20TzIZsLi gTzzCkJVC2Y1m6ut67DlVwAojWA7tQTcWJ5A/7Juh2RNNdrabPm6oECn2gT9W+dkah94DtRRqYz mSolRbLmwoq4dUbvdmfjiZzQGRN9tJL86qirTBu4vqVPPjpM0JNRfCMKjNqRSNpneGzqdETw X-Proofpoint-ORIG-GUID: 7eAfGhP41_AC_YA_WxrVj3K7vKUnJP-e X-Proofpoint-GUID: 7eAfGhP41_AC_YA_WxrVj3K7vKUnJP-e X-Authority-Analysis: v=2.4 cv=f59IBPyM c=1 sm=1 tr=0 ts=687a667b cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=rji8DJjHHTBzgOBfyK4A:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-18_03,2025-07-17_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 spamscore=0 mlxscore=0 bulkscore=0 suspectscore=0 impostorscore=0 adultscore=0 priorityscore=1501 mlxlogscore=999 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507180119 While LT9611UXC is a DSI-to-HDMI bridge, it implements all HDMI-related functions internally, in the firmware, thus it doesn't make sense to implement DRM_BRIDGE_OP_HDMI. However it is possible to implement DRM_BRIDGE_OP_HDMI_AUDIO, streamlining HDMI audio plumbing (which includes plugged notifications and ELD handling). Implement corresponding callbacks and trigger EDID read / drm_connector_hdmi_audio_plugged_notify() from the hpd_notify callback. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 125 +++++++++++--------------= ---- 1 file changed, 49 insertions(+), 76 deletions(-) diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/b= ridge/lontium-lt9611uxc.c index 38fb8776c0f441ae433c60a7680aaa6501a8956e..11aab07d88df646a54fea287030= a183eb823b26d 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c @@ -17,8 +17,6 @@ #include #include =20 -#include - #include #include #include @@ -27,6 +25,8 @@ #include #include =20 +#include + #define EDID_BLOCK_SIZE 128 #define EDID_NUM_BLOCKS 2 =20 @@ -48,7 +48,6 @@ struct lt9611uxc { struct device_node *dsi1_node; struct mipi_dsi_device *dsi0; struct mipi_dsi_device *dsi1; - struct platform_device *audio_pdev; =20 struct gpio_desc *reset_gpio; struct gpio_desc *enable_gpio; @@ -429,12 +428,52 @@ static const struct drm_edid *lt9611uxc_bridge_edid_r= ead(struct drm_bridge *brid return drm_edid_read_custom(connector, lt9611uxc_get_edid_block, lt9611ux= c); } =20 +static void lt9611uxc_bridge_hpd_notify(struct drm_bridge *bridge, + struct drm_connector *connector, + enum drm_connector_status status) +{ + const struct drm_edid *drm_edid; + + if (status =3D=3D connector_status_disconnected) { + drm_connector_hdmi_audio_plugged_notify(connector, false); + drm_edid_connector_update(connector, NULL); + return; + } + + drm_edid =3D lt9611uxc_bridge_edid_read(bridge, connector); + drm_edid_connector_update(connector, drm_edid); + drm_edid_free(drm_edid); + + if (status =3D=3D connector_status_connected) + drm_connector_hdmi_audio_plugged_notify(connector, true); +} + +static int lt9611uxc_hdmi_audio_prepare(struct drm_bridge *bridge, + struct drm_connector *connector, + struct hdmi_codec_daifmt *fmt, + struct hdmi_codec_params *hparms) +{ + /* + * LT9611UXC will automatically detect rate and sample size, so no need + * to setup anything here. + */ + return 0; +} + +static void lt9611uxc_hdmi_audio_shutdown(struct drm_bridge *bridge, + struct drm_connector *connector) +{ +} + static const struct drm_bridge_funcs lt9611uxc_bridge_funcs =3D { .attach =3D lt9611uxc_bridge_attach, .mode_valid =3D lt9611uxc_bridge_mode_valid, .mode_set =3D lt9611uxc_bridge_mode_set, .detect =3D lt9611uxc_bridge_detect, .edid_read =3D lt9611uxc_bridge_edid_read, + .hpd_notify =3D lt9611uxc_bridge_hpd_notify, + .hdmi_audio_prepare =3D lt9611uxc_hdmi_audio_prepare, + .hdmi_audio_shutdown =3D lt9611uxc_hdmi_audio_shutdown, }; =20 static int lt9611uxc_parse_dt(struct device *dev, @@ -508,73 +547,6 @@ static int lt9611uxc_read_version(struct lt9611uxc *lt= 9611uxc) return ret < 0 ? ret : rev; } =20 -static int lt9611uxc_hdmi_hw_params(struct device *dev, void *data, - struct hdmi_codec_daifmt *fmt, - struct hdmi_codec_params *hparms) -{ - /* - * LT9611UXC will automatically detect rate and sample size, so no need - * to setup anything here. - */ - return 0; -} - -static void lt9611uxc_audio_shutdown(struct device *dev, void *data) -{ -} - -static int lt9611uxc_hdmi_i2s_get_dai_id(struct snd_soc_component *compone= nt, - struct device_node *endpoint, - void *data) -{ - struct of_endpoint of_ep; - int ret; - - ret =3D of_graph_parse_endpoint(endpoint, &of_ep); - if (ret < 0) - return ret; - - /* - * HDMI sound should be located as reg =3D <2> - * Then, it is sound port 0 - */ - if (of_ep.port =3D=3D 2) - return 0; - - return -EINVAL; -} - -static const struct hdmi_codec_ops lt9611uxc_codec_ops =3D { - .hw_params =3D lt9611uxc_hdmi_hw_params, - .audio_shutdown =3D lt9611uxc_audio_shutdown, - .get_dai_id =3D lt9611uxc_hdmi_i2s_get_dai_id, -}; - -static int lt9611uxc_audio_init(struct device *dev, struct lt9611uxc *lt96= 11uxc) -{ - struct hdmi_codec_pdata codec_data =3D { - .ops =3D <9611uxc_codec_ops, - .max_i2s_channels =3D 2, - .i2s =3D 1, - .data =3D lt9611uxc, - }; - - lt9611uxc->audio_pdev =3D - platform_device_register_data(dev, HDMI_CODEC_DRV_NAME, - PLATFORM_DEVID_AUTO, - &codec_data, sizeof(codec_data)); - - return PTR_ERR_OR_ZERO(lt9611uxc->audio_pdev); -} - -static void lt9611uxc_audio_exit(struct lt9611uxc *lt9611uxc) -{ - if (lt9611uxc->audio_pdev) { - platform_device_unregister(lt9611uxc->audio_pdev); - lt9611uxc->audio_pdev =3D NULL; - } -} - #define LT9611UXC_FW_PAGE_SIZE 32 static void lt9611uxc_firmware_write_page(struct lt9611uxc *lt9611uxc, u16= addr, const u8 *buf) { @@ -858,11 +830,17 @@ static int lt9611uxc_probe(struct i2c_client *client) i2c_set_clientdata(client, lt9611uxc); =20 lt9611uxc->bridge.of_node =3D client->dev.of_node; - lt9611uxc->bridge.ops =3D DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID; + lt9611uxc->bridge.ops =3D DRM_BRIDGE_OP_DETECT | + DRM_BRIDGE_OP_EDID | + DRM_BRIDGE_OP_HDMI_AUDIO; if (lt9611uxc->hpd_supported) lt9611uxc->bridge.ops |=3D DRM_BRIDGE_OP_HPD; lt9611uxc->bridge.type =3D DRM_MODE_CONNECTOR_HDMIA; =20 + lt9611uxc->bridge.hdmi_audio_dev =3D dev; + lt9611uxc->bridge.hdmi_audio_max_i2s_playback_channels =3D 2; + lt9611uxc->bridge.hdmi_audio_dai_port =3D 2; + drm_bridge_add(<9611uxc->bridge); =20 /* Attach primary DSI */ @@ -881,10 +859,6 @@ static int lt9611uxc_probe(struct i2c_client *client) } } =20 - ret =3D lt9611uxc_audio_init(dev, lt9611uxc); - if (ret) - goto err_remove_bridge; - return 0; =20 err_remove_bridge: @@ -908,7 +882,6 @@ static void lt9611uxc_remove(struct i2c_client *client) =20 free_irq(client->irq, lt9611uxc); cancel_work_sync(<9611uxc->work); - lt9611uxc_audio_exit(lt9611uxc); drm_bridge_remove(<9611uxc->bridge); =20 mutex_destroy(<9611uxc->ocm_lock); --=20 2.39.5