From nobody Mon Feb 9 01:35:02 2026 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 7BC5A1E51EB for ; Sat, 1 Mar 2025 17:11:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740849068; cv=none; b=k8GKptqy+imsHgf/B58ksqfHFh29HVFKhGALPhPF22VNxjunWCTYZExSFJ/Xg8cWPYZoeI0EVEcKwKkvDS90N9m7dXFzCI394Disu3gEKTiHKTTDjUFO3cDp/hNMs3TyYc/W84wS2VuXPvpPVJn+Ok1YTcq0Iej4mMitWltcfcw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740849068; c=relaxed/simple; bh=0KZ6BjD9kkbPOzEapQgVo4Pi20+SxI1Up4046oJIkmw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NJpyrcLHVr4NAyoYZnTDLq7qmNtLFjUDvfNSDd0A++OPOnSoqup5UCLh7hcD9kM7ADl2L+5DS6Bfi7R5gFgZsvUjsF/i29d0NK6D8RVBxQs7yZLU3gx4vu4jKn3eAZVqzTrknSsz5TFZKW77il3CPa85dTxYpjX02MMOiRNE30Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=SC1MP5NP; arc=none smtp.client-ip=209.85.167.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="SC1MP5NP" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-546210287c1so3181899e87.2 for ; Sat, 01 Mar 2025 09:11:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740849062; x=1741453862; 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=8sa7U0X8/8uGLoVtUTqFfyP06cJiyIzwQdCxGbYAjt0=; b=SC1MP5NPBbb8Lq1rpKM+YCHZ76cZSondpPmbbVlzoYDVhSIHGTxXmQmsRIH0J5mTy2 5b06sbQrNnyc8KDi4Y5HAzhzw1Dqlslcma6QY8ozZJi9slzYYZkvbqVXnEW1Y56j8Pv9 dhR6c8b575SGlchj+n1RcyJq10pGp4y+1RCxj4059waG6IeoFEBi9TE8+EcpYpNIzXs2 F8AFkYv8QR5jOtnT+3geVqfexEg3yCQkMZF3a/UeWwqvoTzBsBasksGq9cjqMueeSIWC SXe48DrnyiTUjeRnxKLNWxKtrEN4Ibci7Hq1Xz4QzKINk7m8qAUxsDcErnHn6cjsUNA1 LGBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740849062; x=1741453862; 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=8sa7U0X8/8uGLoVtUTqFfyP06cJiyIzwQdCxGbYAjt0=; b=aBjo9KJ1nBe8skWUkcYgWMCXICrZ/q6K72deHNJ/A9aQ+f2RwftcbT6xfUpSeXnVkS B0uNnUJxljAsmjju6xoKZNGbq6ZTM1wMxKcL+JEna+XCP/ud+n40NUa06eUVBQ+HlZgi WyRO9/TJRyOTj+4S6Wkube9ZKn9/j8GdgFdMrpJN2jsQTEZV6sVG6kQEWiWzNu34uojl IgGBtD3xoOf94C4VBFvzVpgGGGK2o9OG4mk9aBBAq4I4MOeZpzHFm1J+7K+jr3C+1nI/ zl5jFuqT2AyfnZjPGctruJ4XuwnxZa1Y/Ma2+WsmZc6FM+j79UfuTi+DZGIlJ240Er0F o3mA== X-Forwarded-Encrypted: i=1; AJvYcCX72RonRdWPa6FqEQEoUYzLljsgb/T6rNRq+rwYZVDwn+jkskDRdFAGBLeB609jiJB6Zq+jwwFQqZA/Tsw=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9dxMdL5cgcNIOhDzjxTG+NecCTaKFf0wAglwYPqT/KiJVobGi kXR+GZ7IuqI4OeYiitI8xqL49mnNgFr6lXluoqrmWRyWNZlU/v3vdPwSj13CUrI= X-Gm-Gg: ASbGncvpA4LwxdOfoC8RvRZFtrrMRazREKeXzEF6DPwXKPs6mj8IacP1/UXWkH28xps yXUDdbo3MfjBFsRxF0R/Pwgwi0OLurUr+UH9CdPmAMVIrFJW6JxdYe8AqemHqftRXHoM0gIKcZu srcLW5bdqEBoZ8/EebrUiMTGX4usYp4yfzbke9bjpnH8tU+qFKrsrmWVl4QblGxMytbJ/YbK379 8aXqoGRmwTOA+yoi4Q9sBQjg6TCILJPjKoXes76NWCVpboxd1MUuo0/ZQ5sCMtDRyKgclUtlTha XzBAXDIdtY3Rd00D8IIQJSpL7cAK4FFBtu37i55B7UTWlh8vMGxL X-Google-Smtp-Source: AGHT+IFxIXblk0CUDHV/yH7CE+lnvUp/SJ1Wd8GqjybtF+Fd2Y66utDGKzIurb7EJSyE7nUZ41ll3Q== X-Received: by 2002:a05:6512:3405:b0:545:f90:2753 with SMTP id 2adb3069b0e04-5494c330b64mr2950721e87.30.1740849062429; Sat, 01 Mar 2025 09:11:02 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5494e52a47asm585313e87.152.2025.03.01.09.11.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Mar 2025 09:11:01 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 01 Mar 2025 19:10:55 +0200 Subject: [PATCH v4 1/2] drm/bridge: split HDMI Audio from DRM_BRIDGE_OP_HDMI 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: <20250301-dp-hdmi-audio-v4-1-82739daf28cc@linaro.org> References: <20250301-dp-hdmi-audio-v4-0-82739daf28cc@linaro.org> In-Reply-To: <20250301-dp-hdmi-audio-v4-0-82739daf28cc@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=7863; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=0KZ6BjD9kkbPOzEapQgVo4Pi20+SxI1Up4046oJIkmw=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnwz+hENQvH7EidVBdkgsOS79KdtpCG34RB1aMs AVQ4tEAaOqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ8M/oQAKCRCLPIo+Aiko 1SK8B/4z89l+bCMrMDQuC6cu924PldQq2McK5X25hBugFH2juIuFb0QPhsv4fHFSwYLBieGSDAl TVrinDM0a8VuzciuiCm/3ipGVPC1IC27BzNACngigGt8kjGorG28k8v+QaHCteLXOb0SNf5mxrZ O/ovhaCnmTQjGnSDQt/SeYKHEskKnRSo4JAS3N+vAqpbBM/mYeS2RpuKCnQDDyufHMgWKR0KUSU fEGigT3Hgcu/+qlq6uQymZ4RZiGZg+PAqyhxX0EiCnNBJxM7wsYilu2CV2AQ5PzZWiLrpTk2d2K WhHTXeLiMIRkgfRDvaCNCQgLzH9NH4yRm+JoUxwiIvK+MHUX X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A 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/bridge/synopsys/dw-hdmi-qp.c | 1 + drivers/gpu/drm/display/drm_bridge_connector.c | 59 +++++++++++++++++-----= ---- include/drm/drm_bridge.h | 23 ++++++++-- 4 files changed, 60 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/brid= ge/lontium-lt9611.c index 026803034231f78c17f619dc04119bdd9b2b6679..3b93c17e25c18ae0d13e9bb7455= 3cf21dcc39f9d 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c @@ -1130,7 +1130,7 @@ static int lt9611_probe(struct i2c_client *client) lt9611->bridge.of_node =3D client->dev.of_node; lt9611->bridge.ops =3D 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 =3D DRM_MODE_CONNECTOR_HDMIA; lt9611->bridge.vendor =3D "Lontium"; lt9611->bridge.product =3D "LT9611"; diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm= /bridge/synopsys/dw-hdmi-qp.c index 6166f197e37b552cb8a52b7b0d23ffc632f54557..5e5f8c2f95be1f5c4633f1093b1= 7a00f9425bb37 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -1077,6 +1077,7 @@ struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_de= vice *pdev, hdmi->bridge.ops =3D DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID | DRM_BRIDGE_OP_HDMI | + DRM_BRIDGE_OP_HDMI_AUDIO | DRM_BRIDGE_OP_HPD; hdmi->bridge.of_node =3D pdev->dev.of_node; hdmi->bridge.type =3D DRM_MODE_CONNECTOR_HDMIA; diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/d= rm/display/drm_bridge_connector.c index 30c736fc0067e31a97db242e5b16ea8a5b4cf359..030f98d454608a63154827c65d4= 822d378df3b4c 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; }; =20 #define to_drm_bridge_connector(x) \ @@ -433,7 +440,7 @@ static int drm_bridge_connector_audio_startup(struct dr= m_connector *connector) to_drm_bridge_connector(connector); struct drm_bridge *bridge; =20 - bridge =3D bridge_connector->bridge_hdmi; + bridge =3D bridge_connector->bridge_hdmi_audio; if (!bridge) return -EINVAL; =20 @@ -451,7 +458,7 @@ static int drm_bridge_connector_audio_prepare(struct dr= m_connector *connector, to_drm_bridge_connector(connector); struct drm_bridge *bridge; =20 - bridge =3D bridge_connector->bridge_hdmi; + bridge =3D bridge_connector->bridge_hdmi_audio; if (!bridge) return -EINVAL; =20 @@ -464,7 +471,7 @@ static void drm_bridge_connector_audio_shutdown(struct = drm_connector *connector) to_drm_bridge_connector(connector); struct drm_bridge *bridge; =20 - bridge =3D bridge_connector->bridge_hdmi; + bridge =3D bridge_connector->bridge_hdmi_audio; if (!bridge) return; =20 @@ -478,7 +485,7 @@ static int drm_bridge_connector_audio_mute_stream(struc= t drm_connector *connecto to_drm_bridge_connector(connector); struct drm_bridge *bridge; =20 - bridge =3D bridge_connector->bridge_hdmi; + bridge =3D bridge_connector->bridge_hdmi_audio; if (!bridge) return -EINVAL; =20 @@ -576,6 +583,21 @@ struct drm_connector *drm_bridge_connector_init(struct= drm_device *drm, max_bpc =3D bridge->max_bpc; } =20 + 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 =3D bridge; + } + if (!drm_bridge_get_next_bridge(bridge)) connector_type =3D bridge->type; =20 @@ -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 =3D 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 =3D 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); } =20 + if (bridge_connector->bridge_hdmi_audio) { + bridge =3D bridge_connector->bridge_hdmi_audio; + + ret =3D 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); =20 if (bridge_connector->bridge_hpd) diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index d4c75d59fa12be1bd7375ce3ea56415235781b28..dff8cf035b30d5c7e00bfdf5d6e= 12802559823ba 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 =3D 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 =3D BIT(5), }; =20 /** --=20 2.39.5 From nobody Mon Feb 9 01:35:02 2026 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 035AC1E5B71 for ; Sat, 1 Mar 2025 17:11:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740849069; cv=none; b=UMIwGBeHF01nV5cbpSXRnbxZ6shWBpAWfnX0AA8ng5wNFkZUKKmuJN7mz1PXJOJBT806mXssVXMmJmxqpIQ19x2Z+9zkixX+lp4L4yXOyisrkujxAZI0LYR5koIoRTjlGsldThv+16SfOFQuTpD4nhGhznwO8kI6qycxdsX2CAY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740849069; c=relaxed/simple; bh=Zl6KXw6AdcxHhMj4UrjLySeVvCxqw6Jr5NjSbbnIYw0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ef/MTji8R3a3FU4HmLq+qDECS9R10dMPdbgQE9YNQXhRMociPaikaJnM/OFlG5m8xxyXwfVk1b+wgXvWQULNyiYqDudQUF24PaqEibsep/BG7KlECMIrQv2ZUtbvSwydTw+0Az5KNZoSai2FSueuB3qKprWezv5QcNyKaCmOKpk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=GxB2KRly; arc=none smtp.client-ip=209.85.167.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="GxB2KRly" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-54958009d4dso1060188e87.2 for ; Sat, 01 Mar 2025 09:11:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740849065; x=1741453865; 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=YLYSrqogef9nQqRb9pth4NuA0U5dDtdylLPK0S+qdxc=; b=GxB2KRlyQm+fE8g+6+gvv8gFyaRVDK7MQv6IyJJjOKh0Ar/RmttwOM+fEoiTj01uzj QjLnd6cuWj5pkXOtIxdYkrg0G8r7HxzVYwnv/gSMfu6tIsqqy27f1s1gg1CYfF+7+xXy FIZdLg1vB5n8Ia54oelF2hUB4n/aj18DX0XAyuPYZCdctX3Jf0h42hFEdZBx7fUW2TAv SkyVcRPUA8MPcBW5hcmTrNrpaDo/PI6gssnNRzO0ub07rwjt8fLDbUM0zJaBPfhKmUeK v9DVz8+zQlV1EBCQ45HuIbgcV32yw5i62LYXSobNChRdY9UfouBcAGi6MkoY0MEFPTw+ H+uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740849065; x=1741453865; 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=YLYSrqogef9nQqRb9pth4NuA0U5dDtdylLPK0S+qdxc=; b=DyI8RVGT0dR6gxwlOQ5D/+0zfIMmWG8ZC8CsdwvciYB4RRUIIu5ytmgXHDV7L2p4lA /QAwDtWPdHZwpXcV6hmvIoP1oo+rPaXcBPIMlbM1z3pPGlaRBguGWbGYVX/YyJc6fTZ9 TSaUaRNWXYb5xxLhq6/aDLX4h0otEWOzSxuT7B3CW5DhED+oaxbKt+XLtVPI+LtGIvIh VB21Vx0pI2anlgjA0LkhJaNYFTnlCow5MmCpPi1GVZNhXsZ8HA49/UWqs0G5CmJsD9ge N18DUEYvK7g2pAKkrTroXucUFrusAh1OxFVlyL1YsepALUJE6dEW/KWFRpcM1zLp0mbR /WDQ== X-Forwarded-Encrypted: i=1; AJvYcCX2HQQ43ZIm32Z9ZQ0OF0VsGJp7Fi9n7j42LzmKWLCZgxcZJYzeIzoeWWPXPcaJHKUoLzhBq53taIPdfNg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/WG2OZ5n/g8r243M5NBuh/UVGBml9ScH7i7eISOfzuqfdcQwV cTXP76g+MB3wxGgzhBx8xT2AJ4sNrnfgwn04hkQBmBbFm4VLFxrx0vQsjvTErvw= X-Gm-Gg: ASbGncshK89NpupcdyTE+YTf7OZcmGKqWE2FId1HSnbFmDCDrb3Drg4ploUY68tGT8k SghlMNXJSC0r4OlW4DAToKyNVUW8vTRVMbdePYufMpkdk/qT08FSheTvycyBkwVFs6hQF+BzBIA CgUXqvJZhJzaXtazHfCyEjtAVWmLtHdIupu9j3Pd9Eq26XyfGOlW45AJbfENaVxomVYkYZA+VKT TO9uASk3uMst2HZXy7FwKdlL4UwSCGO+tYiH/Vm0S8peX/6Fo1fPptXdP6CHwOc91qeKN5n6gMF LhIw7axt+6UEokCKK9QpT/Vvg1lbFuf5bgEhgmPd9oa9a+ZzL3HD X-Google-Smtp-Source: AGHT+IFMIVbPMPVwAA1gSUhouRqkobbK3iPod0XmkeW/lTun2yQ8T8ybS3Jn+hi0UICfeucggprL5w== X-Received: by 2002:a05:6512:3a90:b0:545:944:aae1 with SMTP id 2adb3069b0e04-5494c31d2e8mr3445875e87.12.1740849065003; Sat, 01 Mar 2025 09:11:05 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5494e52a47asm585313e87.152.2025.03.01.09.11.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Mar 2025 09:11:03 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 01 Mar 2025 19:10:56 +0200 Subject: [PATCH v4 2/2] drm/msm/dp: reuse generic HDMI codec implementation 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: <20250301-dp-hdmi-audio-v4-2-82739daf28cc@linaro.org> References: <20250301-dp-hdmi-audio-v4-0-82739daf28cc@linaro.org> In-Reply-To: <20250301-dp-hdmi-audio-v4-0-82739daf28cc@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=13379; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=Zl6KXw6AdcxHhMj4UrjLySeVvCxqw6Jr5NjSbbnIYw0=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnwz+iONA58Hxi4OLGV8/ILXoxiZ5viTEVsc+L5 PeiPTADMdKJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ8M/ogAKCRCLPIo+Aiko 1ZcTB/wOLp80u6TNQHtDB1Ljim9OCdmo+ZftHMCHcORm1GZGPyzN8HIux/gPV5ds4G/S2wi47+k IpfO1zdkXD7hiibbhtUl5dpOhepHiS7vt1XupIcztxGhNHS5JRaktPk+YNfXE5/DHW988j7/5Ny JUsfzzOGIkh7XwUcg11k5aPVmJv6l1elXFlykWfXuvd7G495AWmPBD9Us9RhfYSAy2+mtnjFkgk SUvSz8Dh5ylmOiqmR3I3e6+Ad2jCF3fhOuZrHf2jNxBUU4bhJgT6zCHp/a12xit0FdR9z7g0P52 3Z2cr/ZhMXvmhrNAw+Tt+7UoirYK/znHX36sM/oGnInyf6nf X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A The MSM DisplayPort driver implements several HDMI codec functions in the driver, e.g. it manually manages HDMI codec device registration, returning ELD and plugged_cb support. In order to reduce code duplication reuse drm_hdmi_audio_* helpers and drm_bridge_connector integration. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/dp/dp_audio.c | 131 ++++----------------------------= ---- drivers/gpu/drm/msm/dp/dp_audio.h | 27 ++------ drivers/gpu/drm/msm/dp/dp_display.c | 28 ++------ drivers/gpu/drm/msm/dp/dp_display.h | 6 -- drivers/gpu/drm/msm/dp/dp_drm.c | 8 +++ 6 files changed, 31 insertions(+), 170 deletions(-) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 7ec833b6d8292f8cb26cfe5582812f2754cd4d35..fe36a3bcfe03994952d1b5e1b42= 3e923e3e3b014 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -104,6 +104,7 @@ config DRM_MSM_DPU config DRM_MSM_DP bool "Enable DisplayPort support in MSM DRM driver" depends on DRM_MSM + select DRM_DISPLAY_HDMI_AUDIO_HELPER select RATIONAL default y help diff --git a/drivers/gpu/drm/msm/dp/dp_audio.c b/drivers/gpu/drm/msm/dp/dp_= audio.c index 70fdc9fe228a7149546accd8479a9e4397f3d5dd..f8bfb908f9b4bf93ad5480f0785= e3aed23dde160 100644 --- a/drivers/gpu/drm/msm/dp/dp_audio.c +++ b/drivers/gpu/drm/msm/dp/dp_audio.c @@ -13,13 +13,13 @@ =20 #include "dp_catalog.h" #include "dp_audio.h" +#include "dp_drm.h" #include "dp_panel.h" #include "dp_reg.h" #include "dp_display.h" #include "dp_utils.h" =20 struct msm_dp_audio_private { - struct platform_device *audio_pdev; struct platform_device *pdev; struct drm_device *drm_dev; struct msm_dp_catalog *catalog; @@ -160,24 +160,11 @@ static void msm_dp_audio_enable(struct msm_dp_audio_p= rivate *audio, bool enable) msm_dp_catalog_audio_enable(catalog, enable); } =20 -static struct msm_dp_audio_private *msm_dp_audio_get_data(struct platform_= device *pdev) +static struct msm_dp_audio_private *msm_dp_audio_get_data(struct msm_dp *m= sm_dp_display) { struct msm_dp_audio *msm_dp_audio; - struct msm_dp *msm_dp_display; - - if (!pdev) { - DRM_ERROR("invalid input\n"); - return ERR_PTR(-ENODEV); - } - - msm_dp_display =3D platform_get_drvdata(pdev); - if (!msm_dp_display) { - DRM_ERROR("invalid input\n"); - return ERR_PTR(-ENODEV); - } =20 msm_dp_audio =3D msm_dp_display->msm_dp_audio; - if (!msm_dp_audio) { DRM_ERROR("invalid msm_dp_audio data\n"); return ERR_PTR(-EINVAL); @@ -186,68 +173,16 @@ static struct msm_dp_audio_private *msm_dp_audio_get_= data(struct platform_device return container_of(msm_dp_audio, struct msm_dp_audio_private, msm_dp_aud= io); } =20 -static int msm_dp_audio_hook_plugged_cb(struct device *dev, void *data, - hdmi_codec_plugged_cb fn, - struct device *codec_dev) -{ - - struct platform_device *pdev; - struct msm_dp *msm_dp_display; - - pdev =3D to_platform_device(dev); - if (!pdev) { - pr_err("invalid input\n"); - return -ENODEV; - } - - msm_dp_display =3D platform_get_drvdata(pdev); - if (!msm_dp_display) { - pr_err("invalid input\n"); - return -ENODEV; - } - - return msm_dp_display_set_plugged_cb(msm_dp_display, fn, codec_dev); -} - -static int msm_dp_audio_get_eld(struct device *dev, - void *data, uint8_t *buf, size_t len) -{ - struct platform_device *pdev; - struct msm_dp *msm_dp_display; - - pdev =3D to_platform_device(dev); - - if (!pdev) { - DRM_ERROR("invalid input\n"); - return -ENODEV; - } - - msm_dp_display =3D platform_get_drvdata(pdev); - if (!msm_dp_display) { - DRM_ERROR("invalid input\n"); - return -ENODEV; - } - - mutex_lock(&msm_dp_display->connector->eld_mutex); - memcpy(buf, msm_dp_display->connector->eld, - min(sizeof(msm_dp_display->connector->eld), len)); - mutex_unlock(&msm_dp_display->connector->eld_mutex); - - return 0; -} - -int msm_dp_audio_hw_params(struct device *dev, - void *data, - struct hdmi_codec_daifmt *daifmt, - struct hdmi_codec_params *params) +int msm_dp_audio_prepare(struct drm_connector *connector, + struct drm_bridge *bridge, + struct hdmi_codec_daifmt *daifmt, + struct hdmi_codec_params *params) { int rc =3D 0; struct msm_dp_audio_private *audio; - struct platform_device *pdev; struct msm_dp *msm_dp_display; =20 - pdev =3D to_platform_device(dev); - msm_dp_display =3D platform_get_drvdata(pdev); + msm_dp_display =3D to_dp_bridge(bridge)->msm_dp_display; =20 /* * there could be cases where sound card can be opened even @@ -262,7 +197,7 @@ int msm_dp_audio_hw_params(struct device *dev, goto end; } =20 - audio =3D msm_dp_audio_get_data(pdev); + audio =3D msm_dp_audio_get_data(msm_dp_display); if (IS_ERR(audio)) { rc =3D PTR_ERR(audio); goto end; @@ -281,15 +216,14 @@ int msm_dp_audio_hw_params(struct device *dev, return rc; } =20 -static void msm_dp_audio_shutdown(struct device *dev, void *data) +void msm_dp_audio_shutdown(struct drm_connector *connector, + struct drm_bridge *bridge) { struct msm_dp_audio_private *audio; - struct platform_device *pdev; struct msm_dp *msm_dp_display; =20 - pdev =3D to_platform_device(dev); - msm_dp_display =3D platform_get_drvdata(pdev); - audio =3D msm_dp_audio_get_data(pdev); + msm_dp_display =3D to_dp_bridge(bridge)->msm_dp_display; + audio =3D msm_dp_audio_get_data(msm_dp_display); if (IS_ERR(audio)) { DRM_ERROR("failed to get audio data\n"); return; @@ -311,47 +245,6 @@ static void msm_dp_audio_shutdown(struct device *dev, = void *data) msm_dp_display_signal_audio_complete(msm_dp_display); } =20 -static const struct hdmi_codec_ops msm_dp_audio_codec_ops =3D { - .hw_params =3D msm_dp_audio_hw_params, - .audio_shutdown =3D msm_dp_audio_shutdown, - .get_eld =3D msm_dp_audio_get_eld, - .hook_plugged_cb =3D msm_dp_audio_hook_plugged_cb, -}; - -static struct hdmi_codec_pdata codec_data =3D { - .ops =3D &msm_dp_audio_codec_ops, - .max_i2s_channels =3D 8, - .i2s =3D 1, -}; - -void msm_dp_unregister_audio_driver(struct device *dev, struct msm_dp_audi= o *msm_dp_audio) -{ - struct msm_dp_audio_private *audio_priv; - - audio_priv =3D container_of(msm_dp_audio, struct msm_dp_audio_private, ms= m_dp_audio); - - if (audio_priv->audio_pdev) { - platform_device_unregister(audio_priv->audio_pdev); - audio_priv->audio_pdev =3D NULL; - } -} - -int msm_dp_register_audio_driver(struct device *dev, - struct msm_dp_audio *msm_dp_audio) -{ - struct msm_dp_audio_private *audio_priv; - - audio_priv =3D container_of(msm_dp_audio, - struct msm_dp_audio_private, msm_dp_audio); - - audio_priv->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(audio_priv->audio_pdev); -} - struct msm_dp_audio *msm_dp_audio_get(struct platform_device *pdev, struct msm_dp_catalog *catalog) { diff --git a/drivers/gpu/drm/msm/dp/dp_audio.h b/drivers/gpu/drm/msm/dp/dp_= audio.h index beea34cbab77f31b33873297dc454a9cee446240..58fc14693e48bff2b57ef727898= 3e5f21ee80ac7 100644 --- a/drivers/gpu/drm/msm/dp/dp_audio.h +++ b/drivers/gpu/drm/msm/dp/dp_audio.h @@ -35,23 +35,6 @@ struct msm_dp_audio { struct msm_dp_audio *msm_dp_audio_get(struct platform_device *pdev, struct msm_dp_catalog *catalog); =20 -/** - * msm_dp_register_audio_driver() - * - * Registers DP device with hdmi_codec interface. - * - * @dev: DP device instance. - * @msm_dp_audio: an instance of msm_dp_audio module. - * - * - * Returns the error code in case of failure, otherwise - * zero on success. - */ -int msm_dp_register_audio_driver(struct device *dev, - struct msm_dp_audio *msm_dp_audio); - -void msm_dp_unregister_audio_driver(struct device *dev, struct msm_dp_audi= o *msm_dp_audio); - /** * msm_dp_audio_put() * @@ -61,10 +44,12 @@ void msm_dp_unregister_audio_driver(struct device *dev,= struct msm_dp_audio *msm */ void msm_dp_audio_put(struct msm_dp_audio *msm_dp_audio); =20 -int msm_dp_audio_hw_params(struct device *dev, - void *data, - struct hdmi_codec_daifmt *daifmt, - struct hdmi_codec_params *params); +int msm_dp_audio_prepare(struct drm_connector *connector, + struct drm_bridge *bridge, + struct hdmi_codec_daifmt *daifmt, + struct hdmi_codec_params *params); +void msm_dp_audio_shutdown(struct drm_connector *connector, + struct drm_bridge *bridge); =20 #endif /* _DP_AUDIO_H_ */ =20 diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/d= p_display.c index bbc47d86ae9e67245c87a8365df366cce0dc529e..ece184d20c0f8bffa3c2a482160= 15185d6cbc99e 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -13,6 +13,7 @@ #include #include #include +#include #include =20 #include "msm_drv.h" @@ -288,13 +289,6 @@ static int msm_dp_display_bind(struct device *dev, str= uct device *master, goto end; } =20 - - rc =3D msm_dp_register_audio_driver(dev, dp->audio); - if (rc) { - DRM_ERROR("Audio registration Dp failed\n"); - goto end; - } - rc =3D msm_dp_hpd_event_thread_start(dp); if (rc) { DRM_ERROR("Event thread create failed\n"); @@ -316,7 +310,6 @@ static void msm_dp_display_unbind(struct device *dev, s= truct device *master, =20 of_dp_aux_depopulate_bus(dp->aux); =20 - msm_dp_unregister_audio_driver(dev, dp->audio); msm_dp_aux_unregister(dp->aux); dp->drm_dev =3D NULL; dp->aux->drm_dev =3D NULL; @@ -626,9 +619,9 @@ static void msm_dp_display_handle_plugged_change(struct= msm_dp *msm_dp_display, struct msm_dp_display_private, msm_dp_display); =20 /* notify audio subsystem only if sink supports audio */ - if (msm_dp_display->plugged_cb && msm_dp_display->codec_dev && - dp->audio_supported) - msm_dp_display->plugged_cb(msm_dp_display->codec_dev, plugged); + if (dp->audio_supported) + drm_connector_hdmi_audio_plugged_notify(msm_dp_display->connector, + plugged); } =20 static int msm_dp_hpd_unplug_handle(struct msm_dp_display_private *dp, u32= data) @@ -907,19 +900,6 @@ static int msm_dp_display_disable(struct msm_dp_displa= y_private *dp) return 0; } =20 -int msm_dp_display_set_plugged_cb(struct msm_dp *msm_dp_display, - hdmi_codec_plugged_cb fn, struct device *codec_dev) -{ - bool plugged; - - msm_dp_display->plugged_cb =3D fn; - msm_dp_display->codec_dev =3D codec_dev; - plugged =3D msm_dp_display->link_ready; - msm_dp_display_handle_plugged_change(msm_dp_display, plugged); - - return 0; -} - /** * msm_dp_bridge_mode_valid - callback to determine if specified mode is v= alid * @bridge: Pointer to drm bridge structure diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/d= p_display.h index ecbc2d92f546a346ee53adcf1b060933e4f54317..cc6e2cab36e9c0b1527ff292e54= 7cbb4d69fd95c 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.h +++ b/drivers/gpu/drm/msm/dp/dp_display.h @@ -7,7 +7,6 @@ #define _DP_DISPLAY_H_ =20 #include "dp_panel.h" -#include #include "disp/msm_disp_snapshot.h" =20 #define DP_MAX_PIXEL_CLK_KHZ 675000 @@ -15,7 +14,6 @@ struct msm_dp { struct drm_device *drm_dev; struct platform_device *pdev; - struct device *codec_dev; struct drm_connector *connector; struct drm_bridge *next_bridge; bool link_ready; @@ -25,14 +23,10 @@ struct msm_dp { bool is_edp; bool internal_hpd; =20 - hdmi_codec_plugged_cb plugged_cb; - struct msm_dp_audio *msm_dp_audio; bool psr_supported; }; =20 -int msm_dp_display_set_plugged_cb(struct msm_dp *msm_dp_display, - hdmi_codec_plugged_cb fn, struct device *codec_dev); int msm_dp_display_get_modes(struct msm_dp *msm_dp_display); bool msm_dp_display_check_video_test(struct msm_dp *msm_dp_display); int msm_dp_display_get_test_bpp(struct msm_dp *msm_dp_display); diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_dr= m.c index cca57e56c906255a315e759e85a5af5982c80e9c..20b24eea0a4b619598079fbe4a3= 2188485852b04 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -12,6 +12,7 @@ =20 #include "msm_drv.h" #include "msm_kms.h" +#include "dp_audio.h" #include "dp_drm.h" =20 /** @@ -114,6 +115,9 @@ static const struct drm_bridge_funcs msm_dp_bridge_ops = =3D { .hpd_disable =3D msm_dp_bridge_hpd_disable, .hpd_notify =3D msm_dp_bridge_hpd_notify, .debugfs_init =3D msm_dp_bridge_debugfs_init, + + .hdmi_audio_prepare =3D msm_dp_audio_prepare, + .hdmi_audio_shutdown =3D msm_dp_audio_shutdown, }; =20 static int msm_edp_bridge_atomic_check(struct drm_bridge *drm_bridge, @@ -320,9 +324,13 @@ int msm_dp_bridge_init(struct msm_dp *msm_dp_display, = struct drm_device *dev, */ if (!msm_dp_display->is_edp) { bridge->ops =3D + DRM_BRIDGE_OP_HDMI_AUDIO | DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_HPD | DRM_BRIDGE_OP_MODES; + bridge->hdmi_audio_dev =3D &msm_dp_display->pdev->dev; + bridge->hdmi_audio_max_i2s_playback_channels =3D 8; + bridge->hdmi_audio_dai_port =3D -1; } =20 rc =3D devm_drm_bridge_add(dev->dev, bridge); --=20 2.39.5