From patchwork Wed Feb 19 13:00:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13982166 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 63660C021AA for ; Wed, 19 Feb 2025 13:00:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D8D6510E7EB; Wed, 19 Feb 2025 13:00:42 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="O4CNuiW6"; dkim-atps=neutral Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by gabe.freedesktop.org (Postfix) with ESMTPS id DDBC410E7EB for ; Wed, 19 Feb 2025 13:00:38 +0000 (UTC) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-5461a485aa2so3104201e87.2 for ; Wed, 19 Feb 2025 05:00:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739970037; x=1740574837; 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=Hyt2aJC9WtTbvDjyGKTp5US9Ym/jYLQQ/Fi2KJapvfQ=; b=O4CNuiW6M9aPInUg2pMNIDZsw2TfjV39J0AzT8DnJBDrRJ+ph7v5yMcCIeVqrRZHt0 +T2drQ2288qOj4BdZcCLi0AjgW7j+38soLY9zyI1JiKLTrgoGY4SJnO3l8d8q7FXKi+e U+bpr56/c3VUQvzdevbRgRTluDDYJrWT+T3yr0L542rrN37Qp9W3YWds+v+sFDFhCVXe qsrs8hNX+nCerCqYikpz65Lj5s3tbtjFmcGXA+stJKM8V5K5xdxlANCylm2Vb1bqegDz V36SYYlJbL0+0CRgjxmRnp1/8NRLia2CIGDBmTMpPaDN39RK4PJ0ys9km54b2/qJeF7Y CX0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739970037; x=1740574837; 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=Hyt2aJC9WtTbvDjyGKTp5US9Ym/jYLQQ/Fi2KJapvfQ=; b=iVO0+hQnkEzwEuEvsvPwRxN2sWdhA4NszctDJM2Lw4EIutIrBEdrmbvbPucKfrmuIf JSznOIsCQBgzaQeXUKAO7h7sG3pcq4YMDe2MEBmnv8Eg4AHjPDiYRSAg/aUV8Xi7L5At 7HA2g/B7AbdObnlNpOwu0pEDiGjEJ9M1kQH8CO1eTlYnAJ/plAy1mkSxw7us67HsooiB bWXRamFwv3XMxtevYovgcohDjFqecKcWorpuqLze0vTQQxxzNb1ck6zfX9at/JSsm45o FpzVok4r0jVPt43iNrRC9dtroYgdTRCoEcT3iK7/eaYd3nEv0gNkyISqBthg2y3SW0i7 8a5g== X-Gm-Message-State: AOJu0Yw/v04vgGV4lZ1GKZH0+ExjrqTG501ZHdLxA45uLTPckBp2H5vi XjBSGr0sWBxupgHjt1s6TenzESWGiZMq1LEmXyms+8veafF5UPuAJJMu9dtbz/4= X-Gm-Gg: ASbGnctU9FH2NSXcKEL+GIRaP6/zLGo1hatXok7Tn60Hl8NIfpq4zFmpykIafS5WbOX k5uGTkYEzQEip8txxXQAdVB94kl7UgI1ZCweJzcreiAE5gDcQLL6fgwYU3SZD28/g+Q4CXRqHpx BM+OR1xBDAW/xsY06Uf6J6H7NgMB6IGJcwwpvXVWJ1SU3MOCQJupeU0j9RN2gmqZUgeg60IKIVy I0XHzydL2CduQkInb/7A/KJmPUjGm5AaNRpcoNkesgKixHhBVgRd3EiSLg8F+d8/IktGAUaIgcA HmeKPyZz+CcnoRuRtdinnVk= X-Google-Smtp-Source: AGHT+IFSjOqhEeeXiJV4CZUukFLud+LZ+cKhSxvBhcfJdaf32GIRFicOUEbicv7Ah7Zu6MZXOndIpw== X-Received: by 2002:a05:6512:2398:b0:545:ee3:f3c7 with SMTP id 2adb3069b0e04-5462eef4e56mr1422130e87.30.1739970037101; Wed, 19 Feb 2025 05:00:37 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5451f105a3dsm2179515e87.144.2025.02.19.05.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 05:00:35 -0800 (PST) From: Dmitry Baryshkov Date: Wed, 19 Feb 2025 15:00:30 +0200 Subject: [PATCH v3 1/2] drm/bridge: split HDMI Audio from DRM_BRIDGE_OP_HDMI MIME-Version: 1.0 Message-Id: <20250219-dp-hdmi-audio-v3-1-42900f034b40@linaro.org> References: <20250219-dp-hdmi-audio-v3-0-42900f034b40@linaro.org> In-Reply-To: <20250219-dp-hdmi-audio-v3-0-42900f034b40@linaro.org> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , Hermes Wu Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.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=7153; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=5tKH69LPnXtw2g2lgp5pOEeBRn775Kcy79G0bglGhPo=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBntdXx5Rfpjs7QrSW5Sqc27lyKyEYdNlobBgrno dH0zn3wNMGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ7XV8QAKCRCLPIo+Aiko 1faVCACwzQ+HmZRWj9pVGQ0FxDqNILIlaX1r5rQYmr/5OkHPuBlFez/H2reFj80/208eWC3Jt/F 4w/dszTC6Mavd98pVxDwG4uLrBN4WRB0vz01gg2HJ8A5HflmMSVkzyTKKi3zYgPdL7qbHdTjfKL 7CBu5YlwG2xFNiph1dNcADSY1oOjWZSXDKm5haeaxq6OMz/TLcuRa/72FlA27hrbopzWxhAydDh nP4mmhmTtUhD1ow/wTNud8BRWS7PJ5nLHJ7Gmz43lxg0uKcJ3vS+HorkhfSSmXT1J3rddFOOHpx aMrbBOlYFaZIm7QchyZUQ9R763/xbRGymttkFBrrrv8ir15h X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A 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" As pointed out by Laurent, OP bits are supposed to describe operations. Split DRM_BRIDGE_OP_HDMI_AUDIO from DRM_BRIDGE_OP_HDMI instead of overloading DRM_BRIDGE_OP_HDMI. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/bridge/lontium-lt9611.c | 2 +- drivers/gpu/drm/display/drm_bridge_connector.c | 59 +++++++++++++++++--------- include/drm/drm_bridge.h | 23 ++++++++-- 3 files changed, 59 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c index e650cd83fc8d880012edb8a85c69b2f1d378f64c..6cb9039ee7c4720b3512adb5a591b1b84ee32107 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c @@ -1134,7 +1134,7 @@ static int lt9611_probe(struct i2c_client *client) lt9611->bridge.of_node = client->dev.of_node; lt9611->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID | DRM_BRIDGE_OP_HPD | DRM_BRIDGE_OP_MODES | - DRM_BRIDGE_OP_HDMI; + DRM_BRIDGE_OP_HDMI | DRM_BRIDGE_OP_HDMI_AUDIO; lt9611->bridge.type = DRM_MODE_CONNECTOR_HDMIA; lt9611->bridge.vendor = "Lontium"; lt9611->bridge.product = "LT9611"; diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c index 30c736fc0067e31a97db242e5b16ea8a5b4cf359..030f98d454608a63154827c65d4822d378df3b4c 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -98,6 +98,13 @@ struct drm_bridge_connector { * HDMI connector infrastructure, if any (see &DRM_BRIDGE_OP_HDMI). */ struct drm_bridge *bridge_hdmi; + /** + * @bridge_hdmi_audio: + * + * The bridge in the chain that implements necessary support for the + * HDMI Audio infrastructure, if any (see &DRM_BRIDGE_OP_HDMI_AUDIO). + */ + struct drm_bridge *bridge_hdmi_audio; }; #define to_drm_bridge_connector(x) \ @@ -433,7 +440,7 @@ static int drm_bridge_connector_audio_startup(struct drm_connector *connector) to_drm_bridge_connector(connector); struct drm_bridge *bridge; - bridge = bridge_connector->bridge_hdmi; + bridge = bridge_connector->bridge_hdmi_audio; if (!bridge) return -EINVAL; @@ -451,7 +458,7 @@ static int drm_bridge_connector_audio_prepare(struct drm_connector *connector, to_drm_bridge_connector(connector); struct drm_bridge *bridge; - bridge = bridge_connector->bridge_hdmi; + bridge = bridge_connector->bridge_hdmi_audio; if (!bridge) return -EINVAL; @@ -464,7 +471,7 @@ static void drm_bridge_connector_audio_shutdown(struct drm_connector *connector) to_drm_bridge_connector(connector); struct drm_bridge *bridge; - bridge = bridge_connector->bridge_hdmi; + bridge = bridge_connector->bridge_hdmi_audio; if (!bridge) return; @@ -478,7 +485,7 @@ static int drm_bridge_connector_audio_mute_stream(struct drm_connector *connecto to_drm_bridge_connector(connector); struct drm_bridge *bridge; - bridge = bridge_connector->bridge_hdmi; + bridge = bridge_connector->bridge_hdmi_audio; if (!bridge) return -EINVAL; @@ -576,6 +583,21 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, max_bpc = bridge->max_bpc; } + if (bridge->ops & DRM_BRIDGE_OP_HDMI_AUDIO) { + if (bridge_connector->bridge_hdmi_audio) + return ERR_PTR(-EBUSY); + + if (!bridge->hdmi_audio_max_i2s_playback_channels && + !bridge->hdmi_audio_spdif_playback) + return ERR_PTR(-EINVAL); + + if (!bridge->funcs->hdmi_audio_prepare || + !bridge->funcs->hdmi_audio_shutdown) + return ERR_PTR(-EINVAL); + + bridge_connector->bridge_hdmi_audio = bridge; + } + if (!drm_bridge_get_next_bridge(bridge)) connector_type = bridge->type; @@ -611,22 +633,6 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, max_bpc); if (ret) return ERR_PTR(ret); - - if (bridge->hdmi_audio_max_i2s_playback_channels || - bridge->hdmi_audio_spdif_playback) { - if (!bridge->funcs->hdmi_audio_prepare || - !bridge->funcs->hdmi_audio_shutdown) - return ERR_PTR(-EINVAL); - - ret = drm_connector_hdmi_audio_init(connector, - bridge->hdmi_audio_dev, - &drm_bridge_connector_hdmi_audio_funcs, - bridge->hdmi_audio_max_i2s_playback_channels, - bridge->hdmi_audio_spdif_playback, - bridge->hdmi_audio_dai_port); - if (ret) - return ERR_PTR(ret); - } } else { ret = drmm_connector_init(drm, connector, &drm_bridge_connector_funcs, @@ -635,6 +641,19 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, return ERR_PTR(ret); } + if (bridge_connector->bridge_hdmi_audio) { + bridge = bridge_connector->bridge_hdmi_audio; + + ret = drm_connector_hdmi_audio_init(connector, + bridge->hdmi_audio_dev, + &drm_bridge_connector_hdmi_audio_funcs, + bridge->hdmi_audio_max_i2s_playback_channels, + bridge->hdmi_audio_spdif_playback, + bridge->hdmi_audio_dai_port); + if (ret) + return ERR_PTR(ret); + } + drm_connector_helper_add(connector, &drm_bridge_connector_helper_funcs); if (bridge_connector->bridge_hpd) diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 496dbbd2ad7edff7f091adfbe62de1e33ef0cf07..90b7b8070748a104ffca021e669f78e4d4b993e7 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -693,8 +693,10 @@ struct drm_bridge_funcs { /** * @hdmi_audio_prepare: * Configures HDMI-encoder for audio stream. Can be called multiple - * times for each setup. Mandatory if HDMI audio is enabled in the - * bridge's configuration. + * times for each setup. + * + * This callback is optional but it must be implemented by bridges that + * set the DRM_BRIDGE_OP_HDMI_AUDIO flag in their &drm_bridge->ops. * * Returns: * 0 on success, a negative error code otherwise @@ -707,8 +709,10 @@ struct drm_bridge_funcs { /** * @hdmi_audio_shutdown: * - * Shut down the audio stream. Mandatory if HDMI audio is enabled in - * the bridge's configuration. + * Shut down the audio stream. + * + * This callback is optional but it must be implemented by bridges that + * set the DRM_BRIDGE_OP_HDMI_AUDIO flag in their &drm_bridge->ops. * * Returns: * 0 on success, a negative error code otherwise @@ -814,6 +818,17 @@ enum drm_bridge_ops { * drivers. */ DRM_BRIDGE_OP_HDMI = BIT(4), + /** + * @DRM_BRIDGE_OP_HDMI_AUDIO: The bridge provides HDMI audio operations. + * Bridges that set this flag must implement the + * &drm_bridge_funcs->hdmi_audio_prepare and + * &drm_bridge_funcs->hdmi_audio_shutdown callbacks. + * + * Note: currently there can be at most one bridge in a chain that sets + * this bit. This is to simplify corresponding glue code in connector + * drivers. + */ + DRM_BRIDGE_OP_HDMI_AUDIO = BIT(5), }; /**