Merge tag 'imx-drm-next-2015-01-09' of git://git.pengutronix.de/git/pza/linux into drm-next

imx-drm mode fixup support, imx-hdmi bridge conversion and imx-drm cleanup

- Implement mode_fixup for a DI vertical timing limitation
- Use generic DRM OF helpers in DRM core
- Convert imx-hdmi to dw_hdmi drm_bridge and add rockchip
  driver
- Add DC use counter to fix multi-display support
- Simplify handling of DI clock flags
- A few small fixes and cleanup

* tag 'imx-drm-next-2015-01-09' of git://git.pengutronix.de/git/pza/linux: (26 commits)
  imx-drm: core: handling of DI clock flags to ipu_crtc_mode_set()
  gpu: ipu-di: Switch to DIV_ROUND_CLOSEST for DI clock divider calc
  gpu: ipu-v3: Use videomode in struct ipu_di_signal_cfg
  imx-drm: encoder prepare/mode_set must use adjusted mode
  imx-drm: ipuv3-crtc: Implement mode_fixup
  drm_modes: add drm_display_mode_to_videomode
  gpu: ipu-di: remove some non-functional code
  gpu: ipu-di: Add ipu_di_adjust_videomode()
  drm: rockchip: export functions needed by rockchip dw_hdmi bridge driver
  drm: bridge/dw_hdmi: request interrupt only after initializing the mutes
  drm: bridge/dw_hdmi: add rockchip rk3288 support
  dt-bindings: Add documentation for rockchip dw hdmi
  drm: bridge/dw_hdmi: add function dw_hdmi_phy_enable_spare
  drm: bridge/dw_hdmi: clear i2cmphy_stat0 reg in hdmi_phy_wait_i2c_done
  drm: bridge/dw_hdmi: add mode_valid support
  drm: bridge/dw_hdmi: add support for multi-byte register width access
  dt-bindings: add document for dw_hdmi
  drm: imx: imx-hdmi: move imx-hdmi to bridge/dw_hdmi
  drm: imx: imx-hdmi: split phy configuration to platform driver
  drm: imx: imx-hdmi: convert imx-hdmi to drm_bridge mode
  ...

3 files changed, 68 insertions, 16 deletions

diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
new file mode 100644
index 000000000000..5a4f49005169
--- /dev/null
+++ b/include/drm/bridge/dw_hdmi.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __DW_HDMI__
+#define __DW_HDMI__
+
+#include <drm/drmP.h>
+
+enum {
+        DW_HDMI_RES_8,
+        DW_HDMI_RES_10,
+        DW_HDMI_RES_12,
+        DW_HDMI_RES_MAX,
+};
+
+enum dw_hdmi_devtype {
+        IMX6Q_HDMI,
+        IMX6DL_HDMI,
+        RK3288_HDMI,
+};
+
+struct dw_hdmi_mpll_config {
+        unsigned long mpixelclock;
+        struct {
+                u16 cpce;
+                u16 gmp;
+        } res[DW_HDMI_RES_MAX];
+};
+
+struct dw_hdmi_curr_ctrl {
+        unsigned long mpixelclock;
+        u16 curr[DW_HDMI_RES_MAX];
+};
+
+struct dw_hdmi_sym_term {
+        unsigned long mpixelclock;
+        u16 sym_ctr;    /*clock symbol and transmitter control*/
+        u16 term;       /*transmission termination value*/
+};
+
+struct dw_hdmi_plat_data {
+        enum dw_hdmi_devtype dev_type;
+        const struct dw_hdmi_mpll_config *mpll_cfg;
+        const struct dw_hdmi_curr_ctrl *cur_ctr;
+        const struct dw_hdmi_sym_term *sym_term;
+        enum drm_mode_status (*mode_valid)(struct drm_connector *connector,
+                                           struct drm_display_mode *mode);
+};
+
+void dw_hdmi_unbind(struct device *dev, struct device *master, void *data);
+int dw_hdmi_bind(struct device *dev, struct device *master,
+                 void *data, struct drm_encoder *encoder,
+                 struct resource *iores, int irq,
+                 const struct dw_hdmi_plat_data *plat_data);
+#endif /* __IMX_HDMI_H__ */
diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index b162ccd321f3..d92f6dd1fb11 100644
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -200,6 +200,8 @@ struct drm_display_mode *drm_gtf_mode_complex(struct drm_device *dev,
                                               int GTF_K, int GTF_2J);
 void drm_display_mode_from_videomode(const struct videomode *vm,
                                      struct drm_display_mode *dmode);
+void drm_display_mode_to_videomode(const struct drm_display_mode *dmode,
+                                   struct videomode *vm);
 int of_get_drm_display_mode(struct device_node *np,
                             struct drm_display_mode *dmode,
                             int index);
diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
index c74bf4a0520e..73390c120cad 100644
--- a/include/video/imx-ipu-v3.h
+++ b/include/video/imx-ipu-v3.h
@@ -17,6 +17,7 @@
 #include <linux/bitmap.h>
 #include <linux/fb.h>
 #include <media/v4l2-mediabus.h>
+#include <video/videomode.h>
 
 struct ipu_soc;
 
@@ -32,28 +33,15 @@ enum ipuv3_type {
  * Bitfield of Display Interface signal polarities.
  */
 struct ipu_di_signal_cfg {
-        unsigned datamask_en:1;
-        unsigned interlaced:1;
-        unsigned odd_field_first:1;
-        unsigned clksel_en:1;
-        unsigned clkidle_en:1;
         unsigned data_pol:1;    /* true = inverted */
         unsigned clk_pol:1;     /* true = rising edge */
         unsigned enable_pol:1;
-        unsigned Hsync_pol:1;   /* true = active high */
-        unsigned Vsync_pol:1;
 
-        u16 width;
-        u16 height;
+        struct videomode mode;
+
         u32 pixel_fmt;
-        u16 h_start_width;
-        u16 h_sync_width;
-        u16 h_end_width;
-        u16 v_start_width;
-        u16 v_sync_width;
-        u16 v_end_width;
         u32 v_to_h_sync;
-        unsigned long pixelclock;
+
 #define IPU_DI_CLKMODE_SYNC     (1 << 0)
 #define IPU_DI_CLKMODE_EXT      (1 << 1)
         unsigned long clkflags;
@@ -236,6 +224,7 @@ void ipu_di_put(struct ipu_di *);
 int ipu_di_disable(struct ipu_di *);
 int ipu_di_enable(struct ipu_di *);
 int ipu_di_get_num(struct ipu_di *);
+int ipu_di_adjust_videomode(struct ipu_di *di, struct videomode *mode);
 int ipu_di_init_sync_panel(struct ipu_di *, struct ipu_di_signal_cfg *sig);
 
 /*