drm/msm/hdmi: switch to drm_bridge_connector
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Fri, 15 Oct 2021 00:11:00 +0000 (03:11 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jun 2022 08:22:50 +0000 (10:22 +0200)
[ Upstream commit caa24223463dfd75702a24daac13c93edb4aafac ]

Merge old hdmi_bridge and hdmi_connector implementations. Use
drm_bridge_connector instead.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Link: https://lore.kernel.org/r/20211015001100.4193241-2-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/msm/Makefile
drivers/gpu/drm/msm/hdmi/hdmi.c
drivers/gpu/drm/msm/hdmi/hdmi.h
drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
drivers/gpu/drm/msm/hdmi/hdmi_connector.c [deleted file]
drivers/gpu/drm/msm/hdmi/hdmi_hpd.c [new file with mode: 0644]

index 904535eda0c4cf95a8b29f3bd623e959000f18f7..91b09cda8a9c2ee8bd6f1cb943a385d371fbad77 100644 (file)
@@ -19,7 +19,7 @@ msm-y := \
        hdmi/hdmi.o \
        hdmi/hdmi_audio.o \
        hdmi/hdmi_bridge.o \
-       hdmi/hdmi_connector.o \
+       hdmi/hdmi_hpd.o \
        hdmi/hdmi_i2c.o \
        hdmi/hdmi_phy.o \
        hdmi/hdmi_phy_8960.o \
index 94f948ef279d107408e1c4b820176f5d78245c60..d5a80fa3e6251050b887c3feccce53bf9c0ed6a1 100644 (file)
@@ -8,6 +8,8 @@
 #include <linux/of_irq.h>
 #include <linux/of_gpio.h>
 
+#include <drm/drm_bridge_connector.h>
+
 #include <sound/hdmi-codec.h>
 #include "hdmi.h"
 
@@ -41,7 +43,7 @@ static irqreturn_t msm_hdmi_irq(int irq, void *dev_id)
        struct hdmi *hdmi = dev_id;
 
        /* Process HPD: */
-       msm_hdmi_connector_irq(hdmi->connector);
+       msm_hdmi_hpd_irq(hdmi->bridge);
 
        /* Process DDC: */
        msm_hdmi_i2c_irq(hdmi->i2c);
@@ -302,7 +304,7 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi,
                goto fail;
        }
 
-       hdmi->connector = msm_hdmi_connector_init(hdmi);
+       hdmi->connector = drm_bridge_connector_init(hdmi->dev, encoder);
        if (IS_ERR(hdmi->connector)) {
                ret = PTR_ERR(hdmi->connector);
                DRM_DEV_ERROR(dev->dev, "failed to create HDMI connector: %d\n", ret);
@@ -310,6 +312,8 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi,
                goto fail;
        }
 
+       drm_connector_attach_encoder(hdmi->connector, hdmi->encoder);
+
        hdmi->irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
        if (hdmi->irq < 0) {
                ret = hdmi->irq;
@@ -326,7 +330,9 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi,
                goto fail;
        }
 
-       ret = msm_hdmi_hpd_enable(hdmi->connector);
+       drm_bridge_connector_enable_hpd(hdmi->connector);
+
+       ret = msm_hdmi_hpd_enable(hdmi->bridge);
        if (ret < 0) {
                DRM_DEV_ERROR(&hdmi->pdev->dev, "failed to enable HPD: %d\n", ret);
                goto fail;
index d0b84f0abee17146deeed623cd3da8aad355d951..8d2706bec3b99d55ef4ef0ea48f9930bb9f61af0 100644 (file)
@@ -114,6 +114,13 @@ struct hdmi_platform_config {
        struct hdmi_gpio_data gpios[HDMI_MAX_NUM_GPIO];
 };
 
+struct hdmi_bridge {
+       struct drm_bridge base;
+       struct hdmi *hdmi;
+       struct work_struct hpd_work;
+};
+#define to_hdmi_bridge(x) container_of(x, struct hdmi_bridge, base)
+
 void msm_hdmi_set_mode(struct hdmi *hdmi, bool power_on);
 
 static inline void hdmi_write(struct hdmi *hdmi, u32 reg, u32 data)
@@ -230,13 +237,11 @@ void msm_hdmi_audio_set_sample_rate(struct hdmi *hdmi, int rate);
 struct drm_bridge *msm_hdmi_bridge_init(struct hdmi *hdmi);
 void msm_hdmi_bridge_destroy(struct drm_bridge *bridge);
 
-/*
- * hdmi connector:
- */
-
-void msm_hdmi_connector_irq(struct drm_connector *connector);
-struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi);
-int msm_hdmi_hpd_enable(struct drm_connector *connector);
+void msm_hdmi_hpd_irq(struct drm_bridge *bridge);
+enum drm_connector_status msm_hdmi_bridge_detect(
+               struct drm_bridge *bridge);
+int msm_hdmi_hpd_enable(struct drm_bridge *bridge);
+void msm_hdmi_hpd_disable(struct hdmi_bridge *hdmi_bridge);
 
 /*
  * i2c adapter for ddc:
index 6e380db9287ba85ed769650e1a466281e6fc7242..efcfdd70a02e0b4cbeff00b9e47b3f5a3ff6dc2e 100644 (file)
@@ -5,17 +5,16 @@
  */
 
 #include <linux/delay.h>
