From nobody Tue Feb 10 00:39:52 2026 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 CB90115E5B8 for ; Sun, 26 Jan 2025 13:29:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898169; cv=none; b=skVgE6LG0xaFI+f64y4OPqBP7vMKzm+zS6mFAcDOCSGd0uclzVEDpqkdgAEdri1dEfnjfDHMYjSZl9jCD/0iXDgQixzxAfGWnps8n7dwWdA58TtpCDc5Nf9t/0jDnzl7qeKp+qEV2ACqT5w4cob33E50uVnQwFRHUyy0MjPIRgA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737898169; c=relaxed/simple; bh=8KmVPM6GAMlsBDAHnGMu9T0kXZRp9qdL3hAnikOOhow=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sr+gtK0SrK/locQm8E6m9RvWlPcyznCRoKkB+rVVyzuuWLFvJ/hfE3TX8Z3CRtTmuy0zAFGyXViQ+oStzb23B5qD6soEHAtQy8GEW3QXlWHVuEouM3ShQBSD4VyMb1Bd28rVg+PFHk1zbAOdbvRzWxE5ssVPdIIOyfa8ERuLLAo= 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=nTp8SO+j; arc=none smtp.client-ip=209.85.167.45 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="nTp8SO+j" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5401bd6cdb7so3780018e87.2 for ; Sun, 26 Jan 2025 05:29:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737898166; x=1738502966; 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=eaHMvUQVVEqao58qO6A/gTtUiQNtzJSNB/5ccpaHYJU=; b=nTp8SO+j6F5GCHxtVBnNdCsguAh7yOFBYKL3ZaEgj2o6JawQF3Ahlgin3BPvQZX/Nw GnCa6MlczRxnNGN2KM9YMwsL6aFKgsbguRrab/UFZSX4Iv87oImmJnHxI0otRvct7P0s SLpugW4HKqyVOEpaeK/bhD8s6eH2XwJfllJMYGsezCt3MuZp7fGvcy+tdhXEApTD7VVi Pi4+MTVRvUKK4qlQatY8s/hmikrZ0SVW+95RbN6iekKeF0TbaZSmPmjrGjxaVe1f9FWA wSUBJIH4GEdUOpAYS8I+qwIQbbZlXlnEXqhyDELyB87nBXXus1oIOeCndrni2y6ykTK0 onOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737898166; x=1738502966; 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=eaHMvUQVVEqao58qO6A/gTtUiQNtzJSNB/5ccpaHYJU=; b=PlXoBJyE37fQzLqLr2B/GkotsFOH+WXfxnB7koruE0kPp0htC4BpoZ5s+0h59UExhx u0yTYyDFQoYH3WMAyeslOI3MUDgbRbSyBXPw30Q/jKacnah8YtgoHQMq/vLc+41mDotk qo07c+7gMn07lfDn7CY6K/8rahr97NnO36sg43EK+zSKlCBaq6ywqu6q2od+iq3Bttto W7Od7H8y7jKQ3Nx+II8il986q2So4CPeLGpErMYwJntwqGYOc+YQnXgn5eA8rwIOaQag EYMXP+QGFhzlb+vrKQ9ImOJfIAumtW5tA3fbj1elNDvERq83FECyliuUGOac00iWV03A 3n7w== X-Forwarded-Encrypted: i=1; AJvYcCU+0X0s0GLe6lZ7bpwRDebweMAdgdj1HYvGhRrlbS2z6cdp/yv3/S7t9fpBbkF3DwFuDOys0VXRlU8qvZM=@vger.kernel.org X-Gm-Message-State: AOJu0YwRBlfCTSs6Iuz+Cvs5NXv3YdcExHM/e+SrkGJgPfqNibtiZa79 8wCLvXw+ZLAvelIBBxYQHDNnJvVUd1sKooUj9YUzaJFF0fvDAVz1r8ihCD2yNlY= X-Gm-Gg: ASbGnctwvBqIA/1uB93aZN0PslVjMbeAKNxBrtfD0RRbJ1CMghzk8B2sDnRHeFP2Cup F95cykQZ3XM5LjJ7Tr/zDqOPdCPaKUY4UbVKiB759UspWoWZ2es+meufgpwko8xQBsIXeLl9+PW ztM2WzQnWzQq0ubzwgTOJj9piGhZ5vIFH2V8syGl78kE45RRdas/Gypq15PFsRlYYKnPxvBitGH EwdklD8FzBlWbGnmdMHdutfr9lz/ZQp+uc+GgJC4gQSBxgXfNiPdSj5PriAHX82tOO/UK0WvIV6 h0zZY/XD5IC/ X-Google-Smtp-Source: AGHT+IEKdtN0/flyrp4R1BEmnLgqwRjLmXPNVu/6Q4EzCFgKVRbVHrqTCJ1zpGOk1ZBWJIEDf3PA0g== X-Received: by 2002:a19:700a:0:b0:540:1d37:e6c with SMTP id 2adb3069b0e04-5439c245c87mr11786754e87.30.1737898165904; Sun, 26 Jan 2025 05:29:25 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-543cbbd4cf8sm770488e87.201.2025.01.26.05.29.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2025 05:29:24 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 26 Jan 2025 15:29:12 +0200 Subject: [PATCH v3 07/10] drm/display: hdmi-cec-helper: add bridge-related functions 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: <20250126-drm-hdmi-connector-cec-v3-7-5b5b2d4956da@linaro.org> References: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@linaro.org> In-Reply-To: <20250126-drm-hdmi-connector-cec-v3-0-5b5b2d4956da@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=5348; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=8KmVPM6GAMlsBDAHnGMu9T0kXZRp9qdL3hAnikOOhow=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ/o0iyXp3JapNftqjZ/+0Od0bX1j83S5rsCiq32Se5fbS m8TNY3qZDRmYWDkYpAVU2TxKWiZGrMpOezDjqn1MINYmUCmMHBxCsBEPvuz/48t323tfcjmgnzI TMntPVkS/+7+Flj1QLRfXF/EgWue1IftodlftTht/58vaTHa9r1f84z52ndfuopzZSOzD0s32N6 ZohP25uhLN6mn2/b01dcJ/WCQWHHnbqnJJEW7td/mcZfN35DHWvzn5y9xtpLuPa6Hs9P8Cg/cU7 y9LeUAa0BOUaUe5x+Wx5UJgsI/HR6+Nb0y4eskh6R75ZHG73U958vHfdTKDDiQdLi7MTu1JJjf7 JfjvLky31mXW9bPf9klXGHQc1nq1MUtn352sV1584I1gkGL0ct1cruLS05Iq/aC2nippgYLzzvb 9k5kllCfFV59k4tDT66xsuC8zqmOWyf7L+yxmnDYd+F7AA== X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Let drm_bridge drivers handle CEC adapters in a generic way. Add a set of helper functions to be called by DRM bridge drivers to report CEC message-related events. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/display/drm_hdmi_cec_helper.c | 38 +++++++++++++++++++++++= ++++ drivers/gpu/drm/drm_bridge.c | 15 +++++++++++ include/drm/display/drm_hdmi_cec_helper.h | 8 ++++++ include/drm/drm_bridge.h | 11 ++++++++ 4 files changed, 72 insertions(+) diff --git a/drivers/gpu/drm/display/drm_hdmi_cec_helper.c b/drivers/gpu/dr= m/display/drm_hdmi_cec_helper.c index a6ed5f0fc3835b013a83308f5285ea0819c5702c..8cb3bd35febd55211f7088b9f47= dfc6a00c06109 100644 --- a/drivers/gpu/drm/display/drm_hdmi_cec_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_cec_helper.c @@ -207,3 +207,41 @@ void drm_connector_hdmi_cec_phys_addr_set(struct drm_c= onnector *connector) mutex_unlock(&connector->cec.mutex); } EXPORT_SYMBOL(drm_connector_hdmi_cec_phys_addr_set); + +void drm_bridge_cec_transmit_done(struct drm_bridge *bridge, u8 status, + u8 arb_lost_cnt, u8 nack_cnt, + u8 low_drive_cnt, u8 error_cnt) +{ + mutex_lock(&bridge->cec_mutex); + + if (bridge->cec_data) + drm_connector_hdmi_cec_transmit_done(bridge->cec_data, + status, arb_lost_cnt, + nack_cnt, low_drive_cnt, error_cnt); + + mutex_unlock(&bridge->cec_mutex); +} +EXPORT_SYMBOL_GPL(drm_bridge_cec_transmit_done); + +void drm_bridge_cec_transmit_attempt_done(struct drm_bridge *bridge, u8 st= atus) +{ + mutex_lock(&bridge->cec_mutex); + + if (bridge->cec_data) + drm_connector_hdmi_cec_transmit_attempt_done(bridge->cec_data, status); + + mutex_unlock(&bridge->cec_mutex); +} +EXPORT_SYMBOL_GPL(drm_bridge_cec_transmit_attempt_done); + +void drm_bridge_cec_received_msg(struct drm_bridge *bridge, + struct cec_msg *msg) +{ + mutex_lock(&bridge->cec_mutex); + + if (bridge->cec_data) + drm_connector_hdmi_cec_received_msg(bridge->cec_data, msg); + + mutex_unlock(&bridge->cec_mutex); +} +EXPORT_SYMBOL_GPL(drm_bridge_cec_received_msg); diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index c6af46dd02bfa9e15b59e4c460debdd7fd84be44..7ee791aa8f962fb13467464cebb= 8f53ab06991f0 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -206,6 +206,7 @@ static LIST_HEAD(bridge_list); void drm_bridge_add(struct drm_bridge *bridge) { mutex_init(&bridge->hpd_mutex); + mutex_init(&bridge->cec_mutex); =20 mutex_lock(&bridge_lock); list_add_tail(&bridge->list, &bridge_list); @@ -248,6 +249,7 @@ void drm_bridge_remove(struct drm_bridge *bridge) mutex_unlock(&bridge_lock); =20 mutex_destroy(&bridge->hpd_mutex); + mutex_destroy(&bridge->cec_mutex); } EXPORT_SYMBOL(drm_bridge_remove); =20 @@ -1302,6 +1304,19 @@ void drm_bridge_hpd_notify(struct drm_bridge *bridge, } EXPORT_SYMBOL_GPL(drm_bridge_hpd_notify); =20 +void drm_bridge_cec_data_set(struct drm_bridge *bridge, void *cec_data) +{ + if (!(bridge->ops & DRM_BRIDGE_OP_HDMI)) + return; + + mutex_lock(&bridge->cec_mutex); + + bridge->cec_data =3D cec_data; + + mutex_unlock(&bridge->cec_mutex); +} +EXPORT_SYMBOL_GPL(drm_bridge_cec_data_set); + #ifdef CONFIG_OF /** * of_drm_find_bridge - find the bridge corresponding to the device node in diff --git a/include/drm/display/drm_hdmi_cec_helper.h b/include/drm/displa= y/drm_hdmi_cec_helper.h index cd6274e4ee9b3e41a2d85289c4a420b854340e19..4d435192cba5a16255c7856c896= 86024521f51d2 100644 --- a/include/drm/display/drm_hdmi_cec_helper.h +++ b/include/drm/display/drm_hdmi_cec_helper.h @@ -7,6 +7,7 @@ =20 #include =20 +struct drm_bridge; struct drm_connector; =20 struct cec_msg; @@ -58,4 +59,11 @@ static inline void drm_connector_hdmi_cec_phys_addr_inva= lidate(struct drm_connec static inline void drm_connector_hdmi_cec_phys_addr_set(struct drm_connect= or *connector) {} #endif =20 +void drm_bridge_cec_transmit_done(struct drm_bridge *bridge, u8 status, + u8 arb_lost_cnt, u8 nack_cnt, + u8 low_drive_cnt, u8 error_cnt); +void drm_bridge_cec_transmit_attempt_done(struct drm_bridge *bridge, u8 st= atus); +void drm_bridge_cec_received_msg(struct drm_bridge *bridge, + struct cec_msg *msg); + #endif diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 348778f233b06265a6ae577762c6558e69cdb396..df1d72c7e176c75585283684acc= 2ef2ffb2f8bff 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -939,6 +939,15 @@ struct drm_bridge { * @hpd_cb. */ void *hpd_data; + + /** + * @cec_mutex: Protects the @cec_data field. + */ + struct mutex cec_mutex; + /** + * @cec_data: Private data to be used by the CEC callbacks. + */ + void *cec_data; }; =20 static inline struct drm_bridge * @@ -1062,6 +1071,8 @@ void drm_bridge_hpd_disable(struct drm_bridge *bridge= ); void drm_bridge_hpd_notify(struct drm_bridge *bridge, enum drm_connector_status status); =20 +void drm_bridge_cec_data_set(struct drm_bridge *bridge, void *cec_data); + #ifdef CONFIG_DRM_PANEL_BRIDGE bool drm_bridge_is_panel(const struct drm_bridge *bridge); struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel); --=20 2.39.5