From nobody Tue Dec 16 10:48:59 2025 Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (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 21DDA1C7001 for ; Thu, 6 Feb 2025 13:51:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738849880; cv=none; b=Ufg38jfRsAysH0GavKsDcoCTo+1B6RFUwNww+W1TKfcQuFrPRzVixUGi6Z12qqvro8jgDFDAK/6v1usVTSQaBlgo2MvikFt9OdvlAYUHuAuhHB6yNRmXIeXkis9htNwnsJZU1uIQUguuYUw/tjJ4FFnqLldYowv86QMjf/ahfkg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738849880; c=relaxed/simple; bh=snQ72owwPhrhaFwR4SIaWA+XaNcn+pxVUNbe6nPEt/o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=i1rv4eZb8zCKzd5JendDgxLvVg871+QKt7TGG29455XnSuIoWZP4Gm/25fcFcliyMAJNoidFssZCHtnzXjOBCHbGGpG17EgiJWRlu7ORq01sq68kzWEKaaWSGbYtO+xkPrnE8D4NwmtdhmoHmWDBQMn3tLRP1YlxLL5ZMiLOhK4= 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=YToK8kV+; arc=none smtp.client-ip=209.85.208.177 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="YToK8kV+" Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-30737db1aa9so8808181fa.1 for ; Thu, 06 Feb 2025 05:51:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738849876; x=1739454676; 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=UlK+TxmJ+8NTEz5MDIlkU8q1+19XAKmZdwH/ArURmjg=; b=YToK8kV+Wf0nV/boTl6Ih3SwDTLxLA3ch+MBHA+AWm92A1vy5cMVDUnGh13Yf/7rf6 f+XtPVgHiqW7uJfSht4fwu9GVe2IQm2sSnPiCZV04/So0KVk20auVRUmCynduDvFQWdV vDanWSaAxaRib3bq8oh7RB4mWUqRAtoh8kKkxRNA+Wp666W3zTR3+A98MmZn+8NEIQb1 3G22HthjNA4T1iim72uvmyUquIshOfKmwcc3n0CjaTCnG0j86lpCK/0mXFvijbLuFx9q bibhAnrwJD/JVwu7cLthtiUVgrZFl7JiYFblbCwV0HbieS0tUzAkSbSz6BEbUb2soWf/ KuBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738849876; x=1739454676; 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=UlK+TxmJ+8NTEz5MDIlkU8q1+19XAKmZdwH/ArURmjg=; b=SFgrPr37aKrsExhuOMWpcQD9EM3cY+l8wLUs7HvhrNb2XrJ+fvC5YaTasdz9rlzvGg eLD2P+QcFyeH//PNYmDQnlJGREAkS2Spe4fvz7peZ99GVxixOKcXrJwrsckzGqqISxMG grxkBuzGCGFi/IX+AhkVftizYiOMiqf8TTGMJHHZfHWQgXT+I9YjE7u3JStlLyBmjFKL HIoIqboQf0KBxbf079QsjLamGdsM3qwWFRepPW98IWqt8jgIo3EFYh0/xEU5pG+Gn4Qc kcEkMx4gN/VNyPrgHO1BbvpInHd8ysCyk3KqzmglLA8AtLpqVn8s9YcHNNJIDn/7InKZ Qaog== X-Forwarded-Encrypted: i=1; AJvYcCXMr1Qxk7EJXwCHs8QQdEFvjRI6DnpKhRTyij3HnkYR0jQL9q0gfI8aJyKXrj9q18Gc/yzGcO/31LhZd2U=@vger.kernel.org X-Gm-Message-State: AOJu0YyJI/d/wD6fSA3IJjLfAF8B9F0DjpZBBDF5bUyxuk1qH7Qjmgjf AQFjxzNl8CCbgfjig0AmVRUA1dul1OB6gou4YbbpC3lJm1SMpqJqjecIMJVl8zM= X-Gm-Gg: ASbGncteYnngQO/sKHGW+Cx6CD23sJZ8jXmHo1r4KVs08422qGzk1rRfj5M1zoDtCS0 N+ajBjk8RsR7HXNtfsVepfu0y9FZ+3Nwgp1AKsRHaJmrX8NKqLZ+VRchaiWI/dmAaoLpqhONYxY 1EXbTHjetyyzIasNUSx3MdO5HdQbQhn6sMnhjyfqjcVDMRVEiVcdG9TJS8q2PvMo7v9LFkQng+i DMsbpsm6VHnp8G+5rvzgxWv+XiIor5IbKwf+dlEMlIbCLxb2/56QGHAdM0nbXQGWbNniVgCWQMq EiFYD8RSPKVgNmHXaHdHguU= X-Google-Smtp-Source: AGHT+IHHeWzoeJmQQGB9ZzM2A2qTjw7A0+OC0cnedk0GgttBKRVUhTQ2a66Cy0CFIBfHwySntG87EA== X-Received: by 2002:a05:651c:1588:b0:300:26bc:4311 with SMTP id 38308e7fff4ca-307cf31141fmr27383791fa.18.1738849876142; Thu, 06 Feb 2025 05:51:16 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307de2da11fsm1318521fa.92.2025.02.06.05.51.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 05:51:14 -0800 (PST) From: Dmitry Baryshkov Date: Thu, 06 Feb 2025 15:51:07 +0200 Subject: [PATCH 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: <20250206-dp-hdmi-audio-v1-2-8aa14a8c0d4d@linaro.org> References: <20250206-dp-hdmi-audio-v1-0-8aa14a8c0d4d@linaro.org> In-Reply-To: <20250206-dp-hdmi-audio-v1-0-8aa14a8c0d4d@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=13373; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=snQ72owwPhrhaFwR4SIaWA+XaNcn+pxVUNbe6nPEt/o=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnpL5NL+X32LMzFHQO7/8STk8fjrrvgD/a7tixD 823KYl690aJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ6S+TQAKCRCLPIo+Aiko 1RyTCACcx7mBhoDGP6D3QcSCVU6APbA5jrElREWEt4VvBknC/Q3KBzeHzINKm8C423CRHWfc0wC YwZrbA9P0/RGECJHcn44K/ucSW4Ylb45ohmYHWa1RKXptfxr0eeW73kwrW4dk2BPx6JFLOlum9y yZ73fPkG03Ak4mUPKCOeNIl+bu8LKDrSpHDNNsqVWisx2Z4sFtyY+TMKRLD5jdk5EQIFR70wOMT DFQ8XPw6VFYTFr9ej6IL3JptDPNi97RMf3rWKlevGadvyC0YMxp0wHkOTrmhni92WpqRqj9a0MG f5AAF3YnqNp4noKbKdwJk8nAagY/nmFXdgIhm198UncLaN7V 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 24dd37f1682bf5016bb0efbeb44489061deff060..cc3dd56b6ff48494e4c1e561a6c= ac6a54d7c1f34 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -12,6 +12,7 @@ #include #include #include +#include #include =20 #include "msm_drv.h" @@ -287,13 +288,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"); @@ -315,7 +309,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; @@ -611,9 +604,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) @@ -892,19 +885,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 d3e241ea6941615b8e274dd17426c2f8557f09b5..0139b6c2e53f48785cdffaf4ccf= e391098da3715 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -11,6 +11,7 @@ =20 #include "msm_drv.h" #include "msm_kms.h" +#include "dp_audio.h" #include "dp_drm.h" =20 /** @@ -113,6 +114,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, @@ -319,9 +323,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_DisplayPort | 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