To make it possible to use HDMI PLL for other video outputs than HDMI,
the HDMI PLL code needs to do runtime_get/put for the HDMI IP, so that
the IP (include the PLL) is enabled.

To do that we also need to store the HDMI pdev in the hdmi_pll_data.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen at ti.com>
---
 drivers/gpu/drm/omapdrm/dss/hdmi.h     | 1 +
 drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi.h 
b/drivers/gpu/drm/omapdrm/dss/hdmi.h
index 53616b02b613..d8757abfa175 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi.h
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi.h
@@ -240,6 +240,7 @@ struct hdmi_pll_data {

        void __iomem *base;

+       struct platform_device *pdev;
        struct hdmi_wp_data *wp;
 };

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
index 110ed50d5ce1..a9896e7454c5 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
@@ -16,6 +16,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/pm_runtime.h>

 #include <video/omapdss.h>

@@ -104,6 +105,9 @@ static int hdmi_pll_enable(struct dss_pll *dsspll)
        struct hdmi_wp_data *wp = pll->wp;
        int r;

+       r = pm_runtime_get_sync(&pll->pdev->dev);
+       WARN_ON(r < 0);
+
        dss_ctrl_pll_enable(DSS_PLL_HDMI, true);

        r = hdmi_wp_set_pll_pwr(wp, HDMI_PLLPWRCMD_BOTHON_ALLCLKS);
@@ -117,10 +121,14 @@ static void hdmi_pll_disable(struct dss_pll *dsspll)
 {
        struct hdmi_pll_data *pll = container_of(dsspll, struct hdmi_pll_data, 
pll);
        struct hdmi_wp_data *wp = pll->wp;
+       int r;

        hdmi_wp_set_pll_pwr(wp, HDMI_PLLPWRCMD_ALLOFF);

        dss_ctrl_pll_enable(DSS_PLL_HDMI, false);
+
+       r = pm_runtime_put_sync(&pll->pdev->dev);
+       WARN_ON(r < 0 && r != -ENOSYS);
 }

 static const struct dss_pll_ops dsi_pll_ops = {
@@ -228,6 +236,7 @@ int hdmi_pll_init(struct platform_device *pdev, struct 
hdmi_pll_data *pll,
        int r;
        struct resource *res;

+       pll->pdev = pdev;
        pll->wp = wp;

        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pll");
-- 
2.5.0

Reply via email to