From: Alex Bee <knaerzche@gmail.com>
To: "Sandy Huang" <hjc@rock-chips.com>,
"Heiko Stübner" <heiko@sntech.de>, "Andy Yan" <andyshrk@163.com>,
"Rob Herring" <robh+dt@kernel.org>,
"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>
Cc: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
Alex Bee <knaerzche@gmail.com>
Subject: [PATCH v2 21/27] drm/rockchip: inno_hdmi: Add variant support
Date: Sat, 16 Dec 2023 17:26:32 +0100 [thread overview]
Message-ID: <20231216162639.125215-22-knaerzche@gmail.com> (raw)
In-Reply-To: <20231216162639.125215-1-knaerzche@gmail.com>
In preparation to support RK3128's integration of the controller, this
patch adds a simple variant implementation. They mainly differ in the phy
configuration required, so those are part of the match_data. The values
have been taken from downstream. The pixelclocks in there are meant to be
max-inclusive.
Signed-off-by: Alex Bee <knaerzche@gmail.com>
---
changes in v2:
- no changes
drivers/gpu/drm/rockchip/inno_hdmi.c | 69 +++++++++++++++++++++++++++-
1 file changed, 67 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index 9f27a5faf12d..579baba6a61b 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -26,6 +26,17 @@
#include "inno_hdmi.h"
+struct inno_hdmi_phy_config {
+ unsigned long pixelclock;
+ u8 pre_emphasis;
+ u8 voltage_level_control;
+};
+
+struct inno_hdmi_variant {
+ struct inno_hdmi_phy_config *phy_configs;
+ struct inno_hdmi_phy_config *default_phy_config;
+};
+
struct inno_hdmi_i2c {
struct i2c_adapter adap;
@@ -47,6 +58,8 @@ struct inno_hdmi {
struct inno_hdmi_i2c *i2c;
struct i2c_adapter *ddc;
+
+ const struct inno_hdmi_variant *variant;
};
struct inno_hdmi_connector_state {
@@ -114,6 +127,30 @@ static const char coeff_csc[][24] = {
},
};
+static struct inno_hdmi_phy_config rk3036_hdmi_phy_configs[] = {
+ { 74250000, 0x3f, 0xbb },
+ { 165000000, 0x6f, 0xbb },
+ { ~0UL, 0x00, 0x00 }
+};
+
+static int inno_hdmi_find_phy_config(struct inno_hdmi *hdmi,
+ unsigned long pixelclk)
+{
+ const struct inno_hdmi_phy_config *phy_configs =
+ hdmi->variant->phy_configs;
+ int i;
+
+ for (i = 0; phy_configs[i].pixelclock != ~0UL; i++) {
+ if (pixelclk <= phy_configs[i].pixelclock)
+ return i;
+ }
+
+ DRM_DEV_DEBUG(hdmi->dev, "No phy configuration for pixelclock %lu\n",
+ pixelclk);
+
+ return -EINVAL;
+}
+
static inline u8 hdmi_readb(struct inno_hdmi *hdmi, u16 offset)
{
return readl_relaxed(hdmi->regs + (offset) * 0x04);
@@ -179,12 +216,26 @@ static void inno_hdmi_sys_power(struct inno_hdmi *hdmi, bool enable)
static void inno_hdmi_set_pwr_mode(struct inno_hdmi *hdmi, int mode)
{
+ struct inno_hdmi_phy_config *phy_config;
+ int ret;
+ unsigned long tmds_rate;
+
switch (mode) {
case NORMAL:
inno_hdmi_sys_power(hdmi, false);
+ tmds_rate = inno_hdmi_tmds_rate(hdmi);
+ ret = inno_hdmi_find_phy_config(hdmi, tmds_rate);
+ if (ret < 0) {
+ phy_config = hdmi->variant->default_phy_config;
+ DRM_DEV_ERROR(hdmi->dev,
+ "Using default phy configuration for TMDS rate %lu",
+ tmds_rate);
+ } else {
+ phy_config = &hdmi->variant->phy_configs[ret];
+ }
- hdmi_writeb(hdmi, HDMI_PHY_PRE_EMPHASIS, 0x6f);
- hdmi_writeb(hdmi, HDMI_PHY_DRIVER, 0xbb);
+ hdmi_writeb(hdmi, HDMI_PHY_PRE_EMPHASIS, phy_config->pre_emphasis);
+ hdmi_writeb(hdmi, HDMI_PHY_DRIVER, phy_config->voltage_level_control);
hdmi_writeb(hdmi, HDMI_PHY_SYS_CTL, 0x15);
hdmi_writeb(hdmi, HDMI_PHY_SYS_CTL, 0x14);
@@ -827,6 +878,8 @@ static int inno_hdmi_bind(struct device *dev, struct device *master,
struct platform_device *pdev = to_platform_device(dev);
struct drm_device *drm = data;
struct inno_hdmi *hdmi;
+ const struct inno_hdmi_variant *variant;
+
int irq;
int ret;
@@ -836,6 +889,12 @@ static int inno_hdmi_bind(struct device *dev, struct device *master,
hdmi->dev = dev;
+ variant = of_device_get_match_data(hdmi->dev);
+ if (!variant)
+ return -EINVAL;
+
+ hdmi->variant = variant;
+
hdmi->regs = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(hdmi->regs))
return PTR_ERR(hdmi->regs);
@@ -923,8 +982,14 @@ static void inno_hdmi_remove(struct platform_device *pdev)
component_del(&pdev->dev, &inno_hdmi_ops);
}
+static const struct inno_hdmi_variant rk3036_inno_hdmi_variant = {
+ .phy_configs = rk3036_hdmi_phy_configs,
+ .default_phy_config = &rk3036_hdmi_phy_configs[1],
+};
+
static const struct of_device_id inno_hdmi_dt_ids[] = {
{ .compatible = "rockchip,rk3036-inno-hdmi",
+ .data = &rk3036_inno_hdmi_variant,
},
{},
};
--
2.43.0
next prev parent reply other threads:[~2023-12-16 16:27 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-16 16:26 [PATCH v2 00/27] Add HDMI support for RK3128 Alex Bee
2023-12-16 16:26 ` [PATCH v2 01/27] dt-bindings: display: rockchip,inno-hdmi: Document RK3128 compatible Alex Bee
2023-12-17 21:00 ` Conor Dooley
2023-12-16 16:26 ` [PATCH v2 02/27] drm/rockchip: vop: Add output selection registers for RK312x Alex Bee
2023-12-16 16:26 ` [PATCH v2 03/27] drm/rockchip: inno_hdmi: Fix video timing Alex Bee
2023-12-16 16:26 ` [PATCH v2 04/27] drm/rockchip: inno_hdmi: Remove useless mode_fixup Alex Bee
2023-12-18 8:38 ` Maxime Ripard
2023-12-16 16:26 ` [PATCH v2 05/27] drm/rockchip: inno_hdmi: Remove useless copy of drm_display_mode Alex Bee
2023-12-16 16:26 ` [PATCH v2 06/27] drm/rockchip: inno_hdmi: Switch encoder hooks to atomic Alex Bee
2023-12-16 16:26 ` [PATCH v2 07/27] drm/rockchip: inno_hdmi: Get rid of mode_set Alex Bee
2023-12-16 16:26 ` [PATCH v2 08/27] drm/rockchip: inno_hdmi: no need to store vic Alex Bee
2023-12-16 16:26 ` [PATCH v2 09/27] drm/rockchip: inno_hdmi: Remove unneeded has audio flag Alex Bee
2023-12-16 16:26 ` [PATCH v2 10/27] drm/rockchip: inno_hdmi: Remove useless input format Alex Bee
2023-12-16 16:26 ` [PATCH v2 11/27] drm/rockchip: inno_hdmi: Remove YUV-based csc coefficents Alex Bee
2023-12-16 16:26 ` [PATCH v2 12/27] drm/rockchip: inno_hdmi: Drop HDMI Vendor Infoframe support Alex Bee
2023-12-16 16:26 ` [PATCH v2 13/27] drm/rockchip: inno_hdmi: Move infoframe disable to separate function Alex Bee
2023-12-16 16:26 ` [PATCH v2 14/27] drm/rockchip: inno_hdmi: Switch to infoframe type Alex Bee
2023-12-16 16:26 ` [PATCH v2 15/27] drm/rockchip: inno_hdmi: Remove unused drm device pointer Alex Bee
2023-12-16 16:26 ` [PATCH v2 16/27] drm/rockchip: inno_hdmi: Drop irq struct member Alex Bee
2023-12-18 9:00 ` Maxime Ripard
2023-12-16 16:26 ` [PATCH v2 17/27] drm/rockchip: inno_hdmi: Remove useless include Alex Bee
2023-12-18 9:00 ` Maxime Ripard
2023-12-16 16:26 ` [PATCH v2 18/27] drm/rockchip: inno_hdmi: Subclass connector state Alex Bee
2023-12-18 9:02 ` Maxime Ripard
2023-12-18 12:32 ` Alex Bee
2023-12-16 16:26 ` [PATCH v2 19/27] drm/rockchip: inno_hdmi: Move tmds rate to connector state subclass Alex Bee
2023-12-18 10:06 ` Maxime Ripard
2023-12-18 12:49 ` Alex Bee
2023-12-22 17:51 ` Alex Bee
2023-12-16 16:26 ` [PATCH v2 20/27] drm/rockchip: inno_hdmi: Correctly setup HDMI quantization range Alex Bee
2023-12-18 9:05 ` Maxime Ripard
2023-12-18 12:37 ` Alex Bee
2023-12-18 13:13 ` Maxime Ripard
2023-12-16 16:26 ` Alex Bee [this message]
2023-12-16 16:26 ` [PATCH v2 22/27] drm/rockchip: inno_hdmi: Add RK3128 support Alex Bee
2023-12-16 16:26 ` [PATCH v2 23/27] drm/rockchip: inno_hdmi: Add basic mode validation Alex Bee
2023-12-18 9:06 ` Maxime Ripard
2023-12-16 16:26 ` [PATCH v2 24/27] drm/rockchip: inno_hdmi: Drop custom fill_modes hook Alex Bee
2023-12-18 9:06 ` Maxime Ripard
2023-12-16 16:26 ` [PATCH v2 25/27] ARM: dts: rockchip: Add display subsystem for RK3128 Alex Bee
2023-12-16 16:26 ` [PATCH v2 26/27] ARM: dts: rockchip: Add HDMI node " Alex Bee
2023-12-16 16:26 ` [PATCH v2 27/27] ARM: dts: rockchip: Enable HDMI output for XPI-3128 Alex Bee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231216162639.125215-22-knaerzche@gmail.com \
--to=knaerzche@gmail.com \
--cc=airlied@gmail.com \
--cc=andyshrk@163.com \
--cc=conor+dt@kernel.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=robh+dt@kernel.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®