From nobody Tue Feb 10 10:04:09 2026 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 E842A2139D7 for ; Tue, 24 Dec 2024 23:10:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735081842; cv=none; b=Fs+lulCNw/VVo7aHD0DUWn7vg+Vm2dCPY6lKvQY/+jD8mYqWMGQYBaXVschwn7ap2LX16bhKBAXhWNAZamhEr2qFJSweSouagl/Fnw9r1fUIbHqW6hs2aYhhzNe5TwBhaGay6bLFExJ32Cqo6wu009xW4wd0Avmx6aWpOomi92A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735081842; c=relaxed/simple; bh=X9IwqP014YM7Yqs7I1CTwyxkzFvnciX/pqhUwGCgKmI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TCHLXE0cZGBE+CfHR/rq898wthXPfRchn34+rckcaKJuQs6EAmqxpfOR7zIGGB7Td2bxSG2kC4KxchUIoyETJV2+rj8A3Hse278zBRS+E6fpD2hU8HQnOgqrKJPY0HZxkIzp0f/9e61MtkRs3hpjS6QeNAqjmBc4lfw1ZzUkR50= 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=V/Hl6OUa; arc=none smtp.client-ip=209.85.167.46 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="V/Hl6OUa" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-53f22fd6887so5213974e87.2 for ; Tue, 24 Dec 2024 15:10:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1735081839; x=1735686639; 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=CdewCk/PRTWQN0dylNFNsSEtCEp3tuP1E7w2vIr9TcQ=; b=V/Hl6OUax6WM9jy10FWTV5s7+9YMRSWf/ErdON1F87N3Ky4EKI58Zg4Q2SFeP619o/ FUTR22h7wCIKffmBuzsI2gJ+QMNL2rzTaWRE81414Hpy0oX2RJA1JIRXqwAfVI0754BL Znj3Uark3JjC2prOxyI2+rntOTTI1DRYzwa5pt2vrqlB2DituMpmYIne1f6FqiLTLrMh D5Pc+rIBjrsRr/+67Cm+1m3taDINc+jaUFbBBQuq1/mbfNEbDOsmZGs2og8chUi5uOO1 GrkGs5iQ05SbpwJPMIreA8XIKs0CS3nS9efDtV4QnVqMx4JmUUJ74xE6y+hmFuTpN6Sl Glxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735081839; x=1735686639; 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=CdewCk/PRTWQN0dylNFNsSEtCEp3tuP1E7w2vIr9TcQ=; b=Tjpt3xtnBDqtBbEr3pHZHimIlsvJV64E98AjIBEhses0av4z9TYLdpPJ+BViMaNZpq 4anK6M6250kvYPRPXJ/fmypUIbaMI+Jisa5xNtFs6GN1WGT6ERklgmhwwrL3tjVuU8xq 1EDUz1FVi6dcLHb4Gv831oLqMpqU50Ni3vn87EP5rEZyqQMZCgLJhGzqyuQoVjZYAb80 ReQ6Azqi8WXKEQPw9B2D7W5LZBzLY2/OQ3BHOVYexccbOKXXPXWj2OjBo1FZVyGzVRid Z/x+peMuW/R6pMI34cQBBBKeOrCdwwsTzRI6RKF/OenTAare9ktuQkTUbhqjpqE6f5Or qeew== X-Forwarded-Encrypted: i=1; AJvYcCUhfqQFHH75cp5YVV6JUn/4My0loG8otsFCz+ldnve15+wgMpvyfvCvNcOw+3JfWg7BaQ4UO0NWchP9PmE=@vger.kernel.org X-Gm-Message-State: AOJu0YwkXo6xToyc2xuUw9PmKfSiZz9wRKezUWoX1stkURVIUTbbD3Qg ftbijXQraI8asxR2LMttAI5tDd6JaILyh2az+jlaDAdBatnqjbPdy+AfnUvMYfw= X-Gm-Gg: ASbGncsGQIKJqUGn2TDtqUDjh92Fj4OI13mCo5T/1xlkWcqZYGwDkKCSIJXJR9oZKFV UqHYI38D5CBOqYNxb2l6p9VqQKjK22h79XxPOnwT/jlUNwZw4azblT4K+P85TN1eug4LucrI9SP 0vnwqlKoyY5sqSrbOfnbl2csF9Imfu4Zub4Upg8A9MYDpcEbCtmB7N4DJ1BmtgRoUbUO/QMSOaY qvto0ujUn3s3M4SMErwU5jcxCqmwv9VWtwHs2VzJgi+9kZmsqgI5HgI/pc3f5G/ X-Google-Smtp-Source: AGHT+IF7yX8NB3dL2I9oCyrwUW/216+uMBZnO7rofkTlzB1tv6R2FT8+EMKGiGeqgjQOzx4R1mgDeg== X-Received: by 2002:a05:6512:6512:b0:542:297f:4f69 with SMTP id 2adb3069b0e04-542297f4fe6mr4383196e87.41.1735081839049; Tue, 24 Dec 2024 15:10:39 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-542235f5f74sm1721283e87.43.2024.12.24.15.10.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Dec 2024 15:10:37 -0800 (PST) From: Dmitry Baryshkov Date: Wed, 25 Dec 2024 01:10:17 +0200 Subject: [PATCH RFC/RFT 9/9] drm/display: bridge-connector: handle CEC adapters 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: <20241225-drm-hdmi-connector-cec-v1-9-b80380c67221@linaro.org> References: <20241225-drm-hdmi-connector-cec-v1-0-b80380c67221@linaro.org> In-Reply-To: <20241225-drm-hdmi-connector-cec-v1-0-b80380c67221@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5825; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=X9IwqP014YM7Yqs7I1CTwyxkzFvnciX/pqhUwGCgKmI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnaz9WRj8gJm92HaOlOvdvAm82lKlETw5HUFrkp Djq2qO2o3yJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ2s/VgAKCRCLPIo+Aiko 1eEeB/0bxzxQhHj2XJ/dcUJ79F7c1hHbybD9qcBjuaYPrBxbGxm1/PdrpjTFEa7Rpthx3TJZw38 b90yxkRyc3iAJp1C/XKuCZSLj1k9AjEEd5tzCYth8QJ3M+caNnETQDHQw25twDNxJSR8jyjf8GF YVn8EOghnQgd1jU7Yl06fKZv1VApgGfDHy44wZ/ZHyCjaNI7LHG7uDoKAFIkYxnhwRE70TmykB5 Wm3/8mS7eWm7xFxlvHPOaBm2HOW/MDjX0+M1aF6Ly9z7HbVOHHLz5SIbvnAK8arikIZ1qVIC/js D8HV9NAmd4q02rYDJGxmq40Ikvrjgqm3SqpXZA5UUUn3derG X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Implement necessary glue code to let DRM bridge drivers to implement CEC adapters support. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/display/drm_bridge_connector.c | 95 ++++++++++++++++++++++= ++++ include/drm/drm_bridge.h | 25 +++++++ 2 files changed, 120 insertions(+) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/d= rm/display/drm_bridge_connector.c index 291abb4bcfefd12e1a57a22ba5ccce21c15196a4..f6d04f5aa261b3d0cec4057d4c9= 595e494c34264 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -9,6 +9,8 @@ #include #include =20 +#include + #include #include #include @@ -497,6 +499,80 @@ static const struct drm_connector_hdmi_audio_funcs drm= _bridge_connector_hdmi_aud .mute_stream =3D drm_bridge_connector_audio_mute_stream, }; =20 +static int drm_bridge_connector_cec_adap_enable(struct cec_adapter *adap, = bool enable) +{ + struct drm_connector *connector =3D cec_get_drvdata(adap); + struct drm_bridge_connector *bridge_connector =3D + to_drm_bridge_connector(connector); + struct drm_bridge *bridge; + + bridge =3D bridge_connector->bridge_hdmi; + + return bridge->funcs->hdmi_cec_adap_enable(bridge, enable); +} + +static int drm_bridge_connector_cec_adap_log_addr(struct cec_adapter *adap= , u8 logical_addr) +{ + struct drm_connector *connector =3D cec_get_drvdata(adap); + struct drm_bridge_connector *bridge_connector =3D + to_drm_bridge_connector(connector); + struct drm_bridge *bridge; + + bridge =3D bridge_connector->bridge_hdmi; + + return bridge->funcs->hdmi_cec_adap_log_addr(bridge, logical_addr); +} + +static int drm_bridge_connector_cec_adap_transmit(struct cec_adapter *adap, + u8 attempts, + u32 signal_free_time, + struct cec_msg *msg) +{ + struct drm_connector *connector =3D cec_get_drvdata(adap); + struct drm_bridge_connector *bridge_connector =3D + to_drm_bridge_connector(connector); + struct drm_bridge *bridge; + + bridge =3D bridge_connector->bridge_hdmi; + + return bridge->funcs->hdmi_cec_adap_transmit(bridge, attempts, + signal_free_time, + msg); +} + +static const struct cec_adap_ops drm_bridge_connector_cec_adap_ops =3D { + .adap_enable =3D drm_bridge_connector_cec_adap_enable, + .adap_log_addr =3D drm_bridge_connector_cec_adap_log_addr, + .adap_transmit =3D drm_bridge_connector_cec_adap_transmit, +}; + +static int drm_bridge_connector_hdmi_cec_init(struct drm_connector *connec= tor) +{ + struct drm_bridge_connector *bridge_connector =3D + to_drm_bridge_connector(connector); + struct drm_bridge *bridge; + + bridge =3D bridge_connector->bridge_hdmi; + + drm_bridge_cec_adapter_set(bridge, connector->cec.adapter); + + if (!bridge->funcs->hdmi_cec_adap_init) + return 0; + + return bridge->funcs->hdmi_cec_adap_init(connector, bridge); +} + +static void drm_bridge_connector_hdmi_cec_uninit(struct drm_connector *con= nector) +{ + struct drm_bridge_connector *bridge_connector =3D + to_drm_bridge_connector(connector); + struct drm_bridge *bridge; + + bridge =3D bridge_connector->bridge_hdmi; + + drm_bridge_cec_adapter_set(bridge, NULL); +} + /* -----------------------------------------------------------------------= ------ * Bridge Connector Initialisation */ @@ -633,6 +709,25 @@ struct drm_connector *drm_bridge_connector_init(struct= drm_device *drm, if (ret) return ERR_PTR(ret); } + + if (bridge->hdmi_cec_adapter_name) { + u8 num_las =3D bridge->hdmi_cec_available_las ? : CEC_MAX_LOG_ADDRS; + + if (!bridge->funcs->hdmi_cec_adap_enable || + !bridge->funcs->hdmi_cec_adap_log_addr || + !bridge->funcs->hdmi_cec_adap_transmit) + return ERR_PTR(-EINVAL); + + ret =3D drm_connector_hdmi_cec_adapter_register(connector, + &drm_bridge_connector_cec_adap_ops, + bridge->hdmi_cec_adapter_name, + num_las, + drm_bridge_connector_hdmi_cec_init, + drm_bridge_connector_hdmi_cec_uninit, + bridge->hdmi_dev); + if (ret) + return ERR_PTR(ret); + } } else { ret =3D drmm_connector_init(drm, connector, &drm_bridge_connector_funcs, diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index a848ab63cc8e9c917e7ca3fe4e279bcf2a83cbb2..65545f9b94cc942e21a2394197f= af8219f5d69b2 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -33,6 +33,7 @@ #include =20 struct cec_adapter; +struct cec_msg; struct device_node; =20 struct drm_bridge; @@ -730,6 +731,20 @@ struct drm_bridge_funcs { struct drm_bridge *bridge, bool enable, int direction); =20 + int (*hdmi_cec_adap_init)(struct drm_connector *connector, + struct drm_bridge *bridge); + + int (*hdmi_cec_adap_enable)(struct drm_bridge *bridge, + bool enable); + + int (*hdmi_cec_adap_log_addr)(struct drm_bridge *bridge, + u8 logical_addr); + + int (*hdmi_cec_adap_transmit)(struct drm_bridge *bridge, + u8 attempts, + u32 signal_free_time, + struct cec_msg *msg); + /** * @debugfs_init: * @@ -925,6 +940,16 @@ struct drm_bridge { */ bool hdmi_cec_notifier; =20 + /** + * @hdmi_cec_adapter_name: the name of the adapter to register + */ + const char *hdmi_cec_adapter_name; + + /** + * @hdmi_cec_available_las: number of logical addresses, CEC_MAX_LOG_ADDR= S if unset + */ + u8 hdmi_cec_available_las; + /** private: */ /** * @hpd_mutex: Protects the @hpd_cb and @hpd_data fields. --=20 2.39.5