7 files changed, 273 insertions, 3 deletions

diff --git a/drivers/gpu/drm/sti/Makefile b/drivers/gpu/drm/sti/Makefile
index 04ac2ceef27f..d6128f7fa12c 100644
--- a/drivers/gpu/drm/sti/Makefile
+++ b/drivers/gpu/drm/sti/Makefile
@@ -3,6 +3,7 @@ sticompositor-y := \
         sti_mixer.o \
         sti_gdp.o \
         sti_vid.o \
+        sti_cursor.o \
         sti_compositor.o \
         sti_drm_crtc.o \
         sti_drm_plane.o
diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c
index bbf8462879ce..b9415b3f3720 100644
--- a/drivers/gpu/drm/sti/sti_compositor.c
+++ b/drivers/gpu/drm/sti/sti_compositor.c
@@ -24,8 +24,9 @@
  * stiH407 compositor properties
  */
 struct sti_compositor_data stih407_compositor_data = {
-        .nb_subdev = 7,
+        .nb_subdev = 8,
         .subdev_desc = {
+                        {STI_CURSOR_SUBDEV, (int)STI_CURSOR, 0x000},
                         {STI_GPD_SUBDEV, (int)STI_GDP_0, 0x100},
                         {STI_GPD_SUBDEV, (int)STI_GDP_1, 0x200},
                         {STI_GPD_SUBDEV, (int)STI_GDP_2, 0x300},
@@ -68,11 +69,11 @@ static int sti_compositor_init_subdev(struct sti_compositor *compo,
                         break;
                 case STI_GPD_SUBDEV:
                 case STI_VID_SUBDEV:
+                case STI_CURSOR_SUBDEV:
                         compo->layer[layer_id++] =
                             sti_layer_create(compo->dev, desc[i].id,
                                              compo->regs + desc[i].offset);
                         break;
-                        /* case STI_CURSOR_SUBDEV : TODO */
                 default:
                         DRM_ERROR("Unknow subdev compoment type\n");
                         return 1;
@@ -125,11 +126,12 @@ static int sti_compositor_bind(struct device *dev, struct device *master,
                         }
 
                         /* The first planes are reserved for primary planes*/
-                        if (crtc < compo->nb_mixers) {
+                        if (crtc < compo->nb_mixers && primary) {
                                 sti_drm_crtc_init(drm_dev, compo->mixer[crtc],
                                                 primary, cursor);
                                 crtc++;
                                 cursor = NULL;
+                                primary = NULL;
                         }
                 }
         }
diff --git a/drivers/gpu/drm/sti/sti_cursor.c b/drivers/gpu/drm/sti/sti_cursor.c
new file mode 100644
index 000000000000..010eaee60bf7
--- /dev/null
+++ b/drivers/gpu/drm/sti/sti_cursor.c
@@ -0,0 +1,242 @@
+/*
+ * Copyright (C) STMicroelectronics SA 2014
+ * Authors: Vincent Abriou <vincent.abriou@st.com>
+ *          Fabien Dessenne <fabien.dessenne@st.com>
+ *          for STMicroelectronics.
+ * License terms:  GNU General Public License (GPL), version 2
+ */
+#include <drm/drmP.h>
+
+#include "sti_cursor.h"
+#include "sti_layer.h"
+#include "sti_vtg.h"
+
+/* Registers */
+#define CUR_CTL             0x00
+#define CUR_VPO             0x0C
+#define CUR_PML             0x14
+#define CUR_PMP             0x18
+#define CUR_SIZE            0x1C
+#define CUR_CML             0x20
+#define CUR_AWS             0x28
+#define CUR_AWE             0x2C
+
+#define CUR_CTL_CLUT_UPDATE BIT(1)
+
+#define STI_CURS_MIN_SIZE   1
+#define STI_CURS_MAX_SIZE   128
+
+/*
+ * pixmap dma buffer stucture
+ *
+ * @paddr:  physical address
+ * @size:   buffer size
+ * @base:   virtual address
+ */
+struct dma_pixmap {
+        dma_addr_t paddr;
+        size_t size;
+        void *base;
+};
+
+/**
+ * STI Cursor structure
+ *
+ * @layer:      layer structure
+ * @width:      cursor width
+ * @height:     cursor height
+ * @clut:       color look up table
+ * @clut_paddr: color look up table physical address
+ * @pixmap:     pixmap dma buffer (clut8-format cursor)
+ */
+struct sti_cursor {
+        struct sti_layer layer;
+        unsigned int width;
+        unsigned int height;
+        unsigned short *clut;
+        dma_addr_t clut_paddr;
+        struct dma_pixmap pixmap;
+};
+
+static const uint32_t cursor_supported_formats[] = {
+        DRM_FORMAT_ARGB8888,
+};
+
+#define to_sti_cursor(x) container_of(x, struct sti_cursor, layer)
+
+static const uint32_t *sti_cursor_get_formats(struct sti_layer *layer)
+{
+        return cursor_supported_formats;
+}
+
+static unsigned int sti_cursor_get_nb_formats(struct sti_layer *layer)
+{
+        return ARRAY_SIZE(cursor_supported_formats);
+}
+
+static void sti_cursor_argb8888_to_clut8(struct sti_layer *layer)
+{
+        struct sti_cursor *cursor = to_sti_cursor(layer);
+        u32 *src = layer->vaddr;
+        u8  *dst = cursor->pixmap.base;
+        unsigned int i, j;
+        u32 a, r, g, b;
+
+        for (i = 0; i < cursor->height; i++) {
+                for (j = 0; j < cursor->width; j++) {
+                        /* Pick the 2 higher bits of each component */
+                        a = (*src >> 30) & 3;
+                        r = (*src >> 22) & 3;
+                        g = (*src >> 14) & 3;
+                        b = (*src >> 6) & 3;
+                        *dst = a << 6 | r << 4 | g << 2 | b;
+                        src++;
+                        dst++;
+                }
+        }
+}
+
+static int sti_cursor_prepare_layer(struct sti_layer *layer, bool first_prepare)
+{
+        struct sti_cursor *cursor = to_sti_cursor(layer);
+        struct drm_display_mode *mode = layer->mode;
+        u32 y, x;
+        u32 val;
+
+        DRM_DEBUG_DRIVER("\n");
+
+        dev_dbg(layer->dev, "%s %s\n", __func__, sti_layer_to_str(layer));
+
+        if (layer->src_w < STI_CURS_MIN_SIZE ||
+            layer->src_h < STI_CURS_MIN_SIZE ||
+            layer->src_w > STI_CURS_MAX_SIZE ||
+            layer->src_h > STI_CURS_MAX_SIZE) {
+                DRM_ERROR("Invalid cursor size (%dx%d)\n",
+                                layer->src_w, layer->src_h);
+                return -EINVAL;
+        }
+
+        /* If the cursor size has changed, re-allocated the pixmap */
+        if (!cursor->p