From: Ronald Claveau <[email protected]> The HDMI TX PHY registers (HHI_HDMI_PHY_CNTL0..5) were programmed directly from this driver, with per-SoC tables selected by compatible string. A dedicated PHY driver now exists, so use it through the generic PHY API instead:
- phy_init() replaces the initial CNTL0/CNTL1 programming, - phy_configure() replaces meson_hdmi_phy_setup_mode(), the TMDS character rate being derived from the (possibly 4:2:0 halved) pixel clock, with 8 bpc as before, - phy_power_on() replaces the three successive PHY resets, - phy_power_off() replaces the fallback to the initial state in dw_hdmi_phy_disable(). The "hdmi" PHY is looked up through the "phys" property of the HDMI TX node. Device trees that do not provide it keep working: in that case the PHY is created by this driver through meson_hdmi_phy_create_legacy(), using a per-SoC identifier replacing the former cntl0_init/cntl1_init fields, and a warning is printed. This fallback is deprecated and will be removed once all device trees have been converted. meson_dw_hdmi_init() can now fail, so propagate its return value from probe and resume. Select PHY_MESON_HDMI_TX in Kconfig since the driver now depends on it, including for the legacy path. Signed-off-by: Ronald Claveau <[email protected]> --- drivers/gpu/drm/meson/Kconfig | 1 + drivers/gpu/drm/meson/meson_dw_hdmi.c | 172 ++++++++++++---------------------- 2 files changed, 59 insertions(+), 114 deletions(-) diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig index 417f79829cf8..60bdbddaf5d0 100644 --- a/drivers/gpu/drm/meson/Kconfig +++ b/drivers/gpu/drm/meson/Kconfig @@ -19,6 +19,7 @@ config DRM_MESON_DW_HDMI depends on DRM_MESON default y if DRM_MESON select DRM_DW_HDMI + select PHY_MESON_HDMI_TX imply DRM_DW_HDMI_I2S_AUDIO config DRM_MESON_DW_MIPI_DSI diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c index 20a821936b3a..f28cc1e6ee1d 100644 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c @@ -11,6 +11,8 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_graph.h> +#include <linux/phy/phy.h> +#include <linux/phy/phy-meson-hdmi-tx.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> @@ -102,16 +104,6 @@ #define HDMITX_DWC_DATA_REG 0x14 #define HDMITX_DWC_CTRL_REG 0x18 -/* HHI Registers */ -#define HHI_HDMI_PHY_CNTL0 0x3a0 /* 0xe8 */ -#define HHI_HDMI_PHY_CNTL1 0x3a4 /* 0xe9 */ -#define PHY_CNTL1_INIT 0x03900000 -#define PHY_INVERT BIT(17) -#define HHI_HDMI_PHY_CNTL2 0x3a8 /* 0xea */ -#define HHI_HDMI_PHY_CNTL3 0x3ac /* 0xeb */ -#define HHI_HDMI_PHY_CNTL4 0x3b0 /* 0xec */ -#define HHI_HDMI_PHY_CNTL5 0x3b4 /* 0xed */ - static DEFINE_SPINLOCK(reg_lock); enum meson_venc_source { @@ -131,8 +123,7 @@ struct meson_dw_hdmi_data { unsigned int addr); void (*dwc_write)(struct meson_dw_hdmi *dw_hdmi, unsigned int addr, unsigned int data); - u32 cntl0_init; - u32 cntl1_init; + enum meson_hdmi_phy_soc phy_soc; /* legacy PHY only */ }; struct meson_dw_hdmi { @@ -147,6 +138,8 @@ struct meson_dw_hdmi { u32 irq_stat; struct dw_hdmi *hdmi; struct drm_bridge *bridge; + struct phy *phy; + bool legacy_phy; }; static inline int dw_hdmi_is_compatible(struct meson_dw_hdmi *dw_hdmi, @@ -273,87 +266,6 @@ static inline void dw_hdmi_g12a_dwc_write(struct meson_dw_hdmi *dw_hdmi, /* Bridge */ -/* Setup PHY bandwidth modes */ -static void meson_hdmi_phy_setup_mode(struct meson_dw_hdmi *dw_hdmi, - const struct drm_display_mode *mode, - bool mode_is_420) -{ - struct meson_drm *priv = dw_hdmi->priv; - unsigned int pixel_clock = mode->clock; - - /* For 420, pixel clock is half unlike venc clock */ - if (mode_is_420) pixel_clock /= 2; - - if (dw_hdmi_is_compatible(dw_hdmi, "amlogic,meson-gxl-dw-hdmi") || - dw_hdmi_is_compatible(dw_hdmi, "amlogic,meson-gxm-dw-hdmi")) { - if (pixel_clock >= 371250) { - /* 5.94Gbps, 3.7125Gbps */ - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, 0x333d3282); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL3, 0x2136315b); - } else if (pixel_clock >= 297000) { - /* 2.97Gbps */ - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, 0x33303382); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL3, 0x2036315b); - } else if (pixel_clock >= 148500) { - /* 1.485Gbps */ - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, 0x33303362); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL3, 0x2016315b); - } else { - /* 742.5Mbps, and below */ - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, 0x33604142); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL3, 0x0016315b); - } - } else if (dw_hdmi_is_compatible(dw_hdmi, - "amlogic,meson-gxbb-dw-hdmi")) { - if (pixel_clock >= 371250) { - /* 5.94Gbps, 3.7125Gbps */ - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, 0x33353245); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL3, 0x2100115b); - } else if (pixel_clock >= 297000) { - /* 2.97Gbps */ - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, 0x33634283); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL3, 0xb000115b); - } else { - /* 1.485Gbps, and below */ - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, 0x33632122); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL3, 0x2000115b); - } - } else if (dw_hdmi_is_compatible(dw_hdmi, - "amlogic,meson-g12a-dw-hdmi")) { - if (pixel_clock >= 371250) { - /* 5.94Gbps, 3.7125Gbps */ - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, 0x37eb65c4); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL3, 0x2ab0ff3b); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL5, 0x0000080b); - } else if (pixel_clock >= 297000) { - /* 2.97Gbps */ - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, 0x33eb6262); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL3, 0x2ab0ff3b); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL5, 0x00000003); - } else { - /* 1.485Gbps, and below */ - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, 0x33eb4242); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL3, 0x2ab0ff3b); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL5, 0x00000003); - } - } -} - -static inline void meson_dw_hdmi_phy_reset(struct meson_dw_hdmi *dw_hdmi) -{ - struct meson_drm *priv = dw_hdmi->priv; - - /* Enable and software reset */ - regmap_update_bits(priv->hhi, HHI_HDMI_PHY_CNTL1, 0xf, 0xf); - - mdelay(2); - - /* Enable and unreset */ - regmap_update_bits(priv->hhi, HHI_HDMI_PHY_CNTL1, 0xf, 0xe); - - mdelay(2); -} - static int dw_hdmi_phy_init(struct dw_hdmi *hdmi, void *data, const struct drm_display_info *display, const struct drm_display_mode *mode) @@ -364,6 +276,9 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi, void *data, unsigned int wr_clk = readl_relaxed(priv->io_base + _REG(VPU_HDMI_SETTING)); bool mode_is_420 = false; + unsigned int pixel_clock = mode->clock; + union phy_configure_opts opts = {}; + int ret; DRM_DEBUG_DRIVER("\"%s\" div%d\n", mode->name, mode->clock > 340000 ? 40 : 10); @@ -392,19 +307,22 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi, void *data, dw_hdmi->data->top_write(dw_hdmi, HDMITX_TOP_TMDS_CLK_PTTN_CNTL, 0x2); /* Setup PHY parameters */ - meson_hdmi_phy_setup_mode(dw_hdmi, mode, mode_is_420); - - /* Disable clock, fifo, fifo_wr */ - regmap_update_bits(priv->hhi, HHI_HDMI_PHY_CNTL1, 0xf, 0); + if (mode_is_420) + pixel_clock /= 2; + opts.hdmi.tmds_char_rate = (u64)pixel_clock * 1000; + opts.hdmi.bpc = 8; + ret = phy_configure(dw_hdmi->phy, &opts); + if (ret) + return ret; dw_hdmi_set_high_tmds_clock_ratio(hdmi, display); msleep(100); /* Reset PHY 3 times in a row */ - meson_dw_hdmi_phy_reset(dw_hdmi); - meson_dw_hdmi_phy_reset(dw_hdmi); - meson_dw_hdmi_phy_reset(dw_hdmi); + ret = phy_power_on(dw_hdmi->phy); + if (ret) + return ret; /* Temporary Disable VENC video stream */ if (priv->venc.hdmi_use_enci) @@ -443,13 +361,11 @@ static void dw_hdmi_phy_disable(struct dw_hdmi *hdmi, void *data) { struct meson_dw_hdmi *dw_hdmi = (struct meson_dw_hdmi *)data; - struct meson_drm *priv = dw_hdmi->priv; DRM_DEBUG_DRIVER("\n"); /* Fallback to init mode */ - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL1, dw_hdmi->data->cntl1_init); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, dw_hdmi->data->cntl0_init); + phy_power_off(dw_hdmi->phy); } static enum drm_connector_status dw_hdmi_read_hpd(struct dw_hdmi *hdmi, @@ -572,8 +488,7 @@ static const struct meson_dw_hdmi_data meson_dw_hdmi_gxbb_data = { .top_write = dw_hdmi_top_write, .dwc_read = dw_hdmi_dwc_read, .dwc_write = dw_hdmi_dwc_write, - .cntl0_init = 0x0, - .cntl1_init = PHY_CNTL1_INIT | PHY_INVERT, + .phy_soc = MESON_HDMI_PHY_GXBB, }; static const struct meson_dw_hdmi_data meson_dw_hdmi_gxl_data = { @@ -581,8 +496,7 @@ static const struct meson_dw_hdmi_data meson_dw_hdmi_gxl_data = { .top_write = dw_hdmi_top_write, .dwc_read = dw_hdmi_dwc_read, .dwc_write = dw_hdmi_dwc_write, - .cntl0_init = 0x0, - .cntl1_init = PHY_CNTL1_INIT, + .phy_soc = MESON_HDMI_PHY_GXL, }; static const struct meson_dw_hdmi_data meson_dw_hdmi_g12a_data = { @@ -590,13 +504,13 @@ static const struct meson_dw_hdmi_data meson_dw_hdmi_g12a_data = { .top_write = dw_hdmi_g12a_top_write, .dwc_read = dw_hdmi_g12a_dwc_read, .dwc_write = dw_hdmi_g12a_dwc_write, - .cntl0_init = 0x000b4242, /* Bandgap */ - .cntl1_init = PHY_CNTL1_INIT, + .phy_soc = MESON_HDMI_PHY_G12A, }; -static void meson_dw_hdmi_init(struct meson_dw_hdmi *meson_dw_hdmi) +static int meson_dw_hdmi_init(struct meson_dw_hdmi *meson_dw_hdmi) { struct meson_drm *priv = meson_dw_hdmi->priv; + int ret; /* Reset HDMITX APB & TX & PHY */ reset_control_reset(meson_dw_hdmi->hdmitx_apb); @@ -624,8 +538,9 @@ static void meson_dw_hdmi_init(struct meson_dw_hdmi *meson_dw_hdmi) meson_dw_hdmi->data->top_write(meson_dw_hdmi, HDMITX_TOP_BIST_CNTL, BIT(12)); /* Setup PHY */ - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL1, meson_dw_hdmi->data->cntl1_init); - regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, meson_dw_hdmi->data->cntl0_init); + ret = phy_init(meson_dw_hdmi->phy); + if (ret) + return ret; /* Enable HDMI-TX Interrupt */ meson_dw_hdmi->data->top_write(meson_dw_hdmi, HDMITX_TOP_INTR_STAT_CLR, @@ -634,6 +549,7 @@ static void meson_dw_hdmi_init(struct meson_dw_hdmi *meson_dw_hdmi) meson_dw_hdmi->data->top_write(meson_dw_hdmi, HDMITX_TOP_INTR_MASKN, HDMITX_TOP_INTR_CORE); + return 0; } static void meson_disable_clk(void *data) @@ -746,7 +662,26 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master, return ret; } - meson_dw_hdmi_init(meson_dw_hdmi); + meson_dw_hdmi->phy = devm_phy_optional_get(dev, "hdmi"); + if (IS_ERR(meson_dw_hdmi->phy)) + return dev_err_probe(dev, PTR_ERR(meson_dw_hdmi->phy), + "failed to get HDMI PHY\n"); + + if (!meson_dw_hdmi->phy) { + /* DEPRECATED: DT without "phys" */ + dev_warn(dev, "missing \"phys\", using legacy HDMI PHY\n"); + meson_dw_hdmi->phy = meson_hdmi_phy_create_legacy(dev, priv->hhi, + meson_dw_hdmi->data->phy_soc); + if (IS_ERR(meson_dw_hdmi->phy)) + return dev_err_probe(dev, PTR_ERR(meson_dw_hdmi->phy), + "failed to create legacy HDMI PHY\n"); + + meson_dw_hdmi->legacy_phy = true; + } + + ret = meson_dw_hdmi_init(meson_dw_hdmi); + if (ret) + return ret; /* Bridge / Connector */ @@ -784,6 +719,10 @@ static void meson_dw_hdmi_unbind(struct device *dev, struct device *master, struct platform_device *pdev = to_platform_device(dev); int irq = platform_get_irq(pdev, 0); + phy_exit(meson_dw_hdmi->phy); + if (meson_dw_hdmi->legacy_phy) + devm_phy_destroy(dev, meson_dw_hdmi->phy); + devm_free_irq(dev, irq, meson_dw_hdmi); dw_hdmi_unbind(meson_dw_hdmi->hdmi); drm_bridge_put(meson_dw_hdmi->bridge); @@ -801,6 +740,8 @@ static int __maybe_unused meson_dw_hdmi_pm_suspend(struct device *dev) if (!meson_dw_hdmi) return 0; + phy_exit(meson_dw_hdmi->phy); + /* Reset TOP */ meson_dw_hdmi->data->top_write(meson_dw_hdmi, HDMITX_TOP_SW_RESET, 0); @@ -811,11 +752,14 @@ static int __maybe_unused meson_dw_hdmi_pm_suspend(struct device *dev) static int __maybe_unused meson_dw_hdmi_pm_resume(struct device *dev) { struct meson_dw_hdmi *meson_dw_hdmi = dev_get_drvdata(dev); + int ret; if (!meson_dw_hdmi) return 0; - meson_dw_hdmi_init(meson_dw_hdmi); + ret = meson_dw_hdmi_init(meson_dw_hdmi); + if (ret) + return ret; dw_hdmi_resume(meson_dw_hdmi->hdmi); -- 2.43.0
