Merge branch 'drm-sti-next-2014-12-11' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next

This series of patches fix various issues in STI drm driver.
Now HDMI i2c adapter could be selected in device tree
and plug detection doesn't use gpio anymore.
I also had fix some signal timing problems after testing the driver
on more hardware.
The remaining patches attemps to simplify the code and prepare
the next evolutions like DVO and auxiliary CRTC support

* 'drm-sti-next-2014-12-11' of http://git.linaro.org/people/benjamin.gaignard/kernel:
  drm: sti: correctly cleanup CRTC and planes
  drm: sti: add HQVDP plane
  drm: sti: add cursor plane
  drm: sti: enable auxiliary CRTC
  drm: sti: fix delay in VTG programming
  drm: sti: prepare sti_tvout to support auxiliary crtc
  drm: sti: use drm_crtc_vblank_{on/off} instead of drm_vblank_{on/off}
  drm: sti: fix hdmi avi infoframe
  drm: sti: remove event lock while disabling vblank
  drm: sti: simplify gdp code
  drm: sti: clear all mixer control
  drm: sti: remove gpio for HDMI hot plug detection
  drm: sti: allow to change hdmi ddc i2c adapter

21 files changed, 1972 insertions, 133 deletions

diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig
index ae8850f3e63b..d6d6b705b8c1 100644
--- a/drivers/gpu/drm/sti/Kconfig
+++ b/drivers/gpu/drm/sti/Kconfig
@@ -5,6 +5,7 @@ config DRM_STI
         select DRM_KMS_HELPER
         select DRM_GEM_CMA_HELPER
         select DRM_KMS_CMA_HELPER
+        select FW_LOADER_USER_HELPER_FALLBACK
         help
           Choose this option to enable DRM on STM stiH41x chipset
 
diff --git a/drivers/gpu/drm/sti/Makefile b/drivers/gpu/drm/sti/Makefile
index 04ac2ceef27f..6ba9d27c1b90 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
@@ -18,4 +19,5 @@ obj-$(CONFIG_DRM_STI) = \
         sti_hda.o \
         sti_tvout.o \
         sticompositor.o \
-        sti_drm_drv.o
\ No newline at end of file
+        sti_hqvdp.o \
+        sti_drm_drv.o
diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c
index 390d93e9a06c..c5cf4aea9694 100644
--- a/drivers/gpu/drm/sti/sti_compositor.c
+++ b/drivers/gpu/drm/sti/sti_compositor.c
@@ -24,14 +24,16 @@
  * stiH407 compositor properties
  */
 struct sti_compositor_data stih407_compositor_data = {
-        .nb_subdev = 6,
+        .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},
                         {STI_GPD_SUBDEV, (int)STI_GDP_3, 0x400},
                         {STI_VID_SUBDEV, (int)STI_VID_0, 0x700},
-                        {STI_MIXER_MAIN_SUBDEV, STI_MIXER_MAIN, 0xC00}
+                        {STI_MIXER_MAIN_SUBDEV, STI_MIXER_MAIN, 0xC00},
+                        {STI_MIXER_AUX_SUBDEV, STI_MIXER_AUX, 0xD00},
         },
 };
 
@@ -67,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;
@@ -102,33 +104,35 @@ static int sti_compositor_bind(struct device *dev, struct device *master,
                         enum sti_layer_type type = desc & STI_LAYER_TYPE_MASK;
                         enum drm_plane_type plane_type = DRM_PLANE_TYPE_OVERLAY;
 
-                        if (compo->mixer[crtc])
+                        if (crtc < compo->nb_mixers)
                                 plane_type = DRM_PLANE_TYPE_PRIMARY;
 
                         switch (type) {
                         case STI_CUR:
                                 cursor = sti_drm_plane_init(drm_dev,
                                                 compo->layer[i],
-                                                (1 << crtc) - 1,
-                                                DRM_PLANE_TYPE_CURSOR);
+                                                1, DRM_PLANE_TYPE_CURSOR);
                                 break;
                         case STI_GDP:
                         case STI_VID:
                                 primary = sti_drm_plane_init(drm_dev,
                                                 compo->layer[i],
-                                                (1 << crtc) - 1, plane_type);
+                                                (1 << compo->nb_mixers) - 1,
+                                                plane_type);
                                 plane++;
                                 break;
                         case STI_BCK:
+                        case STI_VDP:
                                 break;
                         }
 
                         /* The first planes are reserved for primary planes*/
-                        if (compo->mixer[crtc]) {
+                        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_compositor.h b/drivers/gpu/drm/sti/sti_compositor.h
index 3ea19db72e0f..019eb44c62cc 100644
--- a/drivers/gpu/drm/sti/sti_compositor.h
+++ b/drivers/gpu/drm/sti/sti_compositor.h
@@ -64,7 +64,6 @@ struct sti_compositor_data {
  * @layer: array of layers
  * @nb_mixers: number of mixers for this compositor
  * @nb_layers: number of layers (GDP,VID,...) for this compositor
- * @enable: true if compositor is enable else false
  * @vtg_vblank_nb: callback for VTG VSYNC notification
  */
 struct sti_compositor {
@@ -83,7 +82,6 @@ struct sti_compositor {
         struct sti_layer *layer[STI_MAX_LAYER];