From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 2BF52CA0EF3 for ; Mon, 18 Aug 2025 13:37:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:Reply-To:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:Subject: From:MIME-Version:Date:Message-ID:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RTU2rPbWHGM7ZUeT8CiwuwUJE+x9ctf5r2H3JoFqDx0=; b=as2/4LBJPIwsB/93uIBQ54Z7UD dV5UzIaaZAiPLKndnCYEgKjuwpafExR6xcRSgvjAiek4UqD3C3bpQHPWcKna3yzbBvulHaS3pJ+Lo aIC+n832H75hKCUQn8KEc08nTpWGGv89iC1Iv0MP8ewkREWykkJdDkMB1FcamRkbFk0bl857TcTpg R6RVISEEKO9QHPXQ8qPgyCfkrGClQb3R9bKWy3LB2tNxJ64mrlwcMpoKONgL5qMiIQubsZzeinxCT qhw5hpcoPJcK1x31eukD7GSZTpF9buX5zrJkzZhFbyCZ/o0i1nvpiyQWJhCLo7Sth+AYiatNWFYIi JpGGXjCA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uo03H-00000007Tz0-0QdL; Mon, 18 Aug 2025 13:37:31 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1unuuz-00000006ug1-2IJ1 for linux-amlogic@lists.infradead.org; Mon, 18 Aug 2025 08:08:38 +0000 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3b916fda762so2295516f8f.0 for ; Mon, 18 Aug 2025 01:08:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755504516; x=1756109316; darn=lists.infradead.org; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=elEJPdcRzf4AoHzJ3HTFysx+7CDqgMfvBfQYC/vrwSs=; b=Y8vsanV28mKurlCP8Aw8ljyOQpa0IChGrEbY8pxV4WGkACpGUms5kiaFdxKwHo6euf YuNQ4sKsgC3Hyuzt/26P0UiZHUQdSj+Y6vLTSo368UI+vbHA6gtOWTL/OWtuEupdYDrI G5l+G5mJReyNucZL11/TIFrQATib/XZdLYB0wXTA3AVnxq/7t4OtTCpX0q2xBqw2Ee8I Jmw9TMxqljDgMXG09uPBfbAo/50Xwd5Y3AWlsVjwKYG/fZp5sgvfuKsczH60peT2bXDU d8cAt2Z02GtOYgFNAyHcz6DYW+2UWTNXNqNtinfkDKwbyx8AQna3FvApX6qG0TsaYmWe jV4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755504516; x=1756109316; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=elEJPdcRzf4AoHzJ3HTFysx+7CDqgMfvBfQYC/vrwSs=; b=cdeZ0dOlWMQezKT0ydtDYFfUazFjvc19C1qNeirsc5pqO2zMG2qoqgZyPXwMpyxT4j sVlF06ZvPgK3Cq2cg6QJekId5BwSP1xgFe0oNaZDJUWxX9d4blVKPGR64+YfM+9F0hJc SZoFZJ6gVrmXtNybbBz9GST5JfDnSjDIIX+bPfVRYMtm1qoWUzrtSCxeZVtimDxgHkLu L4H9/Z+HXJSeoUPTynwAR/4lT6hP3mZtFIEPymYzCkcjgQXFWA/ZOhHL8LKUhyQI4PWp cJ63rQe0q9HTqVnzrMwLRh8ACfu1RYL0LkphZrbCZXDF4Be8u3IOGIuoz9OGEhe0u2Pr 8uTA== X-Forwarded-Encrypted: i=1; AJvYcCVCwOeg6GeQmorkPTi/UwVfjYN5W+bLKzN3jdEILgM1RP+SyCuhPxKTjXOe2hj9Es8AGJGlBSf71N4XuZWM@lists.infradead.org X-Gm-Message-State: AOJu0Yz/hAMSR7pL1jtIAg0TKBkjMFCWWxYTkkz/P/lYjiGswi+UU3rG WyenLhB63OhImrlmJpS0nQ4SyEjB730339GQaO7i2P69ear83FPTLqtTeSDq/vZrxrI= X-Gm-Gg: ASbGnctyu+vxMyH72Eoy8Pj6y6eQMyd2DQBrayqlb6XtSXSuKw41AodigGJ64wdHI+1 ZwREBuBfEn9TWaQbbp246flV/r8Q6cTJ9WaT/WbRjnkhWfWzRuInwsvkU/R5W+Xp1KO5IP4mDID 3glELNzNRppNwHKEJtxb4GOxmNdGlsmjJ7X2xsqJ9FJj4twnsiyhXT5D6PTV6k5HJTtHqDZvZJN ZCYhsUSrLzI/sDUyqH8bTEmOUvJ81aJaEoqMQ2g27C5OfuvRwRy4eUtcy6/QjPC+N+tdQyzK/5+ WDmcpxpn/lUDkFonOZrfNWwiiXrsCniNfQKjVzFgSbXLzkcz4Mt82QNJtddaRPrETjJMUA07lPL MvO1l3KzDpD/GugqN8N9bOI0bxUP2SXnjY0VEbmlTex+4h4TvmEix2i2Jnd9VaF38H304OwV1 X-Google-Smtp-Source: AGHT+IEV/tKPxIV4CiXdCsoRwjIQw7DcU75vVWJ0k+TKlA/cHd3fxVCK+aTUSCDUGfTKr01x0FeBPw== X-Received: by 2002:a05:6000:18ab:b0:3a5:5130:1c71 with SMTP id ffacd0b85a97d-3bb46fc7df9mr8247891f8f.0.1755504515600; Mon, 18 Aug 2025 01:08:35 -0700 (PDT) Received: from ?IPV6:2a01:e0a:3d9:2080:70d:8646:e014:cc6e? ([2a01:e0a:3d9:2080:70d:8646:e014:cc6e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3bb676ca37fsm11744214f8f.41.2025.08.18.01.08.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 18 Aug 2025 01:08:34 -0700 (PDT) Message-ID: Date: Mon, 18 Aug 2025 10:08:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Neil Armstrong Subject: Re: [PATCH RESEND 2/2] drm/bridge: lontium-lt9611uxc: switch to HDMI audio helpers To: Dmitry Baryshkov , Andrzej Hajda , 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 References: <20250803-lt9611uxc-hdmi-v1-0-cb9ce1793acf@oss.qualcomm.com> <20250803-lt9611uxc-hdmi-v1-2-cb9ce1793acf@oss.qualcomm.com> Content-Language: en-US, fr Autocrypt: addr=neil.armstrong@linaro.org; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKk5laWwgQXJtc3Ryb25nIDxuZWlsLmFybXN0cm9uZ0BsaW5hcm8ub3JnPsLAkQQTAQoA OwIbIwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBInsPQWERiF0UPIoSBaat7Gkz/iuBQJk Q5wSAhkBAAoJEBaat7Gkz/iuyhMIANiD94qDtUTJRfEW6GwXmtKWwl/mvqQtaTtZID2dos04 YqBbshiJbejgVJjy+HODcNUIKBB3PSLaln4ltdsV73SBcwUNdzebfKspAQunCM22Mn6FBIxQ GizsMLcP/0FX4en9NaKGfK6ZdKK6kN1GR9YffMJd2P08EO8mHowmSRe/ExAODhAs9W7XXExw UNCY4pVJyRPpEhv373vvff60bHxc1k/FF9WaPscMt7hlkbFLUs85kHtQAmr8pV5Hy9ezsSRa GzJmiVclkPc2BY592IGBXRDQ38urXeM4nfhhvqA50b/nAEXc6FzqgXqDkEIwR66/Gbp0t3+r yQzpKRyQif3OwE0ETVkGzwEIALyKDN/OGURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYp QTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXMcoJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+ SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hiSvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY 4yG6xI99NIPEVE9lNBXBKIlewIyVlkOaYvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoM Mtsyw18YoX9BqMFInxqYQQ3j/HpVgTSvmo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUX oUk33HEAEQEAAcLAXwQYAQIACQUCTVkGzwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfn M7IbRuiSZS1unlySUVYu3SD6YBYnNi3G5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa3 3eDIHu/zr1HMKErm+2SD6PO9umRef8V82o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCS KmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy 4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJC3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTT QbM0WUIBIcGmq38+OgUsMYu4NzLu7uZFAcmp6h8g Organization: Linaro In-Reply-To: <20250803-lt9611uxc-hdmi-v1-2-cb9ce1793acf@oss.qualcomm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250818_010837_597950_4667A6BE X-CRM114-Status: GOOD ( 26.12 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Neil Armstrong Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org On 03/08/2025 13:53, Dmitry Baryshkov wrote: > 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/bridge/lontium-lt9611uxc.c > index 38fb8776c0f441ae433c60a7680aaa6501a8956e..11aab07d88df646a54fea287030a183eb823b26d 100644 > --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c > +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c > @@ -17,8 +17,6 @@ > #include > #include > > -#include > - > #include > #include > #include > @@ -27,6 +25,8 @@ > #include > #include > > +#include > + > #define EDID_BLOCK_SIZE 128 > #define EDID_NUM_BLOCKS 2 > > @@ -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; > > struct gpio_desc *reset_gpio; > struct gpio_desc *enable_gpio; > @@ -429,12 +428,52 @@ static const struct drm_edid *lt9611uxc_bridge_edid_read(struct drm_bridge *brid > return drm_edid_read_custom(connector, lt9611uxc_get_edid_block, lt9611uxc); > } > > +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 == connector_status_disconnected) { > + drm_connector_hdmi_audio_plugged_notify(connector, false); > + drm_edid_connector_update(connector, NULL); > + return; > + } > + > + drm_edid = lt9611uxc_bridge_edid_read(bridge, connector); > + drm_edid_connector_update(connector, drm_edid); > + drm_edid_free(drm_edid); > + > + if (status == 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 = { > .attach = lt9611uxc_bridge_attach, > .mode_valid = lt9611uxc_bridge_mode_valid, > .mode_set = lt9611uxc_bridge_mode_set, > .detect = lt9611uxc_bridge_detect, > .edid_read = lt9611uxc_bridge_edid_read, > + .hpd_notify = lt9611uxc_bridge_hpd_notify, > + .hdmi_audio_prepare = lt9611uxc_hdmi_audio_prepare, > + .hdmi_audio_shutdown = lt9611uxc_hdmi_audio_shutdown, > }; > > static int lt9611uxc_parse_dt(struct device *dev, > @@ -508,73 +547,6 @@ static int lt9611uxc_read_version(struct lt9611uxc *lt9611uxc) > return ret < 0 ? ret : rev; > } > > -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 *component, > - struct device_node *endpoint, > - void *data) > -{ > - struct of_endpoint of_ep; > - int ret; > - > - ret = of_graph_parse_endpoint(endpoint, &of_ep); > - if (ret < 0) > - return ret; > - > - /* > - * HDMI sound should be located as reg = <2> > - * Then, it is sound port 0 > - */ > - if (of_ep.port == 2) > - return 0; > - > - return -EINVAL; > -} > - > -static const struct hdmi_codec_ops lt9611uxc_codec_ops = { > - .hw_params = lt9611uxc_hdmi_hw_params, > - .audio_shutdown = lt9611uxc_audio_shutdown, > - .get_dai_id = lt9611uxc_hdmi_i2s_get_dai_id, > -}; > - > -static int lt9611uxc_audio_init(struct device *dev, struct lt9611uxc *lt9611uxc) > -{ > - struct hdmi_codec_pdata codec_data = { > - .ops = <9611uxc_codec_ops, > - .max_i2s_channels = 2, > - .i2s = 1, > - .data = lt9611uxc, > - }; > - > - lt9611uxc->audio_pdev = > - 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 = 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); > > lt9611uxc->bridge.of_node = client->dev.of_node; > - lt9611uxc->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID; > + lt9611uxc->bridge.ops = DRM_BRIDGE_OP_DETECT | > + DRM_BRIDGE_OP_EDID | > + DRM_BRIDGE_OP_HDMI_AUDIO; > if (lt9611uxc->hpd_supported) > lt9611uxc->bridge.ops |= DRM_BRIDGE_OP_HPD; > lt9611uxc->bridge.type = DRM_MODE_CONNECTOR_HDMIA; > > + lt9611uxc->bridge.hdmi_audio_dev = dev; > + lt9611uxc->bridge.hdmi_audio_max_i2s_playback_channels = 2; > + lt9611uxc->bridge.hdmi_audio_dai_port = 2; > + > drm_bridge_add(<9611uxc->bridge); > > /* Attach primary DSI */ > @@ -881,10 +859,6 @@ static int lt9611uxc_probe(struct i2c_client *client) > } > } > > - ret = lt9611uxc_audio_init(dev, lt9611uxc); > - if (ret) > - goto err_remove_bridge; > - > return 0; > > err_remove_bridge: > @@ -908,7 +882,6 @@ static void lt9611uxc_remove(struct i2c_client *client) > > free_irq(client->irq, lt9611uxc); > cancel_work_sync(<9611uxc->work); > - lt9611uxc_audio_exit(lt9611uxc); > drm_bridge_remove(<9611uxc->bridge); > > mutex_destroy(<9611uxc->ocm_lock); > LGTM Reviewed-by: Neil Armstrong _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic