Merge tag 'of_videomode_helper' of git://git.pengutronix.de/git/str/linux into drm-next

videomode helpers for of + devicetree stuff, required for new kms drivers

(not the fbdev maintainer).

* tag 'of_videomode_helper' of git://git.pengutronix.de/git/str/linux:
  drm_modes: add of_videomode helpers
  drm_modes: add videomode helpers
  fbmon: add of_videomode helpers
  fbmon: add videomode helpers
  video: add of helper for display timings/videomode
  video: add display_timing and videomode
  viafb: rename display_timing to via_display_timing

6 files changed, 227 insertions, 0 deletions

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index e74731c1a912..3aaa50d64451 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -85,6 +85,9 @@ struct module;
 struct drm_file;
 struct drm_device;
 
+struct device_node;
+struct videomode;
+
 #include <drm/drm_os_linux.h>
 #include <drm/drm_hashtab.h>
 #include <drm/drm_mm.h>
@@ -1469,6 +1472,12 @@ extern struct drm_display_mode *
 drm_mode_create_from_cmdline_mode(struct drm_device *dev,
                                   struct drm_cmdline_mode *cmd);
 
+extern int drm_display_mode_from_videomode(const struct videomode *vm,
+                                           struct drm_display_mode *dmode);
+extern int of_get_drm_display_mode(struct device_node *np,
+                                   struct drm_display_mode *dmode,
+                                   int index);
+
 /* Modesetting support */
 extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);
 extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
diff --git a/include/linux/fb.h b/include/linux/fb.h
index c7a95714b1fe..58b98606ac26 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -19,6 +19,8 @@ struct vm_area_struct;
 struct fb_info;
 struct device;
 struct file;
+struct videomode;
+struct device_node;
 
 /* Definitions below are used in the parsed monitor specs */
 #define FB_DPMS_ACTIVE_OFF      1
@@ -714,6 +716,12 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb);
 extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb);
 extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter);
 
+extern int of_get_fb_videomode(struct device_node *np,
+                               struct fb_videomode *fb,
+                               int index);
+extern int fb_videomode_from_videomode(const struct videomode *vm,
+                                       struct fb_videomode *fbmode);
+
 /* drivers/video/modedb.c */
 #define VESA_MODEDB_SIZE 34
 extern void fb_var_to_videomode(struct fb_videomode *mode,
diff --git a/include/video/display_timing.h b/include/video/display_timing.h
new file mode 100644
index 000000000000..71e9a383a981
--- /dev/null
+++ b/include/video/display_timing.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>
+ *
+ * description of display timings
+ *
+ * This file is released under the GPLv2
+ */
+
+#ifndef __LINUX_DISPLAY_TIMING_H
+#define __LINUX_DISPLAY_TIMING_H
+
+#include <linux/bitops.h>
+#include <linux/types.h>
+
+/* VESA display monitor timing parameters */
+#define VESA_DMT_HSYNC_LOW              BIT(0)
+#define VESA_DMT_HSYNC_HIGH             BIT(1)
+#define VESA_DMT_VSYNC_LOW              BIT(2)
+#define VESA_DMT_VSYNC_HIGH             BIT(3)
+
+/* display specific flags */
+#define DISPLAY_FLAGS_DE_LOW            BIT(0)  /* data enable flag */
+#define DISPLAY_FLAGS_DE_HIGH           BIT(1)
+#define DISPLAY_FLAGS_PIXDATA_POSEDGE   BIT(2)  /* drive data on pos. edge */
+#define DISPLAY_FLAGS_PIXDATA_NEGEDGE   BIT(3)  /* drive data on neg. edge */
+#define DISPLAY_FLAGS_INTERLACED        BIT(4)
+#define DISPLAY_FLAGS_DOUBLESCAN        BIT(5)
+
+/*
+ * A single signal can be specified via a range of minimal and maximal values
+ * with a typical value, that lies somewhere inbetween.
+ */
+struct timing_entry {
+        u32 min;
+        u32 typ;
+        u32 max;
+};
+
+enum timing_entry_index {
+        TE_MIN = 0,
+        TE_TYP = 1,
+        TE_MAX = 2,
+};
+
+/*
+ * Single "mode" entry. This describes one set of signal timings a display can
+ * have in one setting. This struct can later be converted to struct videomode
+ * (see include/video/videomode.h). As each timing_entry can be defined as a
+ * range, one struct display_timing may become multiple struct videomodes.
+ *
+ * Example: hsync active high, vsync active low
+ *
+ *                                  Active Video
+ * Video  ______________________XXXXXXXXXXXXXXXXXXXXXX_____________________
+ *        |<- sync ->|<- back ->|<----- active ----->|<- front ->|<- sync..
+ *        |          |   porch  |                    |   porch   |
+ *
+ * HSync _|¯¯¯¯¯¯¯¯¯¯|___________________________________________|¯¯¯¯¯¯¯¯¯
+ *
+ * VSync ¯|__________|¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯|_________
+ */
+struct display_timing {
+        struct timing_entry pixelclock;
+
+        struct timing_entry hactive;            /* hor. active video */
+        struct timing_entry hfront_porch;       /* hor. front porch */
+        struct timing_entry hback_porch;        /* hor. back porch */
+        struct timing_entry hsync_len;          /* hor. sync len */
+
+        struct timing_entry vactive;            /* ver. active video */
+        struct timing_entry vfront_porch;       /* ver. front porch */
+        struct timing_entry vback_porch;        /* ver. back porch */
+        struct timing_entry vsync_len;          /* ver. sync len */
+
+        unsigned int dmt_flags;                 /* VESA DMT flags */
+        unsigned int data_flags;                /* video data flags */
+};
+
+/*
+ * This describes all timing settings a display provides.
+ * The native_mode is the default setting for this display.
+ * Drivers that can handle multiple videomodes should work with this struct and
+ * convert each entry to the desired end result.
+ */
+struct display_timings {
+        unsigned int num_timings;
+        unsigned int native_mode;
+
+        struct display_timing **timings;
+};
+
+/* get value specified by index from struct timing_entry */
+static inline u32 display_timing_get_value(const struct timing_entry *te,
+                                           enum timing_entry_index index)
+{
+        switch (index) {
+        case TE_MIN:
+                return te->min;
+                break;
+        case TE_TYP:
+                return te->typ;
+                break;
+        case TE_MAX:
+                return te->max;
+                break;
+        default:
+                return te->typ;
+        }
+}
+
+/* get one entry from struct display_timings */
+static inline struct display_timing *display_timings_get(const struct
+                                                         display_timings *disp,
+                                                         unsigned int index)
+{
+        if (disp->num_timings > index)
+                return disp->timings[index];
+        else
+                return NULL;
+}
+
+void display_timings_release(struct display_timings *disp);
+
+#endif
diff --git a/include/video/of_display_timing.h b/include/video/of_display_timing.h
new file mode 100644
index 000000000000..8016eb727cf3
--- /dev/null
+++ b/