OMAP: DSS2: Framework to handle omap version specific DSS features

Add dss_features.c and dss_features.h for the dss_features framework

Signed-off-by Archit Taneja <[email protected]>

---
 drivers/video/omap2/dss/Makefile       |    2 +-
 drivers/video/omap2/dss/dss_features.c |  191 ++++++++++++++++++++++++++++++++
 drivers/video/omap2/dss/dss_features.h |   50 ++++++++
 3 files changed, 242 insertions(+), 1 deletions(-)
 create mode 100644 drivers/video/omap2/dss/dss_features.c
 create mode 100644 drivers/video/omap2/dss/dss_features.h

drivers/video/omap2/dss/Makefile +1 -1

index d71b5d9..7db17b5
@@ -1,5 +1,5 @@
 obj-$(CONFIG_OMAP2_DSS) += omapdss.o
-omapdss-y := core.o dss.o dispc.o display.o manager.o overlay.o
+omapdss-y := core.o dss.o dss_features.o dispc.o display.o manager.o overlay.o
 omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o
 omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o
 omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o

drivers/video/omap2/dss/dss_features.c new file +39 -0

new file mode 100644
index 0000000..c3e4d4d
@@ -0,0 +1,191 @@
+/*
+ * linux/drivers/video/omap2/dss/dss_features.c
+ *
+ * Copyright (C) 2010 Texas Instruments
+ * Author: Archit Taneja <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+
+#include <plat/display.h>
+#include <plat/cpu.h>
+
+#include "dss_features.h"
+
+/* Defines a generic omap register field */
+struct dss_reg_field {
+	enum dss_feat_reg_field id;
+	u8 start, end;
+};
+
+struct omap_dss_features {
+	struct dss_reg_field *reg_fields;
+	int num_reg_fields;
+

Hi,

Quoted 6 lines · ext Archit Taneja

Add dss_features.c and dss_features.h for the dss_features framework

Signed-off-by Archit Taneja <[email protected]>

---
 drivers/video/omap2/dss/Makefile       |    2 +-
 drivers/video/omap2/dss/dss_features.c |  191

++++++++++++++++++++++++++++++++

Quoted 63 lines

 drivers/video/omap2/dss/dss_features.h |   50 ++++++++
 3 files changed, 242 insertions(+), 1 deletions(-)  create mode
100644 drivers/video/omap2/dss/dss_features.c
 create mode 100644 drivers/video/omap2/dss/dss_features.h

drivers/video/omap2/dss/Makefile +1 -1

index d71b5d9..7db17b5
@@ -1,5 +1,5 @@
 obj-$(CONFIG_OMAP2_DSS) += omapdss.o
-omapdss-y := core.o dss.o dispc.o display.o manager.o overlay.o
+omapdss-y := core.o dss.o dss_features.o dispc.o display.o manager.o
 +overlay.o omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o
 omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o
 omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o diff --git

a/drivers/video/omap2/dss/dss_features.c
b/drivers/video/omap2/dss/dss_features.c
new file mode 100644
index 0000000..c3e4d4d

drivers/video/omap2/dss/dss_features.c new file +11 -0

@@ -0,0 +1,191 @@
+/*
+ * linux/drivers/video/omap2/dss/dss_features.c
+ *
+ * Copyright (C) 2010 Texas Instruments
+ * Author: Archit Taneja <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or +modify it
+ * under the terms of the GNU General Public License version 2 as
+published by + * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, +but

WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +License for + * more details.
+ *
+ * You should have received a copy of the GNU General Public License +along with + * this program. If not, see <http://www.gnu.org/licenses/>. + */

drivers/video/omap2/dss/dss_features.c new file +12 -0

+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+
+#include <plat/display.h>
+#include <plat/cpu.h>
+
+#include "dss_features.h"
+
+/* Defines a generic omap register field */ struct dss_reg_field { +	enum

dss_feat_reg_field id; + u8 start, end;

drivers/video/omap2/dss/dss_features.c new file +9 -0

+};
+
+struct omap_dss_features {
+	struct dss_reg_field *reg_fields;
+	int num_reg_fields;
+
+	u32 has_feature;
+
+	int num_mgrs;

drivers/video/omap2/dss/dss_features.c

Quoted 6 lines

drivers/video/omap2/dss/dss_features.c new file +6 -0

+	int num_ovls;
+	enum omap_display_type *supported_displays;
+	enum omap_color_mode *supported_color_modes; };
+
+/* This struct is assigned to one of the below during initialization
+*/ static struct omap_dss_features omap_current_dss_features;

Any particular reason this is not a pointer?

Also, I think most (all?) of the structs can be consts, as they are never changed.

Otherwise I think this looks good.

Tomi

Calls init functions of dss_features during dss_probe, and the following features are made omapxxxx independent:
- number of managers, overlays
- supported color modes for each overlay
- supported displays for each manager
- global aplha, and restriction of global alpha for video1 pipeline
- The register field ranges : FIRHINC, FIRVINC, FIFOHIGHTHRESHOLD FIFOLOWTHRESHOLD and FIFOSIZE

Signed-off-by Archit Taneja <[email protected]>

---
 arch/arm/plat-omap/include/plat/display.h |   31 ----------------
 drivers/video/omap2/dss/core.c            |    3 ++
 drivers/video/omap2/dss/dispc.c           |   56 ++++++++++++++++-------------
 drivers/video/omap2/dss/manager.c         |   33 ++++++++---------
 drivers/video/omap2/dss/overlay.c         |   24 +++++-------
 5 files changed, 60 insertions(+), 87 deletions(-)

static void _dispc_setup_global_alpha(enum omap_plane plane, u8 global_alpha) {

drivers/video/omap2/dss/dispc.c +4 -4

-
-       BUG_ON(plane == OMAP_DSS_VIDEO1);
-
-       if (cpu_is_omap24xx())
+       if (!dss_has_feature(FEAT_GLOBAL_ALPHA))
                return;
 
+       BUG_ON(!dss_has_feature(FEAT_GLOBAL_ALPHA_VID1) &&
+                       plane == OMAP_DSS_VIDEO1);
+
        if (plane == OMAP_DSS_GFX)
                REG_FLD_MOD(DISPC_GLOBAL_ALPHA, global_alpha, 7, 0);
        else if (plane == OMAP_DSS_VIDEO2)

Quoted 17 lines · ext Archit Taneja

Calls init functions of dss_features during dss_probe, and the following features are made omapxxxx independent:
- number of managers, overlays
- supported color modes for each overlay
- supported displays for each manager
- global aplha, and restriction of global alpha for video1 pipeline
- The register field ranges : FIRHINC, FIRVINC, FIFOHIGHTHRESHOLD FIFOLOWTHRESHOLD and FIFOSIZE

Signed-off-by Archit Taneja <[email protected]>

---
 arch/arm/plat-omap/include/plat/display.h |   31 ----------------
 drivers/video/omap2/dss/core.c            |    3 ++
 drivers/video/omap2/dss/dispc.c           |   56
 ++++++++++++++++------------- drivers/video/omap2/dss/manager.c         |  
 33 ++++++++--------- drivers/video/omap2/dss/overlay.c         |   24

+++++------- 5 files changed, 60 insertions(+), 87 deletions(-)

snip

Quoted 14 lines

static void _dispc_setup_global_alpha(enum omap_plane plane, u8
global_alpha) { -

drivers/video/omap2/dss/dispc.c +4 -3

-       BUG_ON(plane == OMAP_DSS_VIDEO1);
-
-       if (cpu_is_omap24xx())
+       if (!dss_has_feature(FEAT_GLOBAL_ALPHA))
                return;
 
+       BUG_ON(!dss_has_feature(FEAT_GLOBAL_ALPHA_VID1) &&
+                       plane == OMAP_DSS_VIDEO1);
+
        if (plane == OMAP_DSS_GFX)
                REG_FLD_MOD(DISPC_GLOBAL_ALPHA, global_alpha, 7, 0);
        else if (plane == OMAP_DSS_VIDEO2) @@ -949,17 +950,14 @@

Quoted 2 lines

static void dispc_read_plane_fifo_sizes(void)

DISPC_VID_FIFO_SIZE_STATUS(1) };

Quoted 3 lines

        u32 size;
        int plane;

+ u8 size1, size2;

You have a bit inconsistent naming with these. The function
is defined as accepting start and end, here you use size1 and size2, below you have foo1 and foo2.

Size is not a good name, as it's not size at all. Perhaps foo_start and foo_end (or just start and end if there's only one feat being used)? Or foo_msb and foo_lsb (as in most/least significant bit)?

Otherwise looks good.

Tomi

Quoted 17 lines · ext Archit Taneja

Calls init functions of dss_features during dss_probe, and the following features are made omapxxxx independent:
- number of managers, overlays
- supported color modes for each overlay
- supported displays for each manager
- global aplha, and restriction of global alpha for video1 pipeline
- The register field ranges : FIRHINC, FIRVINC, FIFOHIGHTHRESHOLD FIFOLOWTHRESHOLD and FIFOSIZE

Signed-off-by Archit Taneja <[email protected]>

---
 arch/arm/plat-omap/include/plat/display.h |   31 ----------------
 drivers/video/omap2/dss/core.c            |    3 ++
 drivers/video/omap2/dss/dispc.c           |   56
 ++++++++++++++++------------- drivers/video/omap2/dss/manager.c         |  
 33 ++++++++--------- drivers/video/omap2/dss/overlay.c         |   24

+++++------- 5 files changed, 60 insertions(+), 87 deletions(-)

snip

Quoted 14 lines

static void _dispc_setup_global_alpha(enum omap_plane plane, u8
global_alpha) { -

drivers/video/omap2/dss/dispc.c +4 -3

-       BUG_ON(plane == OMAP_DSS_VIDEO1);
-
-       if (cpu_is_omap24xx())
+       if (!dss_has_feature(FEAT_GLOBAL_ALPHA))
                return;
 
+       BUG_ON(!dss_has_feature(FEAT_GLOBAL_ALPHA_VID1) &&
+                       plane == OMAP_DSS_VIDEO1);
+
        if (plane == OMAP_DSS_GFX)
                REG_FLD_MOD(DISPC_GLOBAL_ALPHA, global_alpha, 7, 0);
        else if (plane == OMAP_DSS_VIDEO2) @@ -949,17 +950,14 @@

Quoted 2 lines

static void dispc_read_plane_fifo_sizes(void)

DISPC_VID_FIFO_SIZE_STATUS(1) };

Quoted 3 lines

        u32 size;
        int plane;

+ u8 size1, size2;

You have a bit inconsistent naming with these. The function
is defined as accepting start and end, here you use size1 and size2, below you have foo1 and foo2.

Size is not a good name, as it's not size at all. Perhaps foo_start and foo_end (or just start and end if there's only one feat being used)? Or foo_msb and foo_lsb (as in most/least significant bit)?

Otherwise looks good.

Tomi

Hi,

I was reworking some patches, I saw 2 functions in manager.c:

dss_mgr_wait_for_go() and dss_mgr_wait_for_go_ovl() both define the var "enum omap_channel channel;" but don't use it.

Is there any reason this is done, or is it just stray code?