OMAP2PLUS: DSS2: FEATURES: DISPC overlay code cleanup

Add dss_features and register fields to incorporate changes in DISPC pipelines
between OMAP3 and OMAP4.

Register fields added: FEAT_REG_HORIZONTALACCU, FEAT_REG_VERTICALACCU
DSS Features added: FEAT_LINEBUFFERSPLIT, FEAT_ROWREPEATENABLE, FEAT_RESIZECONF

_dispc_set_scaling() and _dispc_set_rotation_attrs() have been cleaned up.

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 43f7091c71cb8239bd754e6bbafbf65e332a0dc1..aa6479712d4c65d91767898dbe17e3ba23ac5e60 100644 (file)
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -1130,10 +1130,16 @@ static void _dispc_set_vid_accu0(enum omap_plane plane, int haccu, int vaccu)
        u32 val;
        const struct dispc_reg ac0_reg[] = { DISPC_VID_ACCU0(0),
                                      DISPC_VID_ACCU0(1) };
+       u8 hor_start, hor_end, vert_start, vert_end;
 
        BUG_ON(plane == OMAP_DSS_GFX);
 
-       val = FLD_VAL(vaccu, 25, 16) | FLD_VAL(haccu, 9, 0);
+       dss_feat_get_reg_field(FEAT_REG_HORIZONTALACCU, &hor_start, &hor_end);
+       dss_feat_get_reg_field(FEAT_REG_VERTICALACCU, &vert_start, &vert_end);
+
+       val = FLD_VAL(vaccu, vert_start, vert_end) |
+                       FLD_VAL(haccu, hor_start, hor_end);
+
        dispc_write_reg(ac0_reg[plane-1], val);
 }
 
@@ -1142,10 +1148,16 @@ static void _dispc_set_vid_accu1(enum omap_plane plane, int haccu, int vaccu)
        u32 val;
        const struct dispc_reg ac1_reg[] = { DISPC_VID_ACCU1(0),
                                      DISPC_VID_ACCU1(1) };
+       u8 hor_start, hor_end, vert_start, vert_end;
 
        BUG_ON(plane == OMAP_DSS_GFX);
 
-       val = FLD_VAL(vaccu, 25, 16) | FLD_VAL(haccu, 9, 0);
+       dss_feat_get_reg_field(FEAT_REG_HORIZONTALACCU, &hor_start, &hor_end);
+       dss_feat_get_reg_field(FEAT_REG_VERTICALACCU, &vert_start, &vert_end);
+
+       val = FLD_VAL(vaccu, vert_start, vert_end) |
+                       FLD_VAL(haccu, hor_start, hor_end);
+
        dispc_write_reg(ac1_reg[plane-1], val);
 }
 
