From patchwork Thu Feb 6 13:51:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13963130 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 3DAE5C02196 for ; Thu, 6 Feb 2025 13:56:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A259910E853; Thu, 6 Feb 2025 13:56:29 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="R6dVb+6B"; dkim-atps=neutral Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C16B10E853 for ; Thu, 6 Feb 2025 13:51:15 +0000 (UTC) Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-30761be8fcfso9383711fa.0 for ; Thu, 06 Feb 2025 05:51:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738849874; x=1739454674; 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=TXvHeC1Yf2GuOiuplAspcKQmKn7+kgoDshB/4Jadi1Q=; b=R6dVb+6BLjEKRiAcYDaJ4lk0uNrCcYeG+alnQMBR+6xKSGxrqGOSyQaDj7qAQ4UzNU 63cnu/hMx54D20BRQZupOZb8P1lzbN1G2wkYPr967jlfzsJ1Gajr7anJLk2WDUKIaxad iBzqWsvrP7GtYD9bw66XJ4ONy7LdorfB3TiLDeQIVuBmxLwztvrU6UfT6tAXvPkKbPJA 0woGsY4OJz/ahCX6XknHzp0IgvcDObrV5xUholcmDOGy7ewlK8WZdTYeEjQuIEn89DlC Cp6sKekid9closkzAlwosWhQT8JniN1OpQQOytS+TKfVHR4zfcqtY7qj/iP1DKH5H/kR iNVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738849874; x=1739454674; 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=TXvHeC1Yf2GuOiuplAspcKQmKn7+kgoDshB/4Jadi1Q=; b=XPWm+IzD6WrQhxpgRG4JHX/3EuwNwHIc8DhXhcCskb/HskG+TZmoLJXEpPxNC+SgFY o/ppAi5i/oQcjBqGnxNK+EtChv0eNaZrDjJlAqJMigbkbjxH1VzamkGl2GAPVyixT4Ts 7vVWId/Sp9g5OJ0ySrTdpNEMlxg/0tt63eKs4su2csA0eUaqvmx7IekoyRaODALinHJt k2DZMKKO2bHiz+OsDITTktZUuAmrfVHH/05LQswguHko8y+GqE9WWjXWxyOvLyXfiw4C YYpeknGrpwr32TF5QVvBxkqrkn2sXy4kNMaAbW/T2MsTevLicCQKxXtcvp24xDC4SI1U HbwQ== X-Gm-Message-State: AOJu0YyMU8E8SAjGP6JrKJ3DX487i12sVQdcdkKEa+HDgPZ798mGpbV0 73rl15yLtXGAeY+b7ZZd3g2597Ihc0/WeWfxw8RiHibPLQugQl1QqtzUb2w8IW0= X-Gm-Gg: ASbGncuERLZLb7uS5jt3c6tPPOpYeP9cPTI6qOmCn+k3iBbdP5VpKXf0A5d/QawIXjs LNvrP8qV7mZvJ1oRBDPv2oTY8A4lBFy4cEFi58PUKfF+gxQQ4+F6abQrdzxfytU0lyh+5mRwxpt 0ztFgfzdw+XM30lbtKKK3snw/HOFrJhVWaPH0fxS+t0KSrGL6m4Lz8yuyNFeROWXep3i2g76u6a CjBa7/8jsE+Oaz3g0cbd09gdi5Y8BXtBkkmldOV81KvtssK+HoM6rlliQoswx2LlyBC8qLwrEBa UNPsbAslGxrraB6pBwzNKME= X-Google-Smtp-Source: AGHT+IFVFDfXSZjE1F/bGlISaWdVp07EGr0sKbBBMGoJ9tmIeAf61QXHP/XAxmfmNjKasQbwOOV15A== X-Received: by 2002:a05:651c:220e:b0:306:10d6:28a5 with SMTP id 38308e7fff4ca-307cf2fd818mr19782961fa.1.1738849873746; Thu, 06 Feb 2025 05:51:13 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 05:51:13 -0800 (PST) From: Dmitry Baryshkov Date: Thu, 06 Feb 2025 15:51:06 +0200 Subject: [PATCH 1/2] drm/display: bridge-connector: add DisplayPort bridges MIME-Version: 1.0 Message-Id: <20250206-dp-hdmi-audio-v1-1-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=5826; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=mpzXyzeB8MzX6qw01rpg9ImZYnr1dtKSgAZWq7ewrIQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnpL5NvB6ifjaYuLuKli9fRX9kVvhLcwV5zckkk Lq5MI/ckfOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ6S+TQAKCRCLPIo+Aiko 1eMVB/9C5K8gG52o0STml3vvf1liB0s84Ks5LDHy2F5FdlMIwEL0AxG9pJhDTraRRWQxWhfcvdx iWeHDlaCIXi8RzKjv0OpVXsU4Z03b8ZLePuqEpF1pc/SfnSNTeVvQOdgPpFoD0yOXQmcVRyWtDj QiQuvB7cxu1O+bdPjgtmngnoXBpWlyGolJdbuOrPpPoC9OCfy8YGpbUDxmvG/ME1bajWeuVdKx/ 0/PLY8/irbp+KQlLRyb5y7WXztG2GuCyDVSzDHAXpkBKrF6/WilK//fdnEh+lM7/0CdHc4XPEFi Rong0q0dDjjHWMLQ2OKVYrcH2DdiGB5rjyI8lfDLCpjvH/Hw 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" DRM HDMI Codec framework is useful not only for the HDMI bridges, but also for the DisplayPort bridges. Add new DRM_BRIDGE_OP_DisplayPort define in order to distinguish DP bridges. Create HDMI codec device automatically for DP bridges which have declared audio support. Note, unlike HDMI devices, which already have a framework to handle HPD notifications in a standard way, DP drivers don't (yet?) have such a framework. As such it is necessary to manually call drm_connector_hdmi_audio_plugged_notify(). This requirement hopefully can be lifted later on, if/when DRM framework gets better DisplayPort ports support in the core layer. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/display/drm_bridge_connector.c | 66 ++++++++++++++++++++------ include/drm/drm_bridge.h | 14 +++++- 2 files changed, 65 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c index 30c736fc0067e31a97db242e5b16ea8a5b4cf359..5e031395b801f9a1371dcb4ac09f3da23e4615dd 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_dp: + * + * The bridge in the chain that implements necessary support for the + * DisplayPort connector infrastructure, if any (see &DRM_BRIDGE_OP_DisplayPort). + */ + struct drm_bridge *bridge_dp; }; #define to_drm_bridge_connector(x) \ @@ -496,6 +503,25 @@ static const struct drm_connector_hdmi_audio_funcs drm_bridge_connector_hdmi_aud .mute_stream = drm_bridge_connector_audio_mute_stream, }; +static int drm_bridge_connector_hdmi_audio_init(struct drm_connector *connector, + struct drm_bridge *bridge) +{ + if (!bridge->hdmi_audio_max_i2s_playback_channels && + !bridge->hdmi_audio_spdif_playback) + return 0; + + if (!bridge->funcs->hdmi_audio_prepare || + !bridge->funcs->hdmi_audio_shutdown) + return -EINVAL; + + return 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); +} + /* ----------------------------------------------------------------------------- * Bridge Connector Initialisation */ @@ -564,6 +590,8 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, if (bridge->ops & DRM_BRIDGE_OP_HDMI) { if (bridge_connector->bridge_hdmi) return ERR_PTR(-EBUSY); + if (bridge_connector->bridge_dp) + return ERR_PTR(-EINVAL); if (!bridge->funcs->hdmi_write_infoframe || !bridge->funcs->hdmi_clear_infoframe) return ERR_PTR(-EINVAL); @@ -576,6 +604,16 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, max_bpc = bridge->max_bpc; } + if (bridge->ops & DRM_BRIDGE_OP_DisplayPort) { + if (bridge_connector->bridge_dp) + return ERR_PTR(-EBUSY); + if (bridge_connector->bridge_hdmi) + return ERR_PTR(-EINVAL); + + bridge_connector->bridge_dp = bridge; + + } + if (!drm_bridge_get_next_bridge(bridge)) connector_type = bridge->type; @@ -612,21 +650,21 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, 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_bridge_connector_hdmi_audio_init(connector, bridge); + if (ret) + return ERR_PTR(ret); + } else if (bridge_connector->bridge_dp) { + bridge = bridge_connector->bridge_dp; - 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); - } + ret = drmm_connector_init(drm, connector, + &drm_bridge_connector_funcs, + connector_type, ddc); + if (ret) + return ERR_PTR(ret); + + ret = drm_bridge_connector_hdmi_audio_init(connector, bridge); + if (ret) + return ERR_PTR(ret); } else { ret = drmm_connector_init(drm, connector, &drm_bridge_connector_funcs, diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 496dbbd2ad7edff7f091adfbe62de1e33ef0cf07..40f37444426b1b8ded25da9ba9e2963f18ad6267 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -811,9 +811,21 @@ enum drm_bridge_ops { * * 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. + * drivers. Having both HDMI and DisplayPort bridges in the same bridge + * chain is also not allowed. */ DRM_BRIDGE_OP_HDMI = BIT(4), + /** + * @DRM_BRIDGE_OP_DisplayPort: The bridge provides DisplayPort connector + * operations. Currently this is limited to the optional HDMI codec + * support. + * + * 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. Having both HDMI and DisplayPort bridges in the same bridge + * chain is also not allowed. + */ + DRM_BRIDGE_OP_DisplayPort = BIT(5), }; /** From patchwork Thu Feb 6 13:51:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13963131 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 D508BC02194 for ; Thu, 6 Feb 2025 13:56:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A277710E850; Thu, 6 Feb 2025 13:56:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ZjPz4SFR"; dkim-atps=neutral Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0856610E854 for ; Thu, 6 Feb 2025 13:51:17 +0000 (UTC) Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-307325f2436so8359471fa.0 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=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=UlK+TxmJ+8NTEz5MDIlkU8q1+19XAKmZdwH/ArURmjg=; b=ZjPz4SFRcHkQA2mbHm2JW8z4zObGNC+qfvMb+gG8pQy/lzoKvMdhYOQUqWcGhWsdPH GaADIF2xVSCZOa4DxiAiroAuWe6/UhBk+ppVMKwjCHW/BCcZZ9jNbcS1/QFrj48dIjkD KnhdI8/EfLHGTWI5cAtFGlz/4IRM1vg5fucoaNTPl4YFSGF14wnT8jkZmFrGKeaJac9z D1P9NUHFygiuQ2jpIRX1C2IT+rOJcmvnHcvkLwsXhj6q/jd1dFzGpXD3908j6Zt5rExs RadCXIEjjbXA2VYxp1DhphEk8Ujjff7xEjgzoMgmnX4s3ORgtQjluwqohu6WHIevPAEA L5zQ== 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=rAYCVbGfg9Cz7qtKP7At2WWObLEhmyz7+3b/A/6FD67lykta3FZrAh0V9/iRfWqpdT Yp9x1fZAX+tyKz8dZi6E2wq9wj4iAJ3M11VgRIVtcAVXHbsXlBEkXs6pYAXHZKUJjzMa uGYYqUQ8unLq9/aoIslJv6SzR+DCvcIWUCIxR1XDm2jadSDLjiJpwMeGgMbS2P+HyTFN 2A7SFN3+ob1nQ3YSyZnUNGzJfj2smbO2pNm6r7wJsFT3o6suZwVeHEvbKoElcFzosbKO GLex+5+c9w+P320nNXZRZE5ALGtEcIDnmbBDE63tEWz5DH9X5F/kHmXtRybmiROKtqCI /4pA== X-Gm-Message-State: AOJu0Yx/r+ta2vespoeszzdzQpGNLQHMfM7ll1OfHSDd8FU81TKFCucb 5Sd+8Gf6qZFi7SExKuAhN+Nudf/TMiVxb/LVvKNmE18+b6YQc4KxEAj7WsT/JNA= X-Gm-Gg: ASbGncu7pE8hTePbpHcbSUJ8aw5aJDEcwA0sEODpGO/mLi4LSDHdglm89lotRlz1hgn waWGqsKRH4oDFe0CYNbIm1A6ByAjo8VZoTePVYOmDW0KinXcrEMCW2rljJhI2o9SvviZK/6qSXq KKJa7Q7smEO1pHVWoukv0RAfHg0Gn51XjO9t/XesqQaqqJ9ge2uI0L0JQtkj9a3hPUzX+G4+G5f HIpA+OhiWr/GncIIQ47zGfm+DL7mlGgdFUEgo2KQ3mwlAc1SgRvo+dRlhAQ7IoB1vIRsEnBBDLl kYIStOl61wzy5N54KVwjEIg= 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 MIME-Version: 1.0 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 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" 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..fe36a3bcfe03994952d1b5e1b423e923e3e3b014 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..f8bfb908f9b4bf93ad5480f0785e3aed23dde160 100644 --- a/drivers/gpu/drm/msm/dp/dp_audio.c +++ b/drivers/gpu/drm/msm/dp/dp_audio.c @@ -13,13 +13,13 @@ #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" 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_private *audio, bool enable) msm_dp_catalog_audio_enable(catalog, enable); } -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 *msm_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 = platform_get_drvdata(pdev); - if (!msm_dp_display) { - DRM_ERROR("invalid input\n"); - return ERR_PTR(-ENODEV); - } msm_dp_audio = 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_audio); } -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 = to_platform_device(dev); - if (!pdev) { - pr_err("invalid input\n"); - return -ENODEV; - } - - msm_dp_display = 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 = to_platform_device(dev); - - if (!pdev) { - DRM_ERROR("invalid input\n"); - return -ENODEV; - } - - msm_dp_display = 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 = 0; struct msm_dp_audio_private *audio; - struct platform_device *pdev; struct msm_dp *msm_dp_display; - pdev = to_platform_device(dev); - msm_dp_display = platform_get_drvdata(pdev); + msm_dp_display = to_dp_bridge(bridge)->msm_dp_display; /* * 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; } - audio = msm_dp_audio_get_data(pdev); + audio = msm_dp_audio_get_data(msm_dp_display); if (IS_ERR(audio)) { rc = PTR_ERR(audio); goto end; @@ -281,15 +216,14 @@ int msm_dp_audio_hw_params(struct device *dev, return rc; } -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; - pdev = to_platform_device(dev); - msm_dp_display = platform_get_drvdata(pdev); - audio = msm_dp_audio_get_data(pdev); + msm_dp_display = to_dp_bridge(bridge)->msm_dp_display; + audio = 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); } -static const struct hdmi_codec_ops msm_dp_audio_codec_ops = { - .hw_params = msm_dp_audio_hw_params, - .audio_shutdown = msm_dp_audio_shutdown, - .get_eld = msm_dp_audio_get_eld, - .hook_plugged_cb = msm_dp_audio_hook_plugged_cb, -}; - -static struct hdmi_codec_pdata codec_data = { - .ops = &msm_dp_audio_codec_ops, - .max_i2s_channels = 8, - .i2s = 1, -}; - -void msm_dp_unregister_audio_driver(struct device *dev, struct msm_dp_audio *msm_dp_audio) -{ - struct msm_dp_audio_private *audio_priv; - - audio_priv = container_of(msm_dp_audio, struct msm_dp_audio_private, msm_dp_audio); - - if (audio_priv->audio_pdev) { - platform_device_unregister(audio_priv->audio_pdev); - audio_priv->audio_pdev = 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 = container_of(msm_dp_audio, - struct msm_dp_audio_private, msm_dp_audio); - - audio_priv->audio_pdev = 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..58fc14693e48bff2b57ef7278983e5f21ee80ac7 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); -/** - * 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_audio *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); -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); #endif /* _DP_AUDIO_H_ */ diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 24dd37f1682bf5016bb0efbeb44489061deff060..cc3dd56b6ff48494e4c1e561a6cac6a54d7c1f34 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 #include "msm_drv.h" @@ -287,13 +288,6 @@ static int msm_dp_display_bind(struct device *dev, struct device *master, goto end; } - - rc = msm_dp_register_audio_driver(dev, dp->audio); - if (rc) { - DRM_ERROR("Audio registration Dp failed\n"); - goto end; - } - rc = 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, struct device *master, of_dp_aux_depopulate_bus(dp->aux); - msm_dp_unregister_audio_driver(dev, dp->audio); msm_dp_aux_unregister(dp->aux); dp->drm_dev = NULL; dp->aux->drm_dev = 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); /* 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); } 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_display_private *dp) return 0; } -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 = fn; - msm_dp_display->codec_dev = codec_dev; - plugged = 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 valid * @bridge: Pointer to drm bridge structure diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h index ecbc2d92f546a346ee53adcf1b060933e4f54317..cc6e2cab36e9c0b1527ff292e547cbb4d69fd95c 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_ #include "dp_panel.h" -#include #include "disp/msm_disp_snapshot.h" #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; - hdmi_codec_plugged_cb plugged_cb; - struct msm_dp_audio *msm_dp_audio; bool psr_supported; }; -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_drm.c index d3e241ea6941615b8e274dd17426c2f8557f09b5..0139b6c2e53f48785cdffaf4ccfe391098da3715 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -11,6 +11,7 @@ #include "msm_drv.h" #include "msm_kms.h" +#include "dp_audio.h" #include "dp_drm.h" /** @@ -113,6 +114,9 @@ static const struct drm_bridge_funcs msm_dp_bridge_ops = { .hpd_disable = msm_dp_bridge_hpd_disable, .hpd_notify = msm_dp_bridge_hpd_notify, .debugfs_init = msm_dp_bridge_debugfs_init, + + .hdmi_audio_prepare = msm_dp_audio_prepare, + .hdmi_audio_shutdown = msm_dp_audio_shutdown, }; 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 = + DRM_BRIDGE_OP_DisplayPort | DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_HPD | DRM_BRIDGE_OP_MODES; + bridge->hdmi_audio_dev = &msm_dp_display->pdev->dev; + bridge->hdmi_audio_max_i2s_playback_channels = 8; + bridge->hdmi_audio_dai_port = -1; } rc = devm_drm_bridge_add(dev->dev, bridge);