From patchwork Sun Feb 9 13:41:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13966926 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (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 EEE861DE2A6 for ; Sun, 9 Feb 2025 13:41:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739108487; cv=none; b=fF66KmCOPCU1i3Etrr98bBhSy2j0tOUVJbwK7GXouOKij5A2Nu+M5oK/a03c4RDQAHM7w03CyIrDE1jaQycKU6H+H3J8U0p+XCShIGYU8nI56iDNHBJ3XIHM5LqYp4mnSiyrgCp9MBEjzKwj3mk0rgRw9DjZN/v+FLSpCXLWizc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739108487; c=relaxed/simple; bh=mpzXyzeB8MzX6qw01rpg9ImZYnr1dtKSgAZWq7ewrIQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=k427KMH7dsE6cuPifVdhkFZq3B4VI1vU2d10OQzqfB6nlqLJtlAodbq1RRpRQoeE+nhgb2iq+CH34Oqgo2CZpdrYHlOZeYdQMbHG1bdMpDvlmiDxtDSIy+A/HKfrhSGyJ+t0wynkjkqdB84RK6UcEDV8DpQArEXu4NwCXqTqOxs= 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=ZFMFkKfA; arc=none smtp.client-ip=209.85.167.47 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="ZFMFkKfA" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-543d8badc30so3950778e87.0 for ; Sun, 09 Feb 2025 05:41:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739108484; x=1739713284; 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=TXvHeC1Yf2GuOiuplAspcKQmKn7+kgoDshB/4Jadi1Q=; b=ZFMFkKfAkoreGg2qmw6tPz1DY5y9qLlsqEJ0c5C8gdamRlxWocgs/SgxlPuAPU3T4p +M7peNYfETCoaZN3SotpPj02uRpIrs4lJWlMoiTrX5pRfMDfQR2RNy2xFMLLzkxnt9rD k4NsPBl4SlNlcvGwjqZbfyp+++KfMhdGecZMffb7zh7i6RJhDkyfs59TyDkKllLZXXZY tqnr+mnzzSOMxxaGB3Afs5KLVEYmF2bjVn/nu/cVETL/nHucMb54+Lvj740OaD9WSco3 vdt5cNo2FMAeow47Odu2B2NqvuvCwrV/3phYZ6sQNHct+IBEhiD1dPKgWht4jpYvl6Hq 0Izg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739108484; x=1739713284; 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=Fv8XF1xxVhlpEG8/v43unwmpDMWqZ0yTTRVA98hln50bbZ3+O2GTJfLYpWD27uh6B7 bvwUgc4Qe0+CFQjFMiNVzDfV6WkcmTox32HyCVyt2BBgIvBBfDuO6lEZ+CCbB0MAOO6j rvBbbQ2kh3onKFQ3BuiUtBL6i8FWEwQKz/Klhtt9KjsHWhZuH3askrWJeSY1g4IPtemA NyVmx0+wezRb6V/qa2qNUh43/gwJy2vm0AHtyz18e62AL30XTcVxCaCXztp/Bvb1X96V miCl7TsNWelrUIrdgMYLJm2C1DxAN1+Pas2UckVJbJSvz40Jnf/zUEjjFOoYEr5h2IAe cZTw== X-Forwarded-Encrypted: i=1; AJvYcCWPQzfMUGwa0rBUK7IToFTUnb+xEZwAtpKaQnT7KEm5iCebCidhaRb7y9k6jYlnaqJ0m345uC5Mamw2QqIa@vger.kernel.org X-Gm-Message-State: AOJu0Yw7ccFtaLDEhz16UXOxIzJSAplpFvoPGogx3eLxG5CM9dkpGopk dz/xmlZt8abx7ViCBQ1BuIdg4iu2c/WG54w3WGoMFCoQPILuWtS55pQ2ZX9qhJQ= X-Gm-Gg: ASbGnctieDUKOeBNJ3xn8asdH8y17kaZHnvCn2vxb8X/84ruyZiekpSP2bJSgsyiYac VPGy/OvakRcwmFncYf/2/mh5KYch9NanSyx6ToGZs8xfhr5aDGkWvvRftNnNDwTDEgCLhRx+iKc 3iYNW73s+KLQJUbA20/wnz+EsZetvO1E7CMxGknzMyNiPWCs/qRzBpQ82e2h5bqQ6NOZHtFRKgu pbbc1Bx8IgXUXcZKX4kkVzYsuWzZVtx4E3kiCscipW0RVg2FVQOVXMQoUBs4K+QKKaDJmH7qu6O bYeyRTSaxHLS70pSrTwvHpM= X-Google-Smtp-Source: AGHT+IFfWR4dVE7Cp59mLMpuwlAs8llhkbly9sjeAkaRfVljjLw1MFuB0NCAsLP3fdi6iyWTdSlnGQ== X-Received: by 2002:a05:6512:3288:b0:545:5d:a5c3 with SMTP id 2adb3069b0e04-545005da7eemr1795633e87.4.1739108483912; Sun, 09 Feb 2025 05:41:23 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-545069b3f77sm362914e87.63.2025.02.09.05.41.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2025 05:41:22 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 09 Feb 2025 15:41:18 +0200 Subject: [PATCH v2 1/3] drm/display: bridge-connector: add DisplayPort bridges Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250209-dp-hdmi-audio-v2-1-16db6ebf22ff@linaro.org> References: <20250209-dp-hdmi-audio-v2-0-16db6ebf22ff@linaro.org> In-Reply-To: <20250209-dp-hdmi-audio-v2-0-16db6ebf22ff@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/pANAwAKAYs8ij4CKSjVAcsmYgBnqLB/MpuXYwXU8Xj/Lh0xVwrD3W64fefaVBNlZ JNVGPX71heJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ6iwfwAKCRCLPIo+Aiko 1ecxB/47Oce9OKy+1aFzInu1wh5qqasUXCpnLE4Z8APX+W3GlNn8p7bwQe1P3yNVdCndtot1S4s 3TuLj2naiOr0bEZekqzjOocybKNuztrAZAaYpQJ87HbDhyF0rXQ7F9PpipsyVqD6fPhJMGd9jZi 4A1FR0fMJuXTccfi3sKI44hcFTGIEqOkIrtPCq7xXs7PULA6H7adC/ezkC9WqVmtmDhU968w66M EGzmUlqS3sfBOtfmSpKbwS02w2uYW3iNYUS4jD5ntqZXpkCFr7C2M83xsrwp8wbTOWS+4l4pyl8 PCkkfg4j6GgsgIKp806ySbNov4JdUMj9oZ4wLgK6q5gOv15j X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A 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 Sun Feb 9 13:41:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13966927 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (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 970961DE2A6 for ; Sun, 9 Feb 2025 13:41:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739108490; cv=none; b=YK7AM/yIBFm8YVYhUiGZoVA2PdnVkzzTx+Jta1zclPezWAOW8dF4mR1hHEQpIFilwBRt0phpi3MPytCVN1gRokbWLGQqeAw+LukVGHwSLSUNhRjuuGqRWpANXNvsb32oNxlRuRR0CByrqbLg0qHSNhkQQEaFPhGu/tFwW9UjS6w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739108490; c=relaxed/simple; bh=i8AIajCFyJkuetYPgFIKKvSrw8Z3sFXPUR8DYbCT/Y8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hRoqFJk0DrtrYrLFp5/EMYLBZii4WY7RkwIJarXYe2x5FblRgcOLFmX+9p8AWy40u/UVNbMvi1UhRh86Ns/KqJKtE53Y7YugrG+xpzm0FM8ueIp+liCvyeiDw9LDxveWySGf+1u8IGHHIEoqPbQJ0yu2//gqerXPNpxHGYxxz1I= 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=R/S2n+M5; arc=none smtp.client-ip=209.85.167.52 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="R/S2n+M5" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-5450681b606so855556e87.0 for ; Sun, 09 Feb 2025 05:41:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739108487; x=1739713287; 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=lWaltDjOoxflJCFYRxQATxzaFCp3PtCF169disqO0ak=; b=R/S2n+M5rAWqxlMnGIJVs0o96zeJtA4PK/Fh15o8+XMiC/bTc5pWbNXY52GntEmMpl Wcu4WcB/vCUedV55JchLmvpdbW+OrouFVTAFjppphMqMb6CdBxbEc8Fa7vxorqnbLpHM Zm8wSDN0YpJDgxrhs5wxPHcRQlrfZFOavmG7itpUqBcH56ptQGZswfcqR4c5Uki0bJfc Uu9PAQ4fJL9s2YBX7i3V4mfuSfC+8uX6Mb3lEdzP2X8CM09NUQFErx/o6Se/SCQouU4i KcNO6CgsxENtTfbtVXa+GSANqQ4QwONpduc6ATMOuVFCOoSXY3prItmm7mP5w9oxDvdN gV2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739108487; x=1739713287; 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=lWaltDjOoxflJCFYRxQATxzaFCp3PtCF169disqO0ak=; b=fxpa/s0fOaIUHjjSKSl8WIyoeqhHnNKIG5KjJqCkISb5AI066WR19Tafs5F744G7so pw27kkn9EPIqHKeR5u5kuku7GSwd38u/Z/ZSM9sipqYSyfLRrkp5RqZo6aZw/ecdnE3T dt2xXRu0BMf1BlLUqMSdMV0FXkP4z6Dok/cBsV5AmsUtlgeyb9Aat/4Mgc3incdgl5+Q kJoJdscCM2AIWgNvl43ic18yOFMujTSvFaRkB7C777QD39eR7k2MZQq2V4pW+jtLzDXK yuMsiFT1xtyPgpdiRlhyqnUdvs0zoZ2YAMPhYablRR/nY2XrOqTgSbzqDuNlUdBUPAZe TO0w== X-Forwarded-Encrypted: i=1; AJvYcCXMhBY5ckY5u3Dod0CR/9bFkilelfIDZW5hWHjkSYC6ZUmQdo/s9pqDTS8afAoCpMn3d7Prpo8ABfIAJjel@vger.kernel.org X-Gm-Message-State: AOJu0YzRoKUkwDpO0isazYAx5cuWXOeLWvMbx9z0pF4Rr0ct/z7RuAGS 0/Tcqy2oZFW9a9qZO7VP+zsSVk21GvEU9z+2UNIeysrhyqq4dMlOUjdLGCHqKcc= X-Gm-Gg: ASbGnctIzMKjUdLHD9dFL5UJ6skqkFWWydMJvNx6ecRqf3zB75XDSToIyjRFcasuVYa N4aPwCMpuTZZ5SipYxaSMCc9TC1hgb2slF/eWhwvTY3p2t0nb7d5YVLHJbrxF+dMkU5BfH6aYwv qcl+LjL+jfxpzdVKlZC9ItbWHxXEe6q2SAbWpTf981HSJNR4v+Xa05WWMX/wzmZR4HbSI19OiVK pYYi5EAPUpVuN4Wf4dsPrRRx42wqFedsTrw4jDsbdccA1SeFD8fQJVSbFG1XgTScD0LVN5KuiSg 6k60xL6l575Yccvay9nNzls= X-Google-Smtp-Source: AGHT+IH2+ci1FbKoITit5GafLqBixMvMYDNiadDVJBz/IabhQTlCodZTQPXgFXjD9PXiTXWIANayLQ== X-Received: by 2002:ac2:58e8:0:b0:545:b28:2f94 with SMTP id 2adb3069b0e04-5450b283186mr306347e87.25.1739108486383; Sun, 09 Feb 2025 05:41:26 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-545069b3f77sm362914e87.63.2025.02.09.05.41.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2025 05:41:25 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 09 Feb 2025 15:41:19 +0200 Subject: [PATCH v2 2/3] drm/display: bridge_connector: add DisplayPort subconnector property Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250209-dp-hdmi-audio-v2-2-16db6ebf22ff@linaro.org> References: <20250209-dp-hdmi-audio-v2-0-16db6ebf22ff@linaro.org> In-Reply-To: <20250209-dp-hdmi-audio-v2-0-16db6ebf22ff@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=958; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=i8AIajCFyJkuetYPgFIKKvSrw8Z3sFXPUR8DYbCT/Y8=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnqLB/ZhixkAWuIJaWneUEqNA+Zs8u9ybu7ho5t JJfUcchAv2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ6iwfwAKCRCLPIo+Aiko 1TlaB/9n/dtp6mZmO1VrIP0Hjk2PuuHdQGOc7BsiKtPR3dbEM9Xd6iJMEoMDKg5dhrmn/lfCV9J XjlmlgAmRsd/L7GuSfEKTabhgMoma5pTlYizJvCOk0mZJezCN4x2QFBJ8gF48CrzKqOwaH8ii3E /n2xBFYLzPQ+AljZjaeJffl64V0QONMpLe92Pz/Xv+yi9TBGZ2E53YNBT3FEi9chbdQiTfk733S +WvON9hBsj6WWgWfJCcJlFnX5aZXB9c/iVf8XoYFTnSllnDkG9260wpDC31aSKykYAKB0GWD125 5KCIOMJVxL+lqo2j4MtObd6aH1xfJwEnASBCkoq74dvveXOp X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Create the DisplayPort subconnector property for DP connectors managed through drm_bridge_connector, removing the need to create it manually by the drivers. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/display/drm_bridge_connector.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c index 5e031395b801f9a1371dcb4ac09f3da23e4615dd..df9e6b46b40454385f7023310327c5c99d5c6a5a 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -662,6 +662,8 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, if (ret) return ERR_PTR(ret); + drm_connector_attach_dp_subconnector_property(connector); + ret = drm_bridge_connector_hdmi_audio_init(connector, bridge); if (ret) return ERR_PTR(ret); From patchwork Sun Feb 9 13:41:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13966928 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (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 E4C801BD9C1 for ; Sun, 9 Feb 2025 13:41:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739108493; cv=none; b=ibBT3hN5YtJwB3SzMGJPLEuTcEKGeyl9h2vqimQdd+19VwG5S72YBKJZVsz7a35CpgIspJ5EilDrQTcdopI95XAVh7+Mg8KH9/CnPbF8YUmtv+SI6r0ayr3kt1xHZobhJTi4JDxg+KB9FNUlkbiqforyzBNGmCVWlcLgoUTK5jU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739108493; c=relaxed/simple; bh=U9fjK3CdRhY5i4kn8WSV2yVUc7hQ8759cEUvCFL83vs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TpEOv1vOR44EH2+1BbHd+3uttcX/AqmuoZLFZ1Btl9P70pJFen3VX153Lo3w4gwYx0EWb70ecfc4bpl86FoN99o50jCrmvPZ0nYs/j3S7D9xarpN8c6xmMFTr/3LXMSOdymTxEf3JALemIxSB17We6j0+hDcSMUNAN3zi3iFZL0= 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=m8fHNnZr; arc=none smtp.client-ip=209.85.167.44 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="m8fHNnZr" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-543cc81ddebso3939222e87.1 for ; Sun, 09 Feb 2025 05:41:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739108489; x=1739713289; 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=CUQYYbdTTTt5sqX5kLWGsqACEyBkttHl9oUdOcRxw2s=; b=m8fHNnZryKJCE5yXI0gapagrtdEM8IAZKTWP9GtstWH2NrUQx+X39B86WFVB/Q4TYU PQY/qFpZGQFVUGwZb5wL4Yg2+ozoJlsBPjgONFzq6nkHIuEoG6lS4pP0vRh3bPEx7+Fa N6vssaeQZ/kiTHr9ggw/y+0ybDejFHayC5Yun+of6K/yHbPwACSLM85dRWiDv+mp3H6X eqfLTGn6hApjfxKzGFYQYe/6uwgomHXAxUN1Pq80nEf0ScLj+opAj0G9OYef6QdOLfMs VWEklCaMkVWNjy35BLxoVxR+/npAcXpdzJn/YA/ByflDQ+Sp2Fs8ioX1ABrK3TCXo1jo 7bFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739108489; x=1739713289; 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=CUQYYbdTTTt5sqX5kLWGsqACEyBkttHl9oUdOcRxw2s=; b=VMPtT/XQQwZN0mcQGTyDuaxWDBRRrtOJstwP49kd+ReqzeVSK3+cEyGBM/W2vvIt9w kz6mO1y3N02QjL40iNiV0jlwOfCk+cPwq3p4pU4Aw8GBBySXDMEaFNbmuOnM3/t++OvE yXoDArr8/WYKqN7wheX0dIfKfFP1EpEHubuFbT+JcwV7O5moPrwxVnYkaH2+oDrKzefp DfTzWM167GEETMVa8Z9cAr5mrhkObM7XYpG1Q08lxtOliGaRtaSw5DW+aewtBpCq4rrS uM72egnFXSWK9u6twI7d+ynA4USY7awT5KfW6oRcUtNPc1f32Wa+O3Tr3381GiLUNHMn HO0A== X-Forwarded-Encrypted: i=1; AJvYcCW3/alJMaSajvCglNYrSN9g8XnQc3o3j3NHcILErUTbv0tQrdWuctl3cV1hYOawItdHumGWN+Kp2UoA/2tC@vger.kernel.org X-Gm-Message-State: AOJu0YzIWX9ORoesAaVv5Bva3gOs++epgwle7UwWOLoHQCVGpKcW2AR1 9zSOxKadA59HLj52jJwFMrVWX+MkOx/H0F/tE0PUQrJBCD5XpqznUhUw3/rfC3c= X-Gm-Gg: ASbGncvCIUthYbO8tQLRml2ljiVHifJ7exVkqhTv82OZ39XMCFdpqlWdwSm9nQIAf3b 54F0hgi9Hc3smuIqz16a1aJQcGKHbpL/NeH7SsbA7upjaktQPaBK+qaTMDBGJQI5dIkrAhfoi6K X58ldZ0G+bkqM7Jkcgd4ppkyNJCI/NGIatOZg9HKNwWoH6KwNxkI1yQ2noDecSP0DYpFq8fsAJm j51h2z4TPs/omYPGis7Nf3RXYu+ypnA1pLGxRmxPa5rF/MOylODV1+Hpp3pIQIL3cnRsqTfs1+G WkTRp7pD2Rvzko+kH/8hg68= X-Google-Smtp-Source: AGHT+IGBuZgijzsBqWVUK3O9Be/8abAf1ahphcHhauIagohBtmqzEMTP16RKIn1owRDTC6gKFy7VAg== X-Received: by 2002:a05:6512:3e2a:b0:545:6a2:e56 with SMTP id 2adb3069b0e04-54506a20fffmr1240643e87.37.1739108488804; Sun, 09 Feb 2025 05:41:28 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-545069b3f77sm362914e87.63.2025.02.09.05.41.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2025 05:41:27 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 09 Feb 2025 15:41:20 +0200 Subject: [PATCH v2 3/3] drm/msm/dp: reuse generic HDMI codec implementation Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250209-dp-hdmi-audio-v2-3-16db6ebf22ff@linaro.org> References: <20250209-dp-hdmi-audio-v2-0-16db6ebf22ff@linaro.org> In-Reply-To: <20250209-dp-hdmi-audio-v2-0-16db6ebf22ff@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=14622; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=U9fjK3CdRhY5i4kn8WSV2yVUc7hQ8759cEUvCFL83vs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnqLB/pBBiW0Jpv54+eBOlSr/xFC6FKzGSgK7D+ zywZxzX1MKJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ6iwfwAKCRCLPIo+Aiko 1S9GCACQCDF00rTMJ9+sBnGhm2ZxXMKWxZF7LuiPGxFrOFzsPl3LpsYATAbxWhbnKkB+3DrrIC4 6+eHEnvjtqOnmG/ZIhOcs1UGz7uFSnG9wePMKC5Cp9xJ0/QRIuHkzL7n4w5Q0UHfXTZ/5PkncHP QWAQgAgU4fRH3VHlxt1Tt04mj2ioAViGRbIokIyd8Z81GaMqrZocVx9dD7E8hFRMX9YaCs9E8fH o5uWUnMu6k1zr5cUcxzjuSnvu0uuD4WZjtqcAp+9kE+bmP1Q1ddn+aGOIXCc0IX1Fwg6YYpQKa3 795Xy2zTjtqQz9Dpn1avHl3gX8Wi63ENyuoHhOLrHRhyhFih 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. As a part of this change, also drop the call to drm_connector_attach_dp_subconnector_property(), it is now being handled by the drm_bridge_connector. 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 | 31 ++------- drivers/gpu/drm/msm/dp/dp_display.h | 6 -- drivers/gpu/drm/msm/dp/dp_drm.c | 11 ++- 6 files changed, 34 insertions(+), 173 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..aa19dfd267da97a6bb626a1d4e773f82aef571b5 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; @@ -351,6 +344,8 @@ static int msm_dp_display_send_hpd_notification(struct msm_dp_display_private *d /* reset video pattern flag on disconnect */ if (!hpd) { dp->panel->video_test = false; + + // FIXME: when reworking HPD use bridge->ops & DRM_BRIDGE_OP_DisplayPort if (!dp->msm_dp_display.is_edp) drm_dp_set_subconnector_property(dp->msm_dp_display.connector, connector_status_disconnected, @@ -379,6 +374,7 @@ static int msm_dp_display_process_hpd_high(struct msm_dp_display_private *dp) msm_dp_link_process_request(dp->link); + // FIXME: when reworking HPD use bridge->ops & DRM_BRIDGE_OP_DisplayPort if (!dp->msm_dp_display.is_edp) drm_dp_set_subconnector_property(connector, connector_status_connected, @@ -611,9 +607,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 +888,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..37dc0ba607f28e5ab65bb5d8ebe8ade0660be287 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); @@ -361,9 +369,6 @@ struct drm_connector *msm_dp_drm_connector_init(struct msm_dp *msm_dp_display, if (IS_ERR(connector)) return connector; - if (!msm_dp_display->is_edp) - drm_connector_attach_dp_subconnector_property(connector); - drm_connector_attach_encoder(connector, encoder); return connector;