@@ -1183,16 +1195,25 @@ static void _dispc_set_scaling(enum omap_plane plane,
        _dispc_set_fir(plane, fir_hinc, fir_vinc);
 
        l = dispc_read_reg(dispc_reg_att[plane]);
-       l &= ~((0x0f << 5) | (0x3 << 21));
 
+       /* RESIZEENABLE and VERTICALTAPS */
+       l &= ~((0x3 << 5) | (0x1 << 21));
        l |= fir_hinc ? (1 << 5) : 0;
        l |= fir_vinc ? (1 << 6) : 0;
+       l |= five_taps ? (1 << 21) : 0;
 
-       l |= hscaleup ? 0 : (1 << 7);
-       l |= vscaleup ? 0 : (1 << 8);
+       /* VRESIZECONF and HRESIZECONF */
+       if (dss_has_feature(FEAT_RESIZECONF)) {
+               l &= ~(0x3 << 7);
+               l |= hscaleup ? 0 : (1 << 7);
+               l |= vscaleup ? 0 : (1 << 8);
+       }
 
-       l |= five_taps ? (1 << 21) : 0;
-       l |= five_taps ? (1 << 22) : 0;
+       /* LINEBUFFERSPLIT */
+       if (dss_has_feature(FEAT_LINEBUFFERSPLIT)) {
+               l &= ~(0x1 << 22);
+               l |= five_taps ? (1 << 22) : 0;
+       }
 
        dispc_write_reg(dispc_reg_att[plane], l);
 
@@ -1216,9 +1237,11 @@ static void _dispc_set_scaling(enum omap_plane plane,
 static void _dispc_set_rotation_attrs(enum omap_plane plane, u8 rotation,
                bool mirroring, enum omap_color_mode color_mode)
 {
+       bool row_repeat = false;
+       int vidrot = 0;
+
        if (color_mode == OMAP_DSS_COLOR_YUV2 ||
                        color_mode == OMAP_DSS_COLOR_UYVY) {
-               int vidrot = 0;
 
                if (mirroring) {
                        switch (rotation) {
@@ -1252,16 +1275,15 @@ static void _dispc_set_rotation_attrs(enum omap_plane plane, u8 rotation,
                        }
                }
 
-               REG_FLD_MOD(dispc_reg_att[plane], vidrot, 13, 12);
-
                if (rotation == OMAP_DSS_ROT_90 || rotation == OMAP_DSS_ROT_270)
-                       REG_FLD_MOD(dispc_reg_att[plane], 0x1, 18, 18);
+                       row_repeat = true;
                else
-                       REG_FLD_MOD(dispc_reg_att[plane], 0x0, 18, 18);
-       } else {
-               REG_FLD_MOD(dispc_reg_att[plane], 0, 13, 12);
-               REG_FLD_MOD(dispc_reg_att[plane], 0, 18, 18);
+                       row_repeat = false;
        }
+
+       REG_FLD_MOD(dispc_reg_att[plane], vidrot, 13, 12);
+       if (dss_has_feature(FEAT_ROWREPEATENABLE))
+               REG_FLD_MOD(dispc_reg_att[plane], row_repeat ? 1 : 0, 18, 18);
 }
 
 static int color_mode_to_bpp(enum omap_color_mode color_mode)

diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c
index fe22d11068bdb0dbb096369e69d0850df5f19b2a..679be14b73a84ca2f88ded0ada81b282b3ed5754 100644 (file)
--- a/drivers/video/omap2/dss/dss_features.c
+++ b/drivers/video/omap2/dss/dss_features.c
@@ -54,6 +54,8 @@ static const struct dss_reg_field omap2_dss_reg_fields[] = {
        { FEAT_REG_FIFOLOWTHRESHOLD, 8, 0 },
        { FEAT_REG_FIFOHIGHTHRESHOLD, 24, 16 },
        { FEAT_REG_FIFOSIZE, 8, 0 },
+       { FEAT_REG_HORIZONTALACCU, 9, 0 },
+       { FEAT_REG_VERTICALACCU, 25, 16 },
 };
 
 static const struct dss_reg_field omap3_dss_reg_fields[] = {
@@ -62,6 +64,18 @@ static const struct dss_reg_field omap3_dss_reg_fields[] = {
        { FEAT_REG_FIFOLOWTHRESHOLD, 11, 0 },
        { FEAT_REG_FIFOHIGHTHRESHOLD, 27, 16 },
        { FEAT_REG_FIFOSIZE, 10, 0 },
+       { FEAT_REG_HORIZONTALACCU, 9, 0 },
+       { FEAT_REG_VERTICALACCU, 25, 16 },
+};
+
+static const struct dss_reg_field omap4_dss_reg_fields[] = {
+       { FEAT_REG_FIRHINC, 12, 0 },
+       { FEAT_REG_FIRVINC, 28, 16 },
+       { FEAT_REG_FIFOLOWTHRESHOLD, 15, 0 },
+       { FEAT_REG_FIFOHIGHTHRESHOLD, 31, 16 },
+       { FEAT_REG_FIFOSIZE, 15, 0 },
+       { FEAT_REG_HORIZONTALACCU, 10, 0 },
+       { FEAT_REG_VERTICALACCU, 26, 16 },
 };
 
 static const enum omap_display_type omap2_dss_supported_displays[] = {
@@ -149,7 +163,8 @@ static struct omap_dss_features omap2_dss_features = {
 
        .has_feature    =
                FEAT_LCDENABLEPOL | FEAT_LCDENABLESIGNAL |
-               FEAT_PCKFREEENABLE | FEAT_FUNCGATED,
+               FEAT_PCKFREEENABLE | FEAT_FUNCGATED |
+               FEAT_ROWREPEATENABLE | FEAT_RESIZECONF,
 
        .num_mgrs = 2,
        .num_ovls = 3,
@@ -165,7 +180,8 @@ static struct omap_dss_features omap3430_dss_features = {
        .has_feature    =
                FEAT_GLOBAL_ALPHA | FEAT_LCDENABLEPOL |
                FEAT_LCDENABLESIGNAL | FEAT_PCKFREEENABLE |
-               FEAT_FUNCGATED,
+               FEAT_FUNCGATED | FEAT_ROWREPEATENABLE |
+               FEAT_LINEBUFFERSPLIT | FEAT_RESIZECONF,
 
        .num_mgrs = 2,
        .num_ovls = 3,
@@ -180,7 +196,9 @@ static struct omap_dss_features omap3630_dss_features = {
        .has_feature    =
                FEAT_GLOBAL_ALPHA | FEAT_LCDENABLEPOL |
                FEAT_LCDENABLESIGNAL | FEAT_PCKFREEENABLE |
-               FEAT_PRE_MULT_ALPHA | FEAT_FUNCGATED,
+               FEAT_PRE_MULT_ALPHA | FEAT_FUNCGATED |
+               FEAT_ROWREPEATENABLE | FEAT_LINEBUFFERSPLIT |
+               FEAT_RESIZECONF,
 
        .num_mgrs = 2,
        .num_ovls = 3,
@@ -190,12 +208,12 @@ static struct omap_dss_features omap3630_dss_features = {
 
 /* OMAP4 DSS Features */
 static struct omap_dss_features omap4_dss_features = {
-       .reg_fields = omap3_dss_reg_fields,
-       .num_reg_fields = ARRAY_SIZE(omap3_dss_reg_fields),
+       .reg_fields = omap4_dss_reg_fields,
+       .num_reg_fields = ARRAY_SIZE(omap4_dss_reg_fields),
 
        .has_feature    =
                FEAT_GLOBAL_ALPHA | FEAT_PRE_MULT_ALPHA |
-               FEAT_MGR_LCD2,
+               FEAT_MGR_LCD2 | FEAT_GLOBAL_ALPHA_VID1,
 
        .num_mgrs = 3,
        .num_ovls = 3,

diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h
index b9c70be9258874dbdca30c6f53eeaefba6307267..b3f81415507ce2d3d7b0f0185478f21a053edfa8 100644 (file)
--- a/drivers/video/omap2/dss/dss_features.h
+++ b/drivers/video/omap2/dss/dss_features.h
@@ -33,6 +33,9 @@ enum dss_feat_id {
        FEAT_PCKFREEENABLE      = 1 << 5,
        FEAT_FUNCGATED          = 1 << 6,
        FEAT_MGR_LCD2           = 1 << 7,
+       FEAT_LINEBUFFERSPLIT    = 1 << 8,
+       FEAT_ROWREPEATENABLE    = 1 << 9,
+       FEAT_RESIZECONF         = 1 << 10,
 };
 
 /* DSS register field id */
@@ -42,6 +45,8 @@ enum dss_feat_reg_field {
        FEAT_REG_FIFOHIGHTHRESHOLD,
        FEAT_REG_FIFOLOWTHRESHOLD,
        FEAT_REG_FIFOSIZE,
+       FEAT_REG_HORIZONTALACCU,
+       FEAT_REG_VERTICALACCU,
 };
 
 /* DSS Feature Functions */