omapdss: hdmi: fix deepcolor mode configuration

The hdmi driver supports deep color modes. However, there is a specific check
which doesn't allow 1080p timings or higher to be shown 36 bit deep color mode.

The more generic check would be to check if the pixel clock in a deep color mode
is less than the maximum pixel clock the TV overlay manager can support for the
given OMAP. Make this change.

Also, make sure that hdmi.dssdev is assigned by the end of probe, this param is
needed by the deepcolor sysfs attribute file.

Signed-off-by: Archit Taneja <archit@ti.com>

diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c
index f69fe0c21afe787d3f186bafb54c2bd8014a8f20..11392f8ecd5e7f02cfaca3d721630aad1960934d 100644 (file)
--- a/drivers/video/omap2/dss/dss_features.c
+++ b/drivers/video/omap2/dss/dss_features.c
@@ -458,6 +458,7 @@ static const struct dss_param_range omap2_dss_param_range[] = {
         * scaler cannot scale a image with width more than 768.
         */
        [FEAT_PARAM_LINEWIDTH]                  = { 1, 768 },
+       [FEAT_PARAM_HDMI_PCLK]                  = { 0, 0 },
 };
 
 static const struct dss_param_range omap3_dss_param_range[] = {
@@ -472,6 +473,7 @@ static const struct dss_param_range omap3_dss_param_range[] = {
        [FEAT_PARAM_DSI_FCK]                    = { 0, 173000000 },
        [FEAT_PARAM_DOWNSCALE]                  = { 1, 4 },
        [FEAT_PARAM_LINEWIDTH]                  = { 1, 1024 },
+       [FEAT_PARAM_HDMI_PCLK]                  = { 0, 0 },
 };
 
 static const struct dss_param_range omap4_dss_param_range[] = {
@@ -486,6 +488,7 @@ static const struct dss_param_range omap4_dss_param_range[] = {
        [FEAT_PARAM_DSI_FCK]                    = { 0, 170000000 },
        [FEAT_PARAM_DOWNSCALE]                  = { 1, 4 },
        [FEAT_PARAM_LINEWIDTH]                  = { 1, 2048 },
+       [FEAT_PARAM_HDMI_PCLK]                  = { 1, 185675000 },
 };
 
 static const struct dss_param_range omap5_dss_param_range[] = {
@@ -500,6 +503,7 @@ static const struct dss_param_range omap5_dss_param_range[] = {
        [FEAT_PARAM_DSI_FCK]                    = { 0, 170000000 },
        [FEAT_PARAM_DOWNSCALE]                  = { 1, 4 },
        [FEAT_PARAM_LINEWIDTH]                  = { 1, 2048 },
+       [FEAT_PARAM_HDMI_PCLK]                  = { 1, 186000000 },
 };
 
 static const enum dss_feat_id omap2_dss_feat_list[] = {

diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h
index 188ceececf5082a21e261f533948367c14d5542c..0e8fccf79ddede31cdc68bb36fcd2707d0972d79 100644 (file)
--- a/drivers/video/omap2/dss/dss_features.h
+++ b/drivers/video/omap2/dss/dss_features.h
@@ -98,6 +98,7 @@ enum dss_range_param {
        FEAT_PARAM_DSI_FCK,
        FEAT_PARAM_DOWNSCALE,
        FEAT_PARAM_LINEWIDTH,
+       FEAT_PARAM_HDMI_PCLK,
 };
 
 /* DSS Feature Functions */

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 6719c2d3d64cce0fcd231c0eae7c41e9d41c8e12..147c0a32671ab3a6037c3d1a07271aaeb62d0036 100644 (file)
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -676,12 +676,13 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
                phy = (p->pixel_clock * 125) / 100 ;
                break;
        case HDMI_DEEP_COLOR_36BIT:
-               if (p->pixel_clock >= 148500) {
+               phy = (p->pixel_clock * 150) / 100;
+
+               if (phy >= dss_feat_get_param_max(FEAT_PARAM_HDMI_PCLK)) {
                        DSSERR("36 bit deep color not supported for the pixel clock %d\n",
                                p->pixel_clock);
                        goto err_deep_color;
                }
-               phy = (p->pixel_clock * 150) / 100;
                break;
        case HDMI_DEEP_COLOR_24BIT:
        default:

diff --git a/drivers/video/omap2/dss/hdmi_panel.c b/drivers/video/omap2/dss/hdmi_panel.c
index 9574f4dbddc9661ef7bd3b4b37c8adf90aa7cbf6..95090f27daaf6c26d363f153900536d5f48021f2 100644 (file)
--- a/drivers/video/omap2/dss/hdmi_panel.c
+++ b/drivers/video/omap2/dss/hdmi_panel.c
@@ -146,6 +146,8 @@ static int hdmi_panel_probe(struct omap_dss_device *dssdev)
 
        omapdss_hdmi_display_set_timing(dssdev, &dssdev->panel.timings);
 
+       hdmi.dssdev = dssdev;
+
        return 0;
 }