drm: omapdrm: dss: Use supported outputs instead of display types

The dss driver uses the supported display types to check whether the DSS
has SDI, VENC or HDMI outputs. We can instead use the supported outputs
the provide the same information. This removes the last use of the
supported display types, that we can then remove as well.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
index 06c6e0145703e51565164223d8350f2d2a177a91..c3fab0ddcde98635401c01434347d7f3ac717f78 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -146,8 +146,8 @@ static void dss_save_context(void)
 
        SR(CONTROL);
 
-       if (dss_feat_get_supported_displays(OMAP_DSS_CHANNEL_LCD) &
-                       OMAP_DISPLAY_TYPE_SDI) {
+       if (dss_feat_get_supported_outputs(OMAP_DSS_CHANNEL_LCD) &
+                       OMAP_DSS_OUTPUT_SDI) {
                SR(SDI_CONTROL);
                SR(PLL_CONTROL);
        }
@@ -166,8 +166,8 @@ static void dss_restore_context(void)
 
        RR(CONTROL);
 
-       if (dss_feat_get_supported_displays(OMAP_DSS_CHANNEL_LCD) &
-                       OMAP_DISPLAY_TYPE_SDI) {
+       if (dss_feat_get_supported_outputs(OMAP_DSS_CHANNEL_LCD) &
+                       OMAP_DSS_OUTPUT_SDI) {
                RR(SDI_CONTROL);
                RR(PLL_CONTROL);
        }
@@ -397,8 +397,8 @@ static void dss_dump_regs(struct seq_file *s)
        DUMPREG(DSS_SYSSTATUS);
        DUMPREG(DSS_CONTROL);
 
-       if (dss_feat_get_supported_displays(OMAP_DSS_CHANNEL_LCD) &
-                       OMAP_DISPLAY_TYPE_SDI) {
+       if (dss_feat_get_supported_outputs(OMAP_DSS_CHANNEL_LCD) &
+                       OMAP_DSS_OUTPUT_SDI) {
                DUMPREG(DSS_SDI_CONTROL);
                DUMPREG(DSS_PLL_CONTROL);
                DUMPREG(DSS_SDI_STATUS);
@@ -728,27 +728,29 @@ void dss_set_dac_pwrdn_bgz(bool enable)
 
 void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select src)
 {
-       enum omap_display_type dp;
-       dp = dss_feat_get_supported_displays(OMAP_DSS_CHANNEL_DIGIT);
+       enum omap_dss_output_id outputs;
+
+       outputs = dss_feat_get_supported_outputs(OMAP_DSS_CHANNEL_DIGIT);
 
        /* Complain about invalid selections */
-       WARN_ON((src == DSS_VENC_TV_CLK) && !(dp & OMAP_DISPLAY_TYPE_VENC));
-       WARN_ON((src == DSS_HDMI_M_PCLK) && !(dp & OMAP_DISPLAY_TYPE_HDMI));
+       WARN_ON((src == DSS_VENC_TV_CLK) && !(outputs & OMAP_DSS_OUTPUT_VENC));
+       WARN_ON((src == DSS_HDMI_M_PCLK) && !(outputs & OMAP_DSS_OUTPUT_HDMI));
 
        /* Select only if we have options */
-       if ((dp & OMAP_DISPLAY_TYPE_VENC) && (dp & OMAP_DISPLAY_TYPE_HDMI))
+       if ((outputs & OMAP_DSS_OUTPUT_VENC) &&
+           (outputs & OMAP_DSS_OUTPUT_HDMI))
                REG_FLD_MOD(DSS_CONTROL, src, 15, 15);  /* VENC_HDMI_SWITCH */
 }
 
 enum dss_hdmi_venc_clk_source_select dss_get_hdmi_venc_clk_source(void)
 {
-       enum omap_display_type displays;
+       enum omap_dss_output_id outputs;
 
-       displays = dss_feat_get_supported_displays(OMAP_DSS_CHANNEL_DIGIT);
-       if ((displays & OMAP_DISPLAY_TYPE_HDMI) == 0)
+       outputs = dss_feat_get_supported_outputs(OMAP_DSS_CHANNEL_DIGIT);
+       if ((outputs & OMAP_DSS_OUTPUT_HDMI) == 0)
                return DSS_VENC_TV_CLK;
 
-       if ((displays & OMAP_DISPLAY_TYPE_VENC) == 0)
+       if ((outputs & OMAP_DSS_OUTPUT_VENC) == 0)
                return DSS_HDMI_M_PCLK;
 
        return REG_GET(DSS_CONTROL, 15, 15);

diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.c b/drivers/gpu/drm/omapdrm/dss/dss_features.c
index 0e599710dd951e2f088144157e778e6a456e8d6a..4172fb3bf106613f42fc73567ad9bc886429b67e 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss_features.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss_features.c
@@ -46,7 +46,6 @@ struct omap_dss_features {
 
        const int num_mgrs;
        const int num_ovls;
-       const enum omap_display_type *supported_displays;
        const enum omap_dss_output_id *supported_outputs;
        const u32 **supported_color_modes;
        const enum omap_overlay_caps *overlay_caps;
@@ -114,62 +113,6 @@ static const struct dss_reg_field omap5_dss_reg_fields[] = {
        [FEAT_REG_DISPC_CLK_SWITCH]             = { 9, 7 },
 };
 
-static const enum omap_display_type omap2_dss_supported_displays[] = {
-       /* OMAP_DSS_CHANNEL_LCD */
-       OMAP_DISPLAY_TYPE_DPI | OMAP_DISPLAY_TYPE_DBI,
-
-       /* OMAP_DSS_CHANNEL_DIGIT */
-       OMAP_DISPLAY_TYPE_VENC,
-};
-
-static const enum omap_display_type omap3430_dss_supported_displays[] = {
-       /* OMAP_DSS_CHANNEL_LCD */
-       OMAP_DISPLAY_TYPE_DPI | OMAP_DISPLAY_TYPE_DBI |
-       OMAP_DISPLAY_TYPE_SDI | OMAP_DISPLAY_TYPE_DSI,
-
-       /* OMAP_DSS_CHANNEL_DIGIT */
-       OMAP_DISPLAY_TYPE_VENC,
-};
-
-static const enum omap_display_type omap3630_dss_supported_displays[] = {
-       /* OMAP_DSS_CHANNEL_LCD */
-       OMAP_DISPLAY_TYPE_DPI | OMAP_DISPLAY_TYPE_DBI |
-       OMAP_DISPLAY_TYPE_DSI,
-
-       /* OMAP_DSS_CHANNEL_DIGIT */
-       OMAP_DISPLAY_TYPE_VENC,
-};
-
-static const enum omap_display_type am43xx_dss_supported_displays[] = {
-       /* OMAP_DSS_CHANNEL_LCD */
-       OMAP_DISPLAY_TYPE_DPI | OMAP_DISPLAY_TYPE_DBI,
-};
-
-static const enum omap_display_type omap4_dss_supported_displays[] = {
-       /* OMAP_DSS_CHANNEL_LCD */
-       OMAP_DISPLAY_TYPE_DBI | OMAP_DISPLAY_TYPE_DSI,
-
-       /* OMAP_DSS_CHANNEL_DIGIT */
-       OMAP_DISPLAY_TYPE_VENC | OMAP_DISPLAY_TYPE_HDMI,
-
-       /* OMAP_DSS_CHANNEL_LCD2 */
-       OMAP_DISPLAY_TYPE_DPI | OMAP_DISPLAY_TYPE_DBI |
-       OMAP_DISPLAY_TYPE_DSI,
-};
-
-static const enum omap_display_type omap5_dss_supported_displays[] = {
-       /* OMAP_DSS_CHANNEL_LCD */
-       OMAP_DISPLAY_TYPE_DPI | OMAP_DISPLAY_TYPE_DBI |
-       OMAP_DISPLAY_TYPE_DSI,
-
-       /* OMAP_DSS_CHANNEL_DIGIT */
-       OMAP_DISPLAY_TYPE_HDMI | OMAP_DISPLAY_TYPE_DPI,
-
-       /* OMAP_DSS_CHANNEL_LCD2 */
-       OMAP_DISPLAY_TYPE_DPI | OMAP_DISPLAY_TYPE_DBI |
-       OMAP_DISPLAY_TYPE_DSI,
-};
-
 static const enum omap_dss_output_id omap2_dss_supported_outputs[] = {
        /* OMAP_DSS_CHANNEL_LCD */
        OMAP_DSS_OUTPUT_DPI | OMAP_DSS_OUTPUT_DBI,
@@ -604,7 +547,6 @@ static const struct omap_dss_features omap2_dss_features = {
 
        .num_mgrs = 2,
        .num_ovls = 3,
-       .supported_displays = omap2_dss_supported_displays,
        .supported_outputs = omap2_dss_supported_outputs,
        .supported_color_modes = omap2_dss_supported_color_modes,
        .overlay_caps = omap2_dss_overlay_caps,
@@ -623,7 +565,6 @@ static const struct omap_dss_features omap3430_dss_features = {
 
        .num_mgrs = 2,
        .num_ovls = 3,
-       .supported_displays = omap3430_dss_supported_displays,
        .supported_outputs = omap3430_dss_supported_outputs,
        .supported_color_modes = omap3_dss_supported_color_modes,
        .overlay_caps = omap3430_dss_overlay_caps,
@@ -645,7 +586,6 @@ static const struct omap_dss_features am35xx_dss_features = {
 
        .num_mgrs = 2,
        .num_ovls = 3,
-       .supported_displays = omap3430_dss_supported_displays,
        .supported_outputs = omap3430_dss_supported_outputs,
        .supported_color_modes = omap3_dss_supported_color_modes,
        .overlay_caps = omap3430_dss_overlay_caps,
@@ -663,7 +603,6 @@ static const struct omap_dss_features am43xx_dss_features = {
 
        .num_mgrs = 1,
        .num_ovls = 3,
-       .supported_displays = am43xx_dss_supported_displays,
        .supported_outputs = am43xx_dss_supported_outputs,
        .supported_color_modes = omap3_dss_supported_color_modes,
        .overlay_caps = omap3430_dss_overlay_caps,
@@ -681,7 +620,6 @@ static const struct omap_dss_features omap3630_dss_features = {
 
        .num_mgrs = 2,
        .num_ovls = 3,
-       .supported_displays = omap3630_dss_supported_displays,
        .supported_outputs = omap3630_dss_supported_outputs,
        .supported_color_modes = omap3_dss_supported_color_modes,
        .overlay_caps = omap3630_dss_overlay_caps,
@@ -701,7 +639,6 @@ static const struct omap_dss_features omap4430_es1_0_dss_features  = {
 
        .num_mgrs = 3,
        .num_ovls = 4,
-       .supported_displays = omap4_dss_supported_displays,
        .supported_outputs = omap4_dss_supported_outputs,
        .supported_color_modes = omap4_dss_supported_color_modes,
        .overlay_caps = omap4_dss_overlay_caps,
@@ -720,7 +657,6 @@ static const struct omap_dss_features omap4430_es2_0_1_2_dss_features = {
 
        .num_mgrs = 3,
        .num_ovls = 4,
-       .supported_displays = omap4_dss_supported_displays,
        .supported_outputs = omap4_dss_supported_outputs,
        .supported_color_modes = omap4_dss_supported_color_modes,
        .overlay_caps = omap4_dss_overlay_caps,
@@ -739,7 +675,6 @@ static const struct omap_dss_features omap4_dss_features = {
 
        .num_mgrs = 3,
        .num_ovls = 4,
-       .supported_displays = omap4_dss_supported_displays,
        .supported_outputs = omap4_dss_supported_outputs,
        .supported_color_modes = omap4_dss_supported_color_modes,
        .overlay_caps = omap4_dss_overlay_caps,
@@ -758,7 +693,6 @@ static const struct omap_dss_features omap5_dss_features = {
 
        .num_mgrs = 4,
        .num_ovls = 4,
-       .supported_displays = omap5_dss_supported_displays,
        .supported_outputs = omap5_dss_supported_outputs,
        .supported_color_modes = omap4_dss_supported_color_modes,
        .overlay_caps = omap4_dss_overlay_caps,
@@ -788,11 +722,6 @@ unsigned long dss_feat_get_param_max(enum dss_range_param param)
        return omap_current_dss_features->dss_params[param].max;
 }
 
-enum omap_display_type dss_feat_get_supported_displays(enum omap_channel channel)
-{
-       return omap_current_dss_features->supported_displays[channel];
-}
-
 enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel)
 {
        return omap_current_dss_features->supported_outputs[channel];

diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h
index c36436d27ff5fe49ac1aead1117c65879bd8481d..56936d972cd3f6190d85c7b213ea5e467ead00be 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss_features.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h
@@ -99,7 +99,6 @@ bool dss_has_feature(enum dss_feat_id id);
 void dss_feat_get_reg_field(enum dss_feat_reg_field id, u8 *start, u8 *end);
 void dss_features_init(enum omapdss_version version);
 
-enum omap_display_type dss_feat_get_supported_displays(enum omap_channel channel);
 enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel);
 
 int dss_feat_get_num_mgrs(void);