From nobody Tue Oct 7 12:29:45 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B8EF226D18 for ; Wed, 9 Jul 2025 21:01:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752094893; cv=none; b=VVsAV6vJC6Te4O5JH+j0ppsk2R03kiIwZZ4YBpCYKdFtp8iM02toMT8Lo78SY/TKxmfdKcH3rXa+UQKGOe340WlxD6bSA96ORKEsAxnkJkVYn770YWac+KSKA6Dl/8P0QZyxFIirT1uj+kFQgIpXGaHstOaYKa9oJrFCN+NliUo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752094893; c=relaxed/simple; bh=ZGvUAU8EdQqYCN03yYp66TUPom9mNCbwTqrFFE2lfVY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uwP0Ban9rJPSM6+kxhZWFeDlVgLho4ASA79doyvLLWRDeDHffbnP84wNLcELyhCjnogsUkeCZ0sr91MPEAGKzWV0jg4PW35Q/AtzkC4tSEdyTU6gXuL88Bn5t5gu3Av3jyXKPFFhuuDkwQkVbnvfaMpbo3/nXYt3ZNQkgSNXgLU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=AWSfo2kh; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="AWSfo2kh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1752094889; bh=ZGvUAU8EdQqYCN03yYp66TUPom9mNCbwTqrFFE2lfVY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=AWSfo2khuwRcdWkkhOFC5DDXJSQn4ZWCqgZyWQ/lWLycNn7vnwcSwu8kD7QrzznfI CGLlBtoqpqSpyD78IaFfJwY4QuARsw/ak9euvNs+GCGdJUaMm2NaDR9UTdD54l7Enu UvUTuiNT+u94asborj6LurN49Q8tBEsouEXZPsT4lnRo6B0h/N4o/jIGdzBafsBfYN o9eAs3mAvNEOEhjrYWEUKFzwhh9klfxZAeCWGrl+mRJxHOc3nqG2n0ngtRNw3Uwk4J YY9Ulg2TS2ZRxwNZUMsmsAYeMmxvX53ShdqktnFSzmjHMZclMsS/LDCJ1NGdqv+VSi gjWmceAO9rn+g== Received: from localhost (unknown [212.93.144.165]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with UTF8SMTPSA id 0A21017E0497; Wed, 9 Jul 2025 23:01:29 +0200 (CEST) From: Cristian Ciocaltea Date: Thu, 10 Jul 2025 00:01:12 +0300 Subject: [PATCH v2 1/6] drm/bridge: dw-hdmi-qp: Add CEC support 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: <20250710-rk3588-hdmi-cec-v2-1-f5884be34bc1@collabora.com> References: <20250710-rk3588-hdmi-cec-v2-0-f5884be34bc1@collabora.com> In-Reply-To: <20250710-rk3588-hdmi-cec-v2-0-f5884be34bc1@collabora.com> To: Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Dmitry Baryshkov , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Catalin Marinas , Will Deacon Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Algea Cao , Derek Foreman X-Mailer: b4 0.14.2 Add support for the CEC interface of the Synopsys DesignWare HDMI QP TX controller. This is based on the downstream implementation, but rewritten on top of the CEC helpers added recently to the DRM HDMI connector framework. Also note struct dw_hdmi_qp_plat_data has been extended to include the CEC IRQ number to be provided by the platform driver. Co-developed-by: Algea Cao Signed-off-by: Algea Cao Co-developed-by: Derek Foreman Signed-off-by: Derek Foreman Reviewed-by: Dmitry Baryshkov Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/bridge/synopsys/Kconfig | 8 + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 220 +++++++++++++++++++++++= ++++ drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 14 ++ include/drm/bridge/dw_hdmi_qp.h | 1 + 4 files changed, 243 insertions(+) diff --git a/drivers/gpu/drm/bridge/synopsys/Kconfig b/drivers/gpu/drm/brid= ge/synopsys/Kconfig index f3ab2f985f8ca9dc1eeac3bda6b4a31d355cd51c..99878f051067e65fa3b97d8132b= e8cfa15980966 100644 --- a/drivers/gpu/drm/bridge/synopsys/Kconfig +++ b/drivers/gpu/drm/bridge/synopsys/Kconfig @@ -54,6 +54,14 @@ config DRM_DW_HDMI_QP select DRM_KMS_HELPER select REGMAP_MMIO =20 +config DRM_DW_HDMI_QP_CEC + bool "Synopsis Designware QP CEC interface" + depends on DRM_DW_HDMI_QP + select DRM_DISPLAY_HDMI_CEC_HELPER + help + Support the CEC interface which is part of the Synopsys + Designware HDMI QP block. + config DRM_DW_MIPI_DSI tristate select DRM_KMS_HELPER diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm= /bridge/synopsys/dw-hdmi-qp.c index 7ade80f02a94c91905c13b4a945c65da5681b183..cfe8171b2183874517f583f284f= 7728fe1613c91 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -18,6 +18,7 @@ =20 #include #include +#include #include #include #include @@ -26,6 +27,8 @@ #include #include =20 +#include + #include =20 #include "dw-hdmi-qp.h" @@ -131,12 +134,28 @@ struct dw_hdmi_qp_i2c { bool is_segment; }; =20 +#ifdef CONFIG_DRM_DW_HDMI_QP_CEC +struct dw_hdmi_qp_cec { + struct drm_connector *connector; + int irq; + u32 addresses; + struct cec_msg rx_msg; + u8 tx_status; + bool tx_done; + bool rx_done; +}; +#endif + struct dw_hdmi_qp { struct drm_bridge bridge; =20 struct device *dev; struct dw_hdmi_qp_i2c *i2c; =20 +#ifdef CONFIG_DRM_DW_HDMI_QP_CEC + struct dw_hdmi_qp_cec *cec; +#endif + struct { const struct dw_hdmi_qp_phy_ops *ops; void *data; @@ -965,6 +984,191 @@ static int dw_hdmi_qp_bridge_write_infoframe(struct d= rm_bridge *bridge, } } =20 +#ifdef CONFIG_DRM_DW_HDMI_QP_CEC +static irqreturn_t dw_hdmi_qp_cec_hardirq(int irq, void *dev_id) +{ + struct dw_hdmi_qp *hdmi =3D dev_id; + struct dw_hdmi_qp_cec *cec =3D hdmi->cec; + irqreturn_t ret =3D IRQ_HANDLED; + u32 stat; + + stat =3D dw_hdmi_qp_read(hdmi, CEC_INT_STATUS); + if (stat =3D=3D 0) + return IRQ_NONE; + + dw_hdmi_qp_write(hdmi, stat, CEC_INT_CLEAR); + + if (stat & CEC_STAT_LINE_ERR) { + cec->tx_status =3D CEC_TX_STATUS_ERROR; + cec->tx_done =3D true; + ret =3D IRQ_WAKE_THREAD; + } else if (stat & CEC_STAT_DONE) { + cec->tx_status =3D CEC_TX_STATUS_OK; + cec->tx_done =3D true; + ret =3D IRQ_WAKE_THREAD; + } else if (stat & CEC_STAT_NACK) { + cec->tx_status =3D CEC_TX_STATUS_NACK; + cec->tx_done =3D true; + ret =3D IRQ_WAKE_THREAD; + } + + if (stat & CEC_STAT_EOM) { + unsigned int len, i, val; + + val =3D dw_hdmi_qp_read(hdmi, CEC_RX_COUNT_STATUS); + len =3D (val & 0xf) + 1; + + if (len > sizeof(cec->rx_msg.msg)) + len =3D sizeof(cec->rx_msg.msg); + + for (i =3D 0; i < 4; i++) { + val =3D dw_hdmi_qp_read(hdmi, CEC_RX_DATA3_0 + i * 4); + cec->rx_msg.msg[i * 4] =3D val & 0xff; + cec->rx_msg.msg[i * 4 + 1] =3D (val >> 8) & 0xff; + cec->rx_msg.msg[i * 4 + 2] =3D (val >> 16) & 0xff; + cec->rx_msg.msg[i * 4 + 3] =3D (val >> 24) & 0xff; + } + + dw_hdmi_qp_write(hdmi, 1, CEC_LOCK_CONTROL); + + cec->rx_msg.len =3D len; + cec->rx_done =3D true; + + ret =3D IRQ_WAKE_THREAD; + } + + return ret; +} + +static irqreturn_t dw_hdmi_qp_cec_thread(int irq, void *dev_id) +{ + struct dw_hdmi_qp *hdmi =3D dev_id; + struct dw_hdmi_qp_cec *cec =3D hdmi->cec; + + if (cec->tx_done) { + cec->tx_done =3D false; + drm_connector_hdmi_cec_transmit_attempt_done(cec->connector, + cec->tx_status); + } + + if (cec->rx_done) { + cec->rx_done =3D false; + drm_connector_hdmi_cec_received_msg(cec->connector, &cec->rx_msg); + } + + return IRQ_HANDLED; +} + +static int dw_hdmi_qp_cec_init(struct drm_connector *connector, + struct drm_bridge *bridge) +{ + struct dw_hdmi_qp *hdmi =3D dw_hdmi_qp_from_bridge(bridge); + struct dw_hdmi_qp_cec *cec =3D hdmi->cec; + int ret; + + if (cec->irq < 0) { + dev_err(hdmi->dev, "Invalid cec irq: %d\n", cec->irq); + return -EINVAL; + } + + cec->connector =3D connector; + + dw_hdmi_qp_write(hdmi, 0, CEC_TX_COUNT); + dw_hdmi_qp_write(hdmi, ~0, CEC_INT_CLEAR); + dw_hdmi_qp_write(hdmi, 0, CEC_INT_MASK_N); + + ret =3D devm_request_threaded_irq(hdmi->dev, cec->irq, + dw_hdmi_qp_cec_hardirq, + dw_hdmi_qp_cec_thread, IRQF_SHARED, + dev_name(hdmi->dev), hdmi); + if (ret < 0) { + dev_err(hdmi->dev, "Request cec irq thread failed: %d\n", ret); + return ret; + } + + return 0; +} + +static int dw_hdmi_qp_cec_log_addr(struct drm_bridge *bridge, u8 logical_a= ddr) +{ + struct dw_hdmi_qp *hdmi =3D dw_hdmi_qp_from_bridge(bridge); + struct dw_hdmi_qp_cec *cec =3D hdmi->cec; + + if (logical_addr =3D=3D CEC_LOG_ADDR_INVALID) + cec->addresses =3D 0; + else + cec->addresses |=3D BIT(logical_addr) | CEC_ADDR_BROADCAST; + + dw_hdmi_qp_write(hdmi, cec->addresses, CEC_ADDR); + + return 0; +} + +static int dw_hdmi_qp_cec_enable(struct drm_bridge *bridge, bool enable) +{ + struct dw_hdmi_qp *hdmi =3D dw_hdmi_qp_from_bridge(bridge); + unsigned int irqs; + u32 swdisable; + + if (!enable) { + dw_hdmi_qp_write(hdmi, 0, CEC_INT_MASK_N); + dw_hdmi_qp_write(hdmi, ~0, CEC_INT_CLEAR); + + swdisable =3D dw_hdmi_qp_read(hdmi, GLOBAL_SWDISABLE); + swdisable =3D swdisable | CEC_SWDISABLE; + dw_hdmi_qp_write(hdmi, swdisable, GLOBAL_SWDISABLE); + } else { + swdisable =3D dw_hdmi_qp_read(hdmi, GLOBAL_SWDISABLE); + swdisable =3D swdisable & ~CEC_SWDISABLE; + dw_hdmi_qp_write(hdmi, swdisable, GLOBAL_SWDISABLE); + + dw_hdmi_qp_write(hdmi, ~0, CEC_INT_CLEAR); + dw_hdmi_qp_write(hdmi, 1, CEC_LOCK_CONTROL); + + dw_hdmi_qp_cec_log_addr(bridge, CEC_LOG_ADDR_INVALID); + + irqs =3D CEC_STAT_LINE_ERR | CEC_STAT_NACK | CEC_STAT_EOM | + CEC_STAT_DONE; + dw_hdmi_qp_write(hdmi, ~0, CEC_INT_CLEAR); + dw_hdmi_qp_write(hdmi, irqs, CEC_INT_MASK_N); + } + + return 0; +} + +static int dw_hdmi_qp_cec_transmit(struct drm_bridge *bridge, u8 attempts, + u32 signal_free_time, struct cec_msg *msg) +{ + struct dw_hdmi_qp *hdmi =3D dw_hdmi_qp_from_bridge(bridge); + unsigned int i; + u32 val; + + for (i =3D 0; i < msg->len; i++) { + if (!(i % 4)) + val =3D msg->msg[i]; + if ((i % 4) =3D=3D 1) + val |=3D msg->msg[i] << 8; + if ((i % 4) =3D=3D 2) + val |=3D msg->msg[i] << 16; + if ((i % 4) =3D=3D 3) + val |=3D msg->msg[i] << 24; + + if (i =3D=3D (msg->len - 1) || (i % 4) =3D=3D 3) + dw_hdmi_qp_write(hdmi, val, CEC_TX_DATA3_0 + (i / 4) * 4); + } + + dw_hdmi_qp_write(hdmi, msg->len - 1, CEC_TX_COUNT); + dw_hdmi_qp_write(hdmi, CEC_CTRL_START, CEC_TX_CONTROL); + + return 0; +} +#else +#define dw_hdmi_qp_cec_init NULL +#define dw_hdmi_qp_cec_enable NULL +#define dw_hdmi_qp_cec_log_addr NULL +#define dw_hdmi_qp_cec_transmit NULL +#endif /* CONFIG_DRM_DW_HDMI_QP_CEC */ + static const struct drm_bridge_funcs dw_hdmi_qp_bridge_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, @@ -979,6 +1183,10 @@ static const struct drm_bridge_funcs dw_hdmi_qp_bridg= e_funcs =3D { .hdmi_audio_startup =3D dw_hdmi_qp_audio_enable, .hdmi_audio_shutdown =3D dw_hdmi_qp_audio_disable, .hdmi_audio_prepare =3D dw_hdmi_qp_audio_prepare, + .hdmi_cec_init =3D dw_hdmi_qp_cec_init, + .hdmi_cec_enable =3D dw_hdmi_qp_cec_enable, + .hdmi_cec_log_addr =3D dw_hdmi_qp_cec_log_addr, + .hdmi_cec_transmit =3D dw_hdmi_qp_cec_transmit, }; =20 static irqreturn_t dw_hdmi_qp_main_hardirq(int irq, void *dev_id) @@ -1093,6 +1301,18 @@ struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_d= evice *pdev, hdmi->bridge.hdmi_audio_dev =3D dev; hdmi->bridge.hdmi_audio_dai_port =3D 1; =20 +#ifdef CONFIG_DRM_DW_HDMI_QP_CEC + hdmi->bridge.ops |=3D DRM_BRIDGE_OP_HDMI_CEC_ADAPTER; + hdmi->bridge.hdmi_cec_dev =3D dev; + hdmi->bridge.hdmi_cec_adapter_name =3D dev_name(dev); + + hdmi->cec =3D devm_kzalloc(hdmi->dev, sizeof(*hdmi->cec), GFP_KERNEL); + if (!hdmi->cec) + return ERR_PTR(-ENOMEM); + + hdmi->cec->irq =3D plat_data->cec_irq; +#endif + ret =3D devm_drm_bridge_add(dev, &hdmi->bridge); if (ret) return ERR_PTR(ret); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h b/drivers/gpu/drm= /bridge/synopsys/dw-hdmi-qp.h index 72987e6c468928f2b998099697a6f32726411557..91a15f82e32acc32eef58f11ec5= ca958337ebb9a 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h @@ -488,9 +488,23 @@ #define AUDPKT_VBIT_OVR0 0xf24 /* CEC Registers */ #define CEC_TX_CONTROL 0x1000 +#define CEC_CTRL_CLEAR BIT(0) +#define CEC_CTRL_START BIT(0) #define CEC_STATUS 0x1004 +#define CEC_STAT_DONE BIT(0) +#define CEC_STAT_NACK BIT(1) +#define CEC_STAT_ARBLOST BIT(2) +#define CEC_STAT_LINE_ERR BIT(3) +#define CEC_STAT_RETRANS_FAIL BIT(4) +#define CEC_STAT_DISCARD BIT(5) +#define CEC_STAT_TX_BUSY BIT(8) +#define CEC_STAT_RX_BUSY BIT(9) +#define CEC_STAT_DRIVE_ERR BIT(10) +#define CEC_STAT_EOM BIT(11) +#define CEC_STAT_NOTIFY_ERR BIT(12) #define CEC_CONFIG 0x1008 #define CEC_ADDR 0x100c +#define CEC_ADDR_BROADCAST BIT(15) #define CEC_TX_COUNT 0x1020 #define CEC_TX_DATA3_0 0x1024 #define CEC_TX_DATA7_4 0x1028 diff --git a/include/drm/bridge/dw_hdmi_qp.h b/include/drm/bridge/dw_hdmi_q= p.h index e9be6d507ad9cdc55f5c7d6d3ef37eba41f1ce74..b4a9b739734ec7b67013b683fe6= 017551aa19172 100644 --- a/include/drm/bridge/dw_hdmi_qp.h +++ b/include/drm/bridge/dw_hdmi_qp.h @@ -23,6 +23,7 @@ struct dw_hdmi_qp_plat_data { const struct dw_hdmi_qp_phy_ops *phy_ops; void *phy_data; int main_irq; + int cec_irq; }; =20 struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev, --=20 2.50.0 From nobody Tue Oct 7 12:29:45 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0F16224AFE for ; Wed, 9 Jul 2025 21:01:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752094893; cv=none; b=NzxGpii3W32alcVORv1Rjjjy41QPwmJLkSrA4hzQJwGCUH7Qgr7h5XOal7gEX69/OeQskilVzVrWX9/F3MeqpCeaei+7MZlJwlCs2kJia3lLuVSMbrekVBYSqfuF9RoAUSw/Lam4QoqrtYLnjjuZs9ypGUhRPYENpCkeHjzpems= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752094893; c=relaxed/simple; bh=7aEBmbIctPTphfD3Xtu6xLbliB7cG+WRDnCSkYDNRTA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Hs7aECW+lEZZq5FG3Ppyffvi3orKpBtvkcrELx5Zt2E7jDZdPjVhyr3w5KSRk+BpLnr0i0DMuEBxKY3vvPaxaeUYSpYPRLqmsKh4XbIBt3+stjPT3q/KmySOHYlnLb351+AinLb14NFjZqybq11Pr+ProUrtW5u7WF1MgckHU1o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=BwrI/dYR; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="BwrI/dYR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1752094889; bh=7aEBmbIctPTphfD3Xtu6xLbliB7cG+WRDnCSkYDNRTA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=BwrI/dYREpuQIHkepkAbbXnxy1RRxot8rfxJaLbhrdv+gaJwws3y9ZNW4xeH6ti5z bEHv3PG9aZohtsbWBNoT/fN3/2HeG7YzYUzCOMmrg3zak9aVesqzaSIuUK0zOd8z2a 0G25zp0rhIptk08Mi05sZIg+s+7002Rh7FVMhSKqh+IxscqYjYV0BBNqbuNul05b4B ZlQCQYWEem3aXH7ZM0ir2BrDb7Q9VOfllheP8JGAPLaowIgkOt35XqBaVJwZAWQAOH iNx062tJXEsma5u/dI4/h4DePHEx03RE/+vLYPVAqlcRzoh6tMgCp2ZwIXVQYhJvnj yj8/m1Q/L1/Bg== Received: from localhost (unknown [212.93.144.165]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with UTF8SMTPSA id C4B0117E04AA; Wed, 9 Jul 2025 23:01:29 +0200 (CEST) From: Cristian Ciocaltea Date: Thu, 10 Jul 2025 00:01:13 +0300 Subject: [PATCH v2 2/6] drm/bridge: dw-hdmi-qp: Fixup timer base setup 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: <20250710-rk3588-hdmi-cec-v2-2-f5884be34bc1@collabora.com> References: <20250710-rk3588-hdmi-cec-v2-0-f5884be34bc1@collabora.com> In-Reply-To: <20250710-rk3588-hdmi-cec-v2-0-f5884be34bc1@collabora.com> To: Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Dmitry Baryshkov , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Catalin Marinas , Will Deacon Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 Currently the TIMER_BASE_CONFIG0 register gets initialized to a fixed value as initially found in vendor driver code supporting the RK3588 SoC. As a matter of fact the value matches the rate of the HDMI TX reference clock, which is roughly 428.57 MHz. However, on RK3576 SoC that rate is slightly lower, i.e. 396.00 MHz, and the incorrect register configuration breaks CEC functionality. Set the timer base according to the actual reference clock rate that shall be provided by the platform driver. While at it, also drop the unnecessary empty lines in dw_hdmi_qp_init_hw(). Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 11 ++++++++--- include/drm/bridge/dw_hdmi_qp.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm= /bridge/synopsys/dw-hdmi-qp.c index cfe8171b2183874517f583f284f7728fe1613c91..5d252800168aa4f3c10f4586317= 95de8912e29d4 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -161,6 +161,7 @@ struct dw_hdmi_qp { void *data; } phy; =20 + unsigned long ref_clk_rate; struct regmap *regm; =20 unsigned long tmds_char_rate; @@ -1222,13 +1223,11 @@ static void dw_hdmi_qp_init_hw(struct dw_hdmi_qp *h= dmi) { dw_hdmi_qp_write(hdmi, 0, MAINUNIT_0_INT_MASK_N); dw_hdmi_qp_write(hdmi, 0, MAINUNIT_1_INT_MASK_N); - dw_hdmi_qp_write(hdmi, 428571429, TIMER_BASE_CONFIG0); + dw_hdmi_qp_write(hdmi, hdmi->ref_clk_rate, TIMER_BASE_CONFIG0); =20 /* Software reset */ dw_hdmi_qp_write(hdmi, 0x01, I2CM_CONTROL0); - dw_hdmi_qp_write(hdmi, 0x085c085c, I2CM_FM_SCL_CONFIG0); - dw_hdmi_qp_mod(hdmi, 0, I2CM_FM_EN, I2CM_INTERFACE_CONTROL0); =20 /* Clear DONE and ERROR interrupts */ @@ -1254,6 +1253,11 @@ struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_d= evice *pdev, return ERR_PTR(-ENODEV); } =20 + if (!plat_data->ref_clk_rate) { + dev_err(dev, "Missing ref_clk rate\n"); + return ERR_PTR(-ENODEV); + } + hdmi =3D devm_drm_bridge_alloc(dev, struct dw_hdmi_qp, bridge, &dw_hdmi_qp_bridge_funcs); if (IS_ERR(hdmi)) @@ -1273,6 +1277,7 @@ struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_de= vice *pdev, =20 hdmi->phy.ops =3D plat_data->phy_ops; hdmi->phy.data =3D plat_data->phy_data; + hdmi->ref_clk_rate =3D plat_data->ref_clk_rate; =20 dw_hdmi_qp_init_hw(hdmi); =20 diff --git a/include/drm/bridge/dw_hdmi_qp.h b/include/drm/bridge/dw_hdmi_q= p.h index b4a9b739734ec7b67013b683fe6017551aa19172..76ecf31301997718604a05f70ce= 9eab8695e26b5 100644 --- a/include/drm/bridge/dw_hdmi_qp.h +++ b/include/drm/bridge/dw_hdmi_qp.h @@ -24,6 +24,7 @@ struct dw_hdmi_qp_plat_data { void *phy_data; int main_irq; int cec_irq; + unsigned long ref_clk_rate; }; =20 struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev, --=20 2.50.0 From nobody Tue Oct 7 12:29:45 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4435224501B for ; Wed, 9 Jul 2025 21:01:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752094899; cv=none; b=FILRDNGvSagEQ7+hFTEIdHSQH860WUcscuAN57cqxLW9TXsHWdFYBNiaQP6q5e45y0J6tPCOfU/XzkFJvOeHpuJNmjD1cvLAsCxgecm2kCeiL03iiW3IbXihsJnemMIAdBWUYRZBBPTTGq/wAA7/uajlunAGMvfpoa7p1ltSMAc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752094899; c=relaxed/simple; bh=WdXIZNuTvyx1CD2BBHBXvl+8DQ7UTjvdIVCL2zLA3i8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LmsAW++7RrinI1jcC7HoyyI33CfjnbYlFnlTo9rvzmcAby6B9sWCiUc9XRlg5Kpxhr9jIhBR4JNWl4MWght8ZoeEocgY4dJhE5i94NHqF1rxidv8aybzme6p+UHBgSGBOIkRw4zuPC+qQW7DrZ6V+g2M915DV11JFsF65F8vRX8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=Rz4faA4T; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="Rz4faA4T" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1752094895; bh=WdXIZNuTvyx1CD2BBHBXvl+8DQ7UTjvdIVCL2zLA3i8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Rz4faA4TVP2f7mHCpwUiBHFd9/1gTQTfZophWgVvr6WTKML+gq+3oJC19LFr9S1ah QvOjPj+6bX3gWq8KuzHSJ6zp07Z/sIV4WIJbX/n5cV0Aw+VmrOf+mQCJwFyKMMLD6z s7l3y5J1Yx7B24m6fgguLoHzry4DdpgqoTFBWjRrwXXTH9pngcjqhk0DftKrHwXEx9 1bhPH4TKxGPXR7C/+KL8fQ5LhyMKy94mK0YLZcM5XuhQSzUs+bS6IycPppi2q9XiZQ wvcGVF7z6slHp4aDKpnYnTNMWkXFYUQu90DgQerSjoplF5W7fLB+zjjRCOWoO73rEt 761gy+Xg7uHFg== Received: from localhost (unknown [212.93.144.165]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with UTF8SMTPSA id 8C45C17E0456; Wed, 9 Jul 2025 23:01:35 +0200 (CEST) From: Cristian Ciocaltea Date: Thu, 10 Jul 2025 00:01:14 +0300 Subject: [PATCH v2 3/6] drm/rockchip: dw_hdmi_qp: Improve error handling with dev_err_probe() 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: <20250710-rk3588-hdmi-cec-v2-3-f5884be34bc1@collabora.com> References: <20250710-rk3588-hdmi-cec-v2-0-f5884be34bc1@collabora.com> In-Reply-To: <20250710-rk3588-hdmi-cec-v2-0-f5884be34bc1@collabora.com> To: Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Dmitry Baryshkov , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Catalin Marinas , Will Deacon Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 The error handling in dw_hdmi_qp_rockchip_bind() is quite inconsistent, i.e. in some cases the error code is not included in the message, while in some other cases there is no check for -EPROBE_DEFER. Since this is part of the probe path, address the aforementioned issues by switching to dev_err_probe(), which also reduces the code a bit. Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 62 ++++++++++------------= ---- 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/d= rm/rockchip/dw_hdmi_qp-rockchip.c index 7d531b6f4c098c6c548788dad487ce4613a2f32b..4e7794aa2dded4c124963eaa7f5= 158bde9bbbdb6 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -457,10 +457,8 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev= , struct device *master, return -ENODEV; =20 if (!cfg->ctrl_ops || !cfg->ctrl_ops->io_init || - !cfg->ctrl_ops->irq_callback || !cfg->ctrl_ops->hardirq_callback) { - dev_err(dev, "Missing platform ctrl ops\n"); - return -ENODEV; - } + !cfg->ctrl_ops->irq_callback || !cfg->ctrl_ops->hardirq_callback) + return dev_err_probe(dev, -ENODEV, "Missing platform ctrl ops\n"); =20 hdmi->ctrl_ops =3D cfg->ctrl_ops; hdmi->dev =3D &pdev->dev; @@ -473,10 +471,9 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev= , struct device *master, break; } } - if (hdmi->port_id < 0) { - dev_err(hdmi->dev, "Failed to match HDMI port ID\n"); - return hdmi->port_id; - } + if (hdmi->port_id < 0) + return dev_err_probe(hdmi->dev, hdmi->port_id, + "Failed to match HDMI port ID\n"); =20 plat_data.phy_ops =3D cfg->phy_ops; plat_data.phy_data =3D hdmi; @@ -497,39 +494,30 @@ static int dw_hdmi_qp_rockchip_bind(struct device *de= v, struct device *master, =20 hdmi->regmap =3D syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,grf"); - if (IS_ERR(hdmi->regmap)) { - dev_err(hdmi->dev, "Unable to get rockchip,grf\n"); - return PTR_ERR(hdmi->regmap); - } + if (IS_ERR(hdmi->regmap)) + return dev_err_probe(hdmi->dev, PTR_ERR(hdmi->regmap), + "Unable to get rockchip,grf\n"); =20 hdmi->vo_regmap =3D syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,vo-grf"); - if (IS_ERR(hdmi->vo_regmap)) { - dev_err(hdmi->dev, "Unable to get rockchip,vo-grf\n"); - return PTR_ERR(hdmi->vo_regmap); - } + if (IS_ERR(hdmi->vo_regmap)) + return dev_err_probe(hdmi->dev, PTR_ERR(hdmi->vo_regmap), + "Unable to get rockchip,vo-grf\n"); =20 ret =3D devm_clk_bulk_get_all_enabled(hdmi->dev, &clks); - if (ret < 0) { - dev_err(hdmi->dev, "Failed to get clocks: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(hdmi->dev, ret, "Failed to get clocks\n"); =20 hdmi->enable_gpio =3D devm_gpiod_get_optional(hdmi->dev, "enable", GPIOD_OUT_HIGH); - if (IS_ERR(hdmi->enable_gpio)) { - ret =3D PTR_ERR(hdmi->enable_gpio); - dev_err(hdmi->dev, "Failed to request enable GPIO: %d\n", ret); - return ret; - } + if (IS_ERR(hdmi->enable_gpio)) + return dev_err_probe(hdmi->dev, PTR_ERR(hdmi->enable_gpio), + "Failed to request enable GPIO\n"); =20 hdmi->phy =3D devm_of_phy_get_by_index(dev, dev->of_node, 0); - if (IS_ERR(hdmi->phy)) { - ret =3D PTR_ERR(hdmi->phy); - if (ret !=3D -EPROBE_DEFER) - dev_err(hdmi->dev, "failed to get phy: %d\n", ret); - return ret; - } + if (IS_ERR(hdmi->phy)) + return dev_err_probe(hdmi->dev, PTR_ERR(hdmi->phy), + "Failed to get phy\n"); =20 cfg->ctrl_ops->io_init(hdmi); =20 @@ -558,17 +546,15 @@ static int dw_hdmi_qp_rockchip_bind(struct device *de= v, struct device *master, =20 hdmi->hdmi =3D dw_hdmi_qp_bind(pdev, encoder, &plat_data); if (IS_ERR(hdmi->hdmi)) { - ret =3D PTR_ERR(hdmi->hdmi); drm_encoder_cleanup(encoder); - return ret; + return dev_err_probe(hdmi->dev, PTR_ERR(hdmi->hdmi), + "Failed to bind dw-hdmi-qp"); } =20 connector =3D drm_bridge_connector_init(drm, encoder); - if (IS_ERR(connector)) { - ret =3D PTR_ERR(connector); - dev_err(hdmi->dev, "failed to init bridge connector: %d\n", ret); - return ret; - } + if (IS_ERR(connector)) + return dev_err_probe(hdmi->dev, PTR_ERR(connector), + "Failed to init bridge connector\n"); =20 return drm_connector_attach_encoder(connector, encoder); } --=20 2.50.0 From nobody Tue Oct 7 12:29:45 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70199237163 for ; Wed, 9 Jul 2025 21:01:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752094905; cv=none; b=mcEeyBXrc3baoPryo7WZcXy2aqr+7/x1sGQyVEjMst8C0X3vPMR5A3cSJh/KQSgEsMKdQJIgyxV9I5T1pdZLj+zkuDs5Yb3aI/mekLXZhGl/vX/yElICKRyQC7LEG+d0pSXii8Iz6amNu0gVLPuTL7WgdOVLw3BjXZ1p67KK+Fc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752094905; c=relaxed/simple; bh=moiSfO2R7aLv0S+WQByIAYMB8s0lvHJIzcWP0Lxus3s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Y5RclXV0jEnqWUNI6LAh1n5EjEQHjznDUoR8wLP+Oz7G/2p7coCcgLCtzg+8PLLhdhd0XO8pf5hrDeorDHfH/qDuC14Zdu3PLPp0bup1P9GKpQTPDBeoU5++kCpn0nS2cAPWmgTvBnxkNILAgwETTiJmbKe8QF0gq88ZRDY/u/I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=ABA/dg9V; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="ABA/dg9V" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1752094901; bh=moiSfO2R7aLv0S+WQByIAYMB8s0lvHJIzcWP0Lxus3s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ABA/dg9VpJOvW12L9+KIQ8Ir9OiZVlbT2Aehz3vd2UK0yQ9xRqyRc9ejpzDEXy/ny mlp99jyv6MU4Dytlo1vggcHc662Cq9qMEkoe5h3nXnX+eSIIlpfPavjZkC6WmRizVs aHhgXrwavlkW9NZ+VDa7BPfHK35wHusLwYJC/DFnMciWQVApxtgcf5Y7E5Op/H1mvN 8DBHPqTtXwXGaw4Odt/UiBx/RzmJlnmIV5353L9xub44WW6RSKb9AF0e8D+3nPzyTn NacnPFEQTYdJyR1G6vNJMMhvVZ4zF78qV/YZgwS0QCVeIs9LW6D0jtvtkSM8uf06R0 zM9M64q7Xmjnw== Received: from localhost (unknown [212.93.144.165]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with UTF8SMTPSA id 6C5DA17E0456; Wed, 9 Jul 2025 23:01:41 +0200 (CEST) From: Cristian Ciocaltea Date: Thu, 10 Jul 2025 00:01:15 +0300 Subject: [PATCH v2 4/6] drm/rockchip: dw_hdmi_qp: Provide CEC IRQ in dw_hdmi_qp_plat_data 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: <20250710-rk3588-hdmi-cec-v2-4-f5884be34bc1@collabora.com> References: <20250710-rk3588-hdmi-cec-v2-0-f5884be34bc1@collabora.com> In-Reply-To: <20250710-rk3588-hdmi-cec-v2-0-f5884be34bc1@collabora.com> To: Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Dmitry Baryshkov , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Catalin Marinas , Will Deacon Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 In order to support the CEC interface of the DesignWare HDMI QP IP block, setup platform data to include the required IRQ number. Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/d= rm/rockchip/dw_hdmi_qp-rockchip.c index 4e7794aa2dded4c124963eaa7f5158bde9bbbdb6..39b46327afd8e4753d96962fad6= 6792d22b33402 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -527,6 +527,10 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev= , struct device *master, if (plat_data.main_irq < 0) return plat_data.main_irq; =20 + plat_data.cec_irq =3D platform_get_irq_byname(pdev, "cec"); + if (plat_data.cec_irq < 0) + return plat_data.cec_irq; + irq =3D platform_get_irq_byname(pdev, "hpd"); if (irq < 0) return irq; --=20 2.50.0 From nobody Tue Oct 7 12:29:45 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E92B24728C for ; Wed, 9 Jul 2025 21:01:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752094908; cv=none; b=ilLtHl5faRdnVjXqQAb/mNDKOau65P8qUH7Hge8cdli+6lrqCuz+REIy9Ki/gRZVYJuAEysHjnfO601n6OyT11uiUDptTYnhIMnRJYozYvB+zJsCS+j76SS2ZGlhRbDXuKan4cE0ZQXr4bntiRtt3MeH7JQgVyQIhBnMaBGIAzk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752094908; c=relaxed/simple; bh=D8TzrcIjbemRr2OziedwcPlGRxQQvGN6+6+xghPiZ2I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QHMPb3WNZhIlo2eLa/mnly8etBE1phoZaO2aSmc/WlAiUDBQeJNY61/4CY1bQp4AyRmiOydkmz5aHdQAzfAXTaigIeWKG8PQIyCA5r5wF2BNM4e66cP+qls/Fxfv3FSqcObxR/59+KUk0wedr439sXgay5G+uRotKNF00Uc6n4Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=C+sVnVTW; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="C+sVnVTW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1752094905; bh=D8TzrcIjbemRr2OziedwcPlGRxQQvGN6+6+xghPiZ2I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=C+sVnVTW5fWfSKlo+cQRNfNSRi8oSpH2x25GzqbX4pr11Zw9KZx0IiztSEJJpKUFH ODHA38/sMtG5sIDQ5CYvd9LwAHqcrNZMkw05JFFMrMHerwgAN7SfUwWNWttx8J519s ofY6m8fDAwo8gs/lUfkWDNNJcDfk+FuZi0cXL402MZfVlXzom7dpGjLXls1WnUqgtP DRLuKF0MRZR7aB2lnT0KZD4FpEhVgSv0JKqZ/aSZNv9D1TihvGFSxsWczaJF1cekhA yf+OkWkqeFSnnaH5QRdVgRbWFBZsDpxUcz7jmdOpe7ZFUXL657ed4c0Cx1QnVcN4+a m5hfqGx6b3Fdg== Received: from localhost (unknown [212.93.144.165]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with UTF8SMTPSA id 4439B17E0657; Wed, 9 Jul 2025 23:01:45 +0200 (CEST) From: Cristian Ciocaltea Date: Thu, 10 Jul 2025 00:01:16 +0300 Subject: [PATCH v2 5/6] drm/rockchip: dw_hdmi_qp: Provide ref clock rate in dw_hdmi_qp_plat_data 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: <20250710-rk3588-hdmi-cec-v2-5-f5884be34bc1@collabora.com> References: <20250710-rk3588-hdmi-cec-v2-0-f5884be34bc1@collabora.com> In-Reply-To: <20250710-rk3588-hdmi-cec-v2-0-f5884be34bc1@collabora.com> To: Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Dmitry Baryshkov , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Catalin Marinas , Will Deacon Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 In order to support correct initialization of the timer base in the HDMI QP IP block, setup platform data to include the required reference clock rate. While at it, ensure plat_data is zero-initialized in dw_hdmi_qp_rockchip_bind(). Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/d= rm/rockchip/dw_hdmi_qp-rockchip.c index 39b46327afd8e4753d96962fad66792d22b33402..5280383febe25cf579c306ec164= 2557600595e58 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -431,14 +431,15 @@ static int dw_hdmi_qp_rockchip_bind(struct device *de= v, struct device *master, void *data) { struct platform_device *pdev =3D to_platform_device(dev); + struct dw_hdmi_qp_plat_data plat_data =3D {}; const struct rockchip_hdmi_qp_cfg *cfg; - struct dw_hdmi_qp_plat_data plat_data; struct drm_device *drm =3D data; struct drm_connector *connector; struct drm_encoder *encoder; struct rockchip_hdmi_qp *hdmi; struct resource *res; struct clk_bulk_data *clks; + struct clk *ref_clk; int ret, irq, i; =20 if (!pdev->dev.of_node) @@ -508,6 +509,14 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev= , struct device *master, if (ret < 0) return dev_err_probe(hdmi->dev, ret, "Failed to get clocks\n"); =20 + ref_clk =3D clk_get(hdmi->dev, "ref"); + if (IS_ERR(ref_clk)) + return dev_err_probe(hdmi->dev, PTR_ERR(ref_clk), + "Failed to get ref clock\n"); + + plat_data.ref_clk_rate =3D clk_get_rate(ref_clk); + clk_put(ref_clk); + hdmi->enable_gpio =3D devm_gpiod_get_optional(hdmi->dev, "enable", GPIOD_OUT_HIGH); if (IS_ERR(hdmi->enable_gpio)) --=20 2.50.0 From nobody Tue Oct 7 12:29:45 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD0B723FC41 for ; Wed, 9 Jul 2025 21:01:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752094920; cv=none; b=Kc5kh5riLUocYyi9x8p8Pb65s0uJynQXbN8MlZYsuQ6s27gon7iszrUHG5DPFfn2CvXyCmylZU1t9hYqPxohRJlQFJkV8Mx6Kc20vH56+v5TRfY3j6w7kGF8ErWjBFuLCeWfHCW45xiqjsj0Ir8styeTYd7G1pOTtYe9BmvmnQk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752094920; c=relaxed/simple; bh=gj4rXTi5xhvc6UX7OZe6K8Cx8rlffm0qUchexNCC4L0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OeqS7ul6yzp6KwCLns4V2IWceovFGMP8hZxTaOiHkC79qNrEGNgZtyGy7AF31GGh2dHdd4j7LXKepp5vG7wwTsmM43DwufGWL8DfqhzGKdjqjnLVX63mVgcZ/6PaOKNcX8yoSvi5mmbwg9M7CaP/loOdH/gcfBs4P0Bey+jokrE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=QOzwNTGT; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="QOzwNTGT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1752094917; bh=gj4rXTi5xhvc6UX7OZe6K8Cx8rlffm0qUchexNCC4L0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=QOzwNTGTx2d2bChm/U3AiN+eDoeE5lerP+YJ8iftJHiIkbrhlx5JMSX4dRwUdrNn9 gSXfEW5mZn0lZwng5LeMZN1xuyeyxiI38IEIcveJwqpn6Xgd9WxGVB7ihOTtmuybLj HHaMh1faYqcCSWN+CHlSjjjErh+TS69BXnaFWhhhWDeeRakKEKLH0Dg2Ir7sHteDe4 B+FXBnTM6Powebnj3djLCbiLhmeBl0qnKS49HGbKjnGwH7nQcQrYVMybQ2YxA2vH7r UsfHUNBW8VwKnY4mNZpEr6AmHQm2Xtgdsd5YMqCshIZZO5aBsaKL7uOiXb5WirB6S2 3dY1syTmRzdAQ== Received: from localhost (unknown [212.93.144.165]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with UTF8SMTPSA id 3135617E0497; Wed, 9 Jul 2025 23:01:57 +0200 (CEST) From: Cristian Ciocaltea Date: Thu, 10 Jul 2025 00:01:17 +0300 Subject: [PATCH v2 6/6] arm64: defconfig: Enable DW HDMI QP CEC support 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: <20250710-rk3588-hdmi-cec-v2-6-f5884be34bc1@collabora.com> References: <20250710-rk3588-hdmi-cec-v2-0-f5884be34bc1@collabora.com> In-Reply-To: <20250710-rk3588-hdmi-cec-v2-0-f5884be34bc1@collabora.com> To: Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Dmitry Baryshkov , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Catalin Marinas , Will Deacon Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 Enable support for the CEC interface of the Synopsys DesignWare HDMI QP IP block. This is used by all boards based on RK3588 & RK3576 SoCs. Signed-off-by: Cristian Ciocaltea --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 739b19302865fe8edc54911213321d6f1278aae4..0363ba916e0ed7e7d9dc1169f44= 7f3726580de18 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -958,6 +958,7 @@ CONFIG_DRM_CDNS_MHDP8546=3Dm CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE=3Dm CONFIG_DRM_DW_HDMI_AHB_AUDIO=3Dm CONFIG_DRM_DW_HDMI_CEC=3Dm +CONFIG_DRM_DW_HDMI_QP_CEC=3Dy CONFIG_DRM_IMX_DCSS=3Dm CONFIG_DRM_V3D=3Dm CONFIG_DRM_VC4=3Dm --=20 2.50.0