+#include <drm/drm_bridge_connector.h>
 
+#include "msm_kms.h"
 #include "hdmi.h"
 
-struct hdmi_bridge {
-       struct drm_bridge base;
-       struct hdmi *hdmi;
-};
-#define to_hdmi_bridge(x) container_of(x, struct hdmi_bridge, base)
-
 void msm_hdmi_bridge_destroy(struct drm_bridge *bridge)
 {
+       struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
+
+       msm_hdmi_hpd_disable(hdmi_bridge);
 }
 
 static void msm_hdmi_power_on(struct drm_bridge *bridge)
@@ -259,14 +258,76 @@ static void msm_hdmi_bridge_mode_set(struct drm_bridge *bridge,
                msm_hdmi_audio_update(hdmi);
 }
 
+static struct edid *msm_hdmi_bridge_get_edid(struct drm_bridge *bridge,
+               struct drm_connector *connector)
+{
+       struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
+       struct hdmi *hdmi = hdmi_bridge->hdmi;
+       struct edid *edid;
+       uint32_t hdmi_ctrl;
+
+       hdmi_ctrl = hdmi_read(hdmi, REG_HDMI_CTRL);
+       hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl | HDMI_CTRL_ENABLE);
+
+       edid = drm_get_edid(connector, hdmi->i2c);
+
+       hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl);
+
+       hdmi->hdmi_mode = drm_detect_hdmi_monitor(edid);
+
+       return edid;
+}
+
+static enum drm_mode_status msm_hdmi_bridge_mode_valid(struct drm_bridge *bridge,
+               const struct drm_display_info *info,
+               const struct drm_display_mode *mode)
+{
+       struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
+       struct hdmi *hdmi = hdmi_bridge->hdmi;
+       const struct hdmi_platform_config *config = hdmi->config;
+       struct msm_drm_private *priv = bridge->dev->dev_private;
+       struct msm_kms *kms = priv->kms;
+       long actual, requested;
+
+       requested = 1000 * mode->clock;
+       actual = kms->funcs->round_pixclk(kms,
+                       requested, hdmi_bridge->hdmi->encoder);
+
+       /* for mdp5/apq8074, we manage our own pixel clk (as opposed to
+        * mdp4/dtv stuff where pixel clk is assigned to mdp/encoder
+        * instead):
+        */
+       if (config->pwr_clk_cnt > 0)
+               actual = clk_round_rate(hdmi->pwr_clks[0], actual);
+
+       DBG("requested=%ld, actual=%ld", requested, actual);
+
+       if (actual != requested)
+               return MODE_CLOCK_RANGE;
+
+       return 0;
+}
+
 static const struct drm_bridge_funcs msm_hdmi_bridge_funcs = {
                .pre_enable = msm_hdmi_bridge_pre_enable,
                .enable = msm_hdmi_bridge_enable,
                .disable = msm_hdmi_bridge_disable,
                .post_disable = msm_hdmi_bridge_post_disable,
                .mode_set = msm_hdmi_bridge_mode_set,
+               .mode_valid = msm_hdmi_bridge_mode_valid,
+               .get_edid = msm_hdmi_bridge_get_edid,
+               .detect = msm_hdmi_bridge_detect,
 };
 
+static void
+msm_hdmi_hotplug_work(struct work_struct *work)
+{
+       struct hdmi_bridge *hdmi_bridge =
+               container_of(work, struct hdmi_bridge, hpd_work);
+       struct drm_bridge *bridge = &hdmi_bridge->base;
+
+       drm_bridge_hpd_notify(bridge, drm_bridge_detect(bridge));
+}
 
 /* initialize bridge */
 struct drm_bridge *msm_hdmi_bridge_init(struct hdmi *hdmi)
@@ -283,11 +344,17 @@ struct drm_bridge *msm_hdmi_bridge_init(struct hdmi *hdmi)
        }
 
        hdmi_bridge->hdmi = hdmi;
+       INIT_WORK(&hdmi_bridge->hpd_work, msm_hdmi_hotplug_work);
 
        bridge = &hdmi_bridge->base;
        bridge->funcs = &msm_hdmi_bridge_funcs;
+       bridge->ddc = hdmi->i2c;
+       bridge->type = DRM_MODE_CONNECTOR_HDMIA;
+       bridge->ops = DRM_BRIDGE_OP_HPD |
+               DRM_BRIDGE_OP_DETECT |
+               DRM_BRIDGE_OP_EDID;
 
-       ret = drm_bridge_attach(hdmi->encoder, bridge, NULL, 0);
+       ret = drm_bridge_attach(hdmi->encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
        if (ret)
                goto fail;
 
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
deleted file mode 100644 (file)
index 58707a1..0000000
+++ /dev/null
@@ -1,451 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (C) 2013 Red Hat
- * Author: Rob Clark <robdclark@gmail.com>
- */
-
-#include <linux/delay.h>
-#include <linux/gpio/consumer.h>
-#include <linux/pinctrl/consumer.h>
-
-#include "msm_kms.h"
-#include "hdmi.h"
-
-struct hdmi_connector {
-       struct drm_connector base;
-       struct hdmi *hdmi;
-       struct work_struct hpd_work;
-};
-#define to_hdmi_connector(x) container_of(x, struct hdmi_connector, base)
-
-static void msm_hdmi_phy_reset(struct hdmi *hdmi)
-{
-       unsigned int val;
-
-       val = hdmi_read(hdmi, REG_HDMI_PHY_CTRL);
-
-       if (val & HDMI_PHY_CTRL_SW_RESET_LOW) {
-               /* pull low */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val & ~HDMI_PHY_CTRL_SW_RESET);
-       } else {
-               /* pull high */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val | HDMI_PHY_CTRL_SW_RESET);
-       }
-
-       if (val & HDMI_PHY_CTRL_SW_RESET_PLL_LOW) {
-               /* pull low */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val & ~HDMI_PHY_CTRL_SW_RESET_PLL);
-       } else {
-               /* pull high */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val | HDMI_PHY_CTRL_SW_RESET_PLL);
-       }
-
-       msleep(100);
-
-       if (val & HDMI_PHY_CTRL_SW_RESET_LOW) {
-               /* pull high */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val | HDMI_PHY_CTRL_SW_RESET);
-       } else {
-               /* pull low */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val & ~HDMI_PHY_CTRL_SW_RESET);
-       }
-
-       if (val & HDMI_PHY_CTRL_SW_RESET_PLL_LOW) {
-               /* pull high */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val | HDMI_PHY_CTRL_SW_RESET_PLL);
-       } else {
-               /* pull low */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val & ~HDMI_PHY_CTRL_SW_RESET_PLL);
-       }
-}
-
-static int gpio_config(struct hdmi *hdmi, bool on)
-{
-       const struct hdmi_platform_config *config = hdmi->config;
-       int i;
-
-       if (on) {
-               for (i = 0; i < HDMI_MAX_NUM_GPIO; i++) {
-                       struct hdmi_gpio_data gpio = config->gpios[i];
-
-                       if (gpio.gpiod) {
-                               if (gpio.output) {
-                                       gpiod_direction_output(gpio.gpiod,
-                                                              gpio.value);
-                               } else {
-                                       gpiod_direction_input(gpio.gpiod);
-                                       gpiod_set_value_cansleep(gpio.gpiod,
-                                                                gpio.value);
-                               }
-                       }
-               }
-
-               DBG("gpio on");
-       } else {
-               for (i = 0; i < HDMI_MAX_NUM_GPIO; i++) {
-                       struct hdmi_gpio_data gpio = config->gpios[i];
-
-                       if (!gpio.gpiod)
-                               continue;
-
-                       if (gpio.output) {
-                               int value = gpio.value ? 0 : 1;
-
-                               gpiod_set_value_cansleep(gpio.gpiod, value);
-                       }
-               }
-
-               DBG("gpio off");
-       }
-
-       return 0;
-}
-
-static void enable_hpd_clocks(struct hdmi *hdmi, bool enable)
-{
-       const struct hdmi_platform_config *config = hdmi->config;
-       struct device *dev = &hdmi->pdev->dev;
-       int i, ret;
-
-       if (enable) {
-               for (i = 0; i < config->hpd_clk_cnt; i++) {
-                       if (config->hpd_freq && config->hpd_freq[i]) {
-                               ret = clk_set_rate(hdmi->hpd_clks[i],
-                                                  config->hpd_freq[i]);
-                               if (ret)
-                                       dev_warn(dev,
-                                                "failed to set clk %s (%d)\n",
-                                                config->hpd_clk_names[i], ret);
-                       }
-
-                       ret = clk_prepare_enable(hdmi->hpd_clks[i]);
-                       if (ret) {
-                               DRM_DEV_ERROR(dev,
-                                       "failed to enable hpd clk: %s (%d)\n",
-                                       config->hpd_clk_names[i], ret);
-                       }
-               }
-       } else {
-               for (i = config->hpd_clk_cnt - 1; i >= 0; i--)
-                       clk_disable_unprepare(hdmi->hpd_clks[i]);
-       }
-}
-
-int msm_hdmi_hpd_enable(struct drm_connector *connector)
-{
-       struct hdmi_connector *hdmi_connector = to_hdmi_connector(connector);
-       struct hdmi *hdmi = hdmi_connector->hdmi;
-       const struct hdmi_platform_config *config = hdmi->config;
-       struct device *dev = &hdmi->pdev->dev;
-       uint32_t hpd_ctrl;
-       int i, ret;
-       unsigned long flags;
-
-       for (i = 0; i < config->hpd_reg_cnt; i++) {
-               ret = regulator_enable(hdmi->hpd_regs[i]);
-               if (ret) {
-                       DRM_DEV_ERROR(dev, "failed to enable hpd regulator: %s (%d)\n",
-                                       config->hpd_reg_names[i], ret);
-                       goto fail;
-               }
-       }
-
-       ret = pinctrl_pm_select_default_state(dev);
-       if (ret) {
-               DRM_DEV_ERROR(dev, "pinctrl state chg failed: %d\n", ret);
-               goto fail;
-       }
-
-       ret = gpio_config(hdmi, true);
-       if (ret) {
-               DRM_DEV_ERROR(dev, "failed to configure GPIOs: %d\n", ret);
-               goto fail;
-       }
-
-       pm_runtime_get_sync(dev);
-       enable_hpd_clocks(hdmi, true);
-
-       msm_hdmi_set_mode(hdmi, false);
-       msm_hdmi_phy_reset(hdmi);
-       msm_hdmi_set_mode(hdmi, true);
-
-       hdmi_write(hdmi, REG_HDMI_USEC_REFTIMER, 0x0001001b);
-
-       /* enable HPD events: */
-       hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL,
-                       HDMI_HPD_INT_CTRL_INT_CONNECT |
-                       HDMI_HPD_INT_CTRL_INT_EN);
-
-       /* set timeout to 4.1ms (max) for hardware debounce */
-       spin_lock_irqsave(&hdmi->reg_lock, flags);
-       hpd_ctrl = hdmi_read(hdmi, REG_HDMI_HPD_CTRL);
-       hpd_ctrl |= HDMI_HPD_CTRL_TIMEOUT(0x1fff);
-
-       /* Toggle HPD circuit to trigger HPD sense */
-       hdmi_write(hdmi, REG_HDMI_HPD_CTRL,
-                       ~HDMI_HPD_CTRL_ENABLE & hpd_ctrl);
-       hdmi_write(hdmi, REG_HDMI_HPD_CTRL,
-                       HDMI_HPD_CTRL_ENABLE | hpd_ctrl);
-       spin_unlock_irqrestore(&hdmi->reg_lock, flags);
-
-       return 0;
-
-fail:
-       return ret;
-}
-
-static void hdp_disable(struct hdmi_connector *hdmi_connector)
-{
-       struct hdmi *hdmi = hdmi_connector->hdmi;
-       const struct hdmi_platform_config *config = hdmi->config;
-       struct device *dev = &hdmi->pdev->dev;
-       int i, ret = 0;
-
-       /* Disable HPD interrupt */
-       hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL, 0);
-
-       msm_hdmi_set_mode(hdmi, false);
-
-       enable_hpd_clocks(hdmi, false);
-       pm_runtime_put_autosuspend(dev);
-
-       ret = gpio_config(hdmi, false);
-       if (ret)
-               dev_warn(dev, "failed to unconfigure GPIOs: %d\n", ret);
-
-       ret = pinctrl_pm_select_sleep_state(dev);
-       if (ret)
-               dev_warn(dev, "pinctrl state chg failed: %d\n", ret);
-
-       for (i = 0; i < config->hpd_reg_cnt; i++) {
-               ret = regulator_disable(hdmi->hpd_regs[i]);
-               if (ret)
-                       dev_warn(dev, "failed to disable hpd regulator: %s (%d)\n",
-                                       config->hpd_reg_names[i], ret);
-       }
-}
-
-static void
-msm_hdmi_hotplug_work(struct work_struct *work)
-{
-       struct hdmi_connector *hdmi_connector =
-               container_of(work, struct hdmi_connector, hpd_work);
-       struct drm_connector *connector = &hdmi_connector->base;
-       drm_helper_hpd_irq_event(connector->dev);
-}
-
-void msm_hdmi_connector_irq(struct drm_connector *connector)
-{
-       struct hdmi_connector *hdmi_connector = to_hdmi_connector(connector);
-       struct hdmi *hdmi = hdmi_connector->hdmi;
-       uint32_t hpd_int_status, hpd_int_ctrl;
-
-       /* Process HPD: */
-       hpd_int_status = hdmi_read(hdmi, REG_HDMI_HPD_INT_STATUS);
-       hpd_int_ctrl   = hdmi_read(hdmi, REG_HDMI_HPD_INT_CTRL);
-
-       if ((hpd_int_ctrl & HDMI_HPD_INT_CTRL_INT_EN) &&
-                       (hpd_int_status & HDMI_HPD_INT_STATUS_INT)) {
-               bool detected = !!(hpd_int_status & HDMI_HPD_INT_STATUS_CABLE_DETECTED);
-
-               /* ack & disable (temporarily) HPD events: */
-               hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL,
-                       HDMI_HPD_INT_CTRL_INT_ACK);
-
-               DBG("status=%04x, ctrl=%04x", hpd_int_status, hpd_int_ctrl);
-
-               /* detect disconnect if we are connected or visa versa: */
-               hpd_int_ctrl = HDMI_HPD_INT_CTRL_INT_EN;
-               if (!detected)
-                       hpd_int_ctrl |= HDMI_HPD_INT_CTRL_INT_CONNECT;
-               hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL, hpd_int_ctrl);
-
-               queue_work(hdmi->workq, &hdmi_connector->hpd_work);
-       }
-}
-
-static enum drm_connector_status detect_reg(struct hdmi *hdmi)
-{
-       uint32_t hpd_int_status;
-
-       pm_runtime_get_sync(&hdmi->pdev->dev);
-       enable_hpd_clocks(hdmi, true);
-
-       hpd_int_status = hdmi_read(hdmi, REG_HDMI_HPD_INT_STATUS);
-
-       enable_hpd_clocks(hdmi, false);
-       pm_runtime_put_autosuspend(&hdmi->pdev->dev);
-
-       return (hpd_int_status & HDMI_HPD_INT_STATUS_CABLE_DETECTED) ?
-                       connector_status_connected : connector_status_disconnected;
-}
-
-#define HPD_GPIO_INDEX 2
-static enum drm_connector_status detect_gpio(struct hdmi *hdmi)
-{
-       const struct hdmi_platform_config *config = hdmi->config;
-       struct hdmi_gpio_data hpd_gpio = config->gpios[HPD_GPIO_INDEX];
-
-       return gpiod_get_value(hpd_gpio.gpiod) ?
-                       connector_status_connected :
-                       connector_status_disconnected;
-}
-
-static enum drm_connector_status hdmi_connector_detect(
-               struct drm_connector *connector, bool force)
-{
-       struct hdmi_connector *hdmi_connector = to_hdmi_connector(connector);
-       struct hdmi *hdmi = hdmi_connector->hdmi;
-       const struct hdmi_platform_config *config = hdmi->config;
-       struct hdmi_gpio_data hpd_gpio = config->gpios[HPD_GPIO_INDEX];
-       enum drm_connector_status stat_gpio, stat_reg;
-       int retry = 20;
-
-       /*
-        * some platforms may not have hpd gpio. Rely only on the status
-        * provided by REG_HDMI_HPD_INT_STATUS in this case.
-        */
-       if (!hpd_gpio.gpiod)
-               return detect_reg(hdmi);
-
-       do {
-               stat_gpio = detect_gpio(hdmi);
-               stat_reg  = detect_reg(hdmi);
-
-               if (stat_gpio == stat_reg)
-                       break;
-
-               mdelay(10);
-       } while (--retry);
-
-       /* the status we get from reading gpio seems to be more reliable,
-        * so trust that one the most if we didn't manage to get hdmi and
-        * gpio status to agree:
-        */
-       if (stat_gpio != stat_reg) {
-               DBG("HDMI_HPD_INT_STATUS tells us: %d", stat_reg);
-               DBG("hpd gpio tells us: %d", stat_gpio);
-       }
-
-       return stat_gpio;
-}
-
-static void hdmi_connector_destroy(struct drm_connector *connector)
-{
-       struct hdmi_connector *hdmi_connector = to_hdmi_connector(connector);
-
-       hdp_disable(hdmi_connector);
-
-       drm_connector_cleanup(connector);
-
-       kfree(hdmi_connector);
-}
-
-static int msm_hdmi_connector_get_modes(struct drm_connector *connector)
-{
-       struct hdmi_connector *hdmi_connector = to_hdmi_connector(connector);
-       struct hdmi *hdmi = hdmi_connector->hdmi;
-       struct edid *edid;
-       uint32_t hdmi_ctrl;
-       int ret = 0;
-
-       hdmi_ctrl = hdmi_read(hdmi, REG_HDMI_CTRL);
-       hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl | HDMI_CTRL_ENABLE);
-
-       edid = drm_get_edid(connector, hdmi->i2c);
-
-       hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl);
-
-       hdmi->hdmi_mode = drm_detect_hdmi_monitor(edid);
-       drm_connector_update_edid_property(connector, edid);
-
-       if (edid) {
-               ret = drm_add_edid_modes(connector, edid);
-               kfree(edid);
-       }
-
-       return ret;
-}
-
-static int msm_hdmi_connector_mode_valid(struct drm_connector *connector,
-                                struct drm_display_mode *mode)
-{
-       struct hdmi_connector *hdmi_connector = to_hdmi_connector(connector);
-       struct hdmi *hdmi = hdmi_connector->hdmi;
-       const struct hdmi_platform_config *config = hdmi->config;
-       struct msm_drm_private *priv = connector->dev->dev_private;
-       struct msm_kms *kms = priv->kms;
-       long actual, requested;
-
-       requested = 1000 * mode->clock;
-       actual = kms->funcs->round_pixclk(kms,
-                       requested, hdmi_connector->hdmi->encoder);
-
-       /* for mdp5/apq8074, we manage our own pixel clk (as opposed to
-        * mdp4/dtv stuff where pixel clk is assigned to mdp/encoder
-        * instead):
-        */
-       if (config->pwr_clk_cnt > 0)
-               actual = clk_round_rate(hdmi->pwr_clks[0], actual);
-
-       DBG("requested=%ld, actual=%ld", requested, actual);
-
-       if (actual != requested)
-               return MODE_CLOCK_RANGE;
-
-       return 0;
-}
-
-static const struct drm_connector_funcs hdmi_connector_funcs = {
-       .detect = hdmi_connector_detect,
-       .fill_modes = drm_helper_probe_single_connector_modes,
-       .destroy = hdmi_connector_destroy,
-       .reset = drm_atomic_helper_connector_reset,
-       .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
-       .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-};
-
-static const struct drm_connector_helper_funcs msm_hdmi_connector_helper_funcs = {
-       .get_modes = msm_hdmi_connector_get_modes,
-       .mode_valid = msm_hdmi_connector_mode_valid,
-};
-
-/* initialize connector */
-struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi)
-{
-       struct drm_connector *connector = NULL;
-       struct hdmi_connector *hdmi_connector;
-
-       hdmi_connector = kzalloc(sizeof(*hdmi_connector), GFP_KERNEL);
-       if (!hdmi_connector)
-               return ERR_PTR(-ENOMEM);
-
-       hdmi_connector->hdmi = hdmi;
-       INIT_WORK(&hdmi_connector->hpd_work, msm_hdmi_hotplug_work);
-
-       connector = &hdmi_connector->base;
-
-       drm_connector_init_with_ddc(hdmi->dev, connector,
-                                   &hdmi_connector_funcs,
-                                   DRM_MODE_CONNECTOR_HDMIA,
-                                   hdmi->i2c);
-       drm_connector_helper_add(connector, &msm_hdmi_connector_helper_funcs);
-
-       connector->polled = DRM_CONNECTOR_POLL_CONNECT |
-                       DRM_CONNECTOR_POLL_DISCONNECT;
-
-       connector->interlace_allowed = 0;
-       connector->doublescan_allowed = 0;
-
-       drm_connector_attach_encoder(connector, hdmi->encoder);
-
-       return connector;
-}
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c b/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c
new file mode 100644 (file)
index 0000000..c3a236b
--- /dev/null
@@ -0,0 +1,323 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ */
+
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/pinctrl/consumer.h>
+
+#include "msm_kms.h"
+#include "hdmi.h"
+
+static void msm_hdmi_phy_reset(struct hdmi *hdmi)
+{
+       unsigned int val;
+
+       val = hdmi_read(hdmi, REG_HDMI_PHY_CTRL);
+
+       if (val & HDMI_PHY_CTRL_SW_RESET_LOW) {
+               /* pull low */
+               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                               val & ~HDMI_PHY_CTRL_SW_RESET);
+       } else {
+               /* pull high */
+               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                               val | HDMI_PHY_CTRL_SW_RESET);
+       }
+
+       if (val & HDMI_PHY_CTRL_SW_RESET_PLL_LOW) {
+               /* pull low */
+               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                               val & ~HDMI_PHY_CTRL_SW_RESET_PLL);
+       } else {
+               /* pull high */
+               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                               val | HDMI_PHY_CTRL_SW_RESET_PLL);
+       }
+
+       msleep(100);
+
+       if (val & HDMI_PHY_CTRL_SW_RESET_LOW) {
+               /* pull high */
+               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                               val | HDMI_PHY_CTRL_SW_RESET);
+       } else {
+               /* pull low */
+               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                               val & ~HDMI_PHY_CTRL_SW_RESET);
+       }
+
+       if (val & HDMI_PHY_CTRL_SW_RESET_PLL_LOW) {
+               /* pull high */
+               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                               val | HDMI_PHY_CTRL_SW_RESET_PLL);
+       } else {
+               /* pull low */
+               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                               val & ~HDMI_PHY_CTRL_SW_RESET_PLL);
+       }
+}
+
+static int gpio_config(struct hdmi *hdmi, bool on)
+{
+       const struct hdmi_platform_config *config = hdmi->config;
+       int i;
+
+       if (on) {
+               for (i = 0; i < HDMI_MAX_NUM_GPIO; i++) {
+                       struct hdmi_gpio_data gpio = config->gpios[i];
+
+                       if (gpio.gpiod) {
+                               if (gpio.output) {
+                                       gpiod_direction_output(gpio.gpiod,
+                                                              gpio.value);
+                               } else {
+                                       gpiod_direction_input(gpio.gpiod);
+                                       gpiod_set_value_cansleep(gpio.gpiod,
+                                                                gpio.value);
+                               }
+                       }
+               }
+
+               DBG("gpio on");
+       } else {
+               for (i = 0; i < HDMI_MAX_NUM_GPIO; i++) {
+                       struct hdmi_gpio_data gpio = config->gpios[i];
+
+                       if (!gpio.gpiod)
+                               continue;
+
+                       if (gpio.output) {
+                               int value = gpio.value ? 0 : 1;
+
+                               gpiod_set_value_cansleep(gpio.gpiod, value);
+                       }
+               }
+
+               DBG("gpio off");
+       }
+
+       return 0;
+}
+
+static void enable_hpd_clocks(struct hdmi *hdmi, bool enable)
+{
+       const struct hdmi_platform_config *config = hdmi->config;
+       struct device *dev = &hdmi->pdev->dev;
+       int i, ret;
+
+       if (enable) {
+               for (i = 0; i < config->hpd_clk_cnt; i++) {
+                       if (config->hpd_freq && config->hpd_freq[i]) {
+                               ret = clk_set_rate(hdmi->hpd_clks[i],
+                                                  config->hpd_freq[i]);
+                               if (ret)
+                                       dev_warn(dev,
+                                                "failed to set clk %s (%d)\n",
+                                                config->hpd_clk_names[i], ret);
+                       }
+
+                       ret = clk_prepare_enable(hdmi->hpd_clks[i]);
+                       if (ret) {
+                               DRM_DEV_ERROR(dev,
+                                       "failed to enable hpd clk: %s (%d)\n",
+                                       config->hpd_clk_names[i], ret);
+                       }
+               }
+       } else {
+               for (i = config->hpd_clk_cnt - 1; i >= 0; i--)
+                       clk_disable_unprepare(hdmi->hpd_clks[i]);
+       }
+}
+
+int msm_hdmi_hpd_enable(struct drm_bridge *bridge)
+{
+       struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
+       struct hdmi *hdmi = hdmi_bridge->hdmi;
+       const struct hdmi_platform_config *config = hdmi->config;
+       struct device *dev = &hdmi->pdev->dev;
+       uint32_t hpd_ctrl;
+       int i, ret;
+       unsigned long flags;
+
+       for (i = 0; i < config->hpd_reg_cnt; i++) {
+               ret = regulator_enable(hdmi->hpd_regs[i]);
+               if (ret) {
+                       DRM_DEV_ERROR(dev, "failed to enable hpd regulator: %s (%d)\n",
+                                       config->hpd_reg_names[i], ret);
+                       goto fail;
+               }
+       }
+
+       ret = pinctrl_pm_select_default_state(dev);
+       if (ret) {
+               DRM_DEV_ERROR(dev, "pinctrl state chg failed: %d\n", ret);
+               goto fail;
+       }
+
+       ret = gpio_config(hdmi, true);
+       if (ret) {
+               DRM_DEV_ERROR(dev, "failed to configure GPIOs: %d\n", ret);
+               goto fail;
+       }
+
+       pm_runtime_get_sync(dev);
+       enable_hpd_clocks(hdmi, true);
+
+       msm_hdmi_set_mode(hdmi, false);
+       msm_hdmi_phy_reset(hdmi);
+       msm_hdmi_set_mode(hdmi, true);
+
+       hdmi_write(hdmi, REG_HDMI_USEC_REFTIMER, 0x0001001b);
+
+       /* enable HPD events: */
+       hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL,
+                       HDMI_HPD_INT_CTRL_INT_CONNECT |
+                       HDMI_HPD_INT_CTRL_INT_EN);
+
+       /* set timeout to 4.1ms (max) for hardware debounce */
+       spin_lock_irqsave(&hdmi->reg_lock, flags);
+       hpd_ctrl = hdmi_read(hdmi, REG_HDMI_HPD_CTRL);
+       hpd_ctrl |= HDMI_HPD_CTRL_TIMEOUT(0x1fff);
+
+       /* Toggle HPD circuit to trigger HPD sense */
+       hdmi_write(hdmi, REG_HDMI_HPD_CTRL,
+                       ~HDMI_HPD_CTRL_ENABLE & hpd_ctrl);
+       hdmi_write(hdmi, REG_HDMI_HPD_CTRL,
+                       HDMI_HPD_CTRL_ENABLE | hpd_ctrl);
+       spin_unlock_irqrestore(&hdmi->reg_lock, flags);
+
+       return 0;
+
+fail:
+       return ret;
+}
+
+void msm_hdmi_hpd_disable(struct hdmi_bridge *hdmi_bridge)
+{
+       struct hdmi *hdmi = hdmi_bridge->hdmi;
+       const struct hdmi_platform_config *config = hdmi->config;
+       struct device *dev = &hdmi->pdev->dev;
+       int i, ret = 0;
+
+       /* Disable HPD interrupt */
+       hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL, 0);
+
+       msm_hdmi_set_mode(hdmi, false);
+
+       enable_hpd_clocks(hdmi, false);
+       pm_runtime_put_autosuspend(dev);
+
+       ret = gpio_config(hdmi, false);
+       if (ret)
+               dev_warn(dev, "failed to unconfigure GPIOs: %d\n", ret);
+
+       ret = pinctrl_pm_select_sleep_state(dev);
+       if (ret)
+               dev_warn(dev, "pinctrl state chg failed: %d\n", ret);
+
+       for (i = 0; i < config->hpd_reg_cnt; i++) {
+               ret = regulator_disable(hdmi->hpd_regs[i]);
+               if (ret)
+                       dev_warn(dev, "failed to disable hpd regulator: %s (%d)\n",
+                                       config->hpd_reg_names[i], ret);
+       }
+}
+
+void msm_hdmi_hpd_irq(struct drm_bridge *bridge)
+{
+       struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
+       struct hdmi *hdmi = hdmi_bridge->hdmi;
+       uint32_t hpd_int_status, hpd_int_ctrl;
+
+       /* Process HPD: */
+       hpd_int_status = hdmi_read(hdmi, REG_HDMI_HPD_INT_STATUS);
+       hpd_int_ctrl   = hdmi_read(hdmi, REG_HDMI_HPD_INT_CTRL);
+
+       if ((hpd_int_ctrl & HDMI_HPD_INT_CTRL_INT_EN) &&
+                       (hpd_int_status & HDMI_HPD_INT_STATUS_INT)) {
+               bool detected = !!(hpd_int_status & HDMI_HPD_INT_STATUS_CABLE_DETECTED);
+
+               /* ack & disable (temporarily) HPD events: */
+               hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL,
+                       HDMI_HPD_INT_CTRL_INT_ACK);
+
+               DBG("status=%04x, ctrl=%04x", hpd_int_status, hpd_int_ctrl);
+
+               /* detect disconnect if we are connected or visa versa: */
+               hpd_int_ctrl = HDMI_HPD_INT_CTRL_INT_EN;
+               if (!detected)
+                       hpd_int_ctrl |= HDMI_HPD_INT_CTRL_INT_CONNECT;
+               hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL, hpd_int_ctrl);
+
+               queue_work(hdmi->workq, &hdmi_bridge->hpd_work);
+       }
+}
+
+static enum drm_connector_status detect_reg(struct hdmi *hdmi)
+{
+       uint32_t hpd_int_status;
+
+       pm_runtime_get_sync(&hdmi->pdev->dev);
+       enable_hpd_clocks(hdmi, true);
+
+       hpd_int_status = hdmi_read(hdmi, REG_HDMI_HPD_INT_STATUS);
+
+       enable_hpd_clocks(hdmi, false);
+       pm_runtime_put_autosuspend(&hdmi->pdev->dev);
+
+       return (hpd_int_status & HDMI_HPD_INT_STATUS_CABLE_DETECTED) ?
+                       connector_status_connected : connector_status_disconnected;
+}
+
+#define HPD_GPIO_INDEX 2
+static enum drm_connector_status detect_gpio(struct hdmi *hdmi)
+{
+       const struct hdmi_platform_config *config = hdmi->config;
+       struct hdmi_gpio_data hpd_gpio = config->gpios[HPD_GPIO_INDEX];
+
+       return gpiod_get_value(hpd_gpio.gpiod) ?
+                       connector_status_connected :
+                       connector_status_disconnected;
+}
+
+enum drm_connector_status msm_hdmi_bridge_detect(
+               struct drm_bridge *bridge)
+{
+       struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
+       struct hdmi *hdmi = hdmi_bridge->hdmi;
+       const struct hdmi_platform_config *config = hdmi->config;
+       struct hdmi_gpio_data hpd_gpio = config->gpios[HPD_GPIO_INDEX];
+       enum drm_connector_status stat_gpio, stat_reg;
+       int retry = 20;
+
+       /*
+        * some platforms may not have hpd gpio. Rely only on the status
+        * provided by REG_HDMI_HPD_INT_STATUS in this case.
+        */
+       if (!hpd_gpio.gpiod)
+               return detect_reg(hdmi);
+
+       do {
+               stat_gpio = detect_gpio(hdmi);
+               stat_reg  = detect_reg(hdmi);
+
+               if (stat_gpio == stat_reg)
+                       break;
+
+               mdelay(10);
+       } while (--retry);
+
+       /* the status we get from reading gpio seems to be more reliable,
+        * so trust that one the most if we didn't manage to get hdmi and
+        * gpio status to agree:
+        */
+       if (stat_gpio != stat_reg) {
+               DBG("HDMI_HPD_INT_STATUS tells us: %d", stat_reg);
+               DBG("hpd gpio tells us: %d", stat_gpio);
+       }
+
+       return stat_gpio;
+}