OMAPDSS: DISPC: Get correct pixel clock for TV manager

dispc_mgr_pclk_rate() is used to calculate minimum required functional clock for
scaling in calc_fclk() and calc_fclk_five_taps(). This function returns the
correct pixel clock for LCD and LCD2 managers, but not for TV manager. Extend
this function so that it gets the correct pixel clock for TV manager.

This also prevents the crash we get when we try to scale overlays connected to
TV manager. The current code leads to a BUG() being executed if we call
dispc_mgr_pclk_rate() for the TV manager.

Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index a96fc41d766883f261887cf24d83d57537eb6359..57074b33f02481e305d50088ee9613c2cb82b6a5 100644 (file)
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -427,6 +427,14 @@ static inline bool dispc_mgr_is_lcd(enum omap_channel channel)
                return false;
 }
 
+static struct omap_dss_device *dispc_mgr_get_device(enum omap_channel channel)
+{
+       struct omap_overlay_manager *mgr =
+               omap_dss_get_overlay_manager(channel);
+
+       return mgr ? mgr->device : NULL;
+}
+
 bool dispc_mgr_go_busy(enum omap_channel channel)
 {
        int bit;
@@ -1619,7 +1627,6 @@ static unsigned long calc_fclk_five_taps(enum omap_channel channel, u16 width,
                enum omap_color_mode color_mode)
 {
        u32 fclk = 0;
-       /* FIXME venc pclk? */
        u64 tmp, pclk = dispc_mgr_pclk_rate(channel);
 
        if (height > out_height) {
@@ -1676,7 +1683,6 @@ static unsigned long calc_fclk(enum omap_channel channel, u16 width,
        else
                vf = 1;
 
-       /* FIXME venc pclk? */
        return dispc_mgr_pclk_rate(channel) * vf * hf;
 }
 
@@ -2415,17 +2421,32 @@ unsigned long dispc_mgr_lclk_rate(enum omap_channel channel)
 
 unsigned long dispc_mgr_pclk_rate(enum omap_channel channel)
 {
-       int pcd;
        unsigned long r;
-       u32 l;
 
-       l = dispc_read_reg(DISPC_DIVISORo(channel));
+       if (dispc_mgr_is_lcd(channel)) {
+               int pcd;
+               u32 l;
 
-       pcd = FLD_GET(l, 7, 0);
+               l = dispc_read_reg(DISPC_DIVISORo(channel));
 
-       r = dispc_mgr_lclk_rate(channel);
+               pcd = FLD_GET(l, 7, 0);
 
-       return r / pcd;
+               r = dispc_mgr_lclk_rate(channel);
+
+               return r / pcd;
+       } else {
+               struct omap_dss_device *dssdev =
+                       dispc_mgr_get_device(channel);
+
+               switch (dssdev->type) {
+               case OMAP_DISPLAY_TYPE_VENC:
+                       return venc_get_pixel_clock();
+               case OMAP_DISPLAY_TYPE_HDMI:
+                       return hdmi_get_pixel_clock();
+               default:
+                       BUG();
+               }
+       }
 }
 
 void dispc_dump_clocks(struct seq_file *s)

diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index dff9b799d51e6e9eb0ea02f693a162f239fa5f05..47eebd8041539c94155be0e4ad70fa137aaa1539 100644 (file)
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -450,6 +450,7 @@ int venc_init_platform_driver(void);
 void venc_uninit_platform_driver(void);
 void venc_dump_regs(struct seq_file *s);
 int venc_init_display(struct omap_dss_device *display);
+unsigned long venc_get_pixel_clock(void);
 #else
 static inline int venc_init_platform_driver(void)
 {
@@ -458,6 +459,11 @@ static inline int venc_init_platform_driver(void)
 static inline void venc_uninit_platform_driver(void)
 {
 }
+static inline unsigned long venc_get_pixel_clock(void)
+{
+       WARN("%s: VENC not compiled in, returning pclk as 0\n", __func__);
+       return 0;
+}
 #endif
 
 /* HDMI */
@@ -465,6 +471,7 @@ static inline void venc_uninit_platform_driver(void)
 int hdmi_init_platform_driver(void);
 void hdmi_uninit_platform_driver(void);
 int hdmi_init_display(struct omap_dss_device *dssdev);
+unsigned long hdmi_get_pixel_clock(void);
 #else
 static inline int hdmi_init_display(struct omap_dss_device *dssdev)
 {
@@ -477,6 +484,11 @@ static inline int hdmi_init_platform_driver(void)
 static inline void hdmi_uninit_platform_driver(void)
 {
 }
+static inline unsigned long hdmi_get_pixel_clock(void)
+{
+       WARN("%s: HDMI not compiled in, returning pclk as 0\n", __func__);
+       return 0;
+}
 #endif
 int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev);
 void omapdss_hdmi_display_disable(struct omap_dss_device *dssdev);

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 7818670026622877ab957a291eb01ec195ea970e..2f554ae6858e90b9264f67b427ce1470dda7b597 100644 (file)
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -266,6 +266,12 @@ static void update_hdmi_timings(struct hdmi_config *cfg,
        cfg->timings.hsync_pol = cea_vesa_timings[code].hsync_pol;
 }
 
+unsigned long hdmi_get_pixel_clock(void)
+{
+       /* HDMI Pixel Clock in Mhz */
+       return hdmi.ip_data.cfg.timings.timings.pixel_clock * 10000;
+}
+
 static void hdmi_compute_pll(struct omap_dss_device *dssdev, int phy,
                struct hdmi_pll_info *pi)
 {

diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 53319580417c1991f78b172e004ceb3711029936..7533458ba4d24effd08aced87cff7c2ff47eb418 100644 (file)
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -463,9 +463,11 @@ static void venc_power_off(struct omap_dss_device *dssdev)
        regulator_disable(venc.vdda_dac_reg);
 }
 
-
-
-
+unsigned long venc_get_pixel_clock(void)
+{
+       /* VENC Pixel Clock in Mhz */
+       return 13500000;
+}
 
 /* driver */
 static int venc_panel_probe(struct omap_dss_device *dssdev)