Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6

Pull fbdev updates for 3.4 from Florian Tobias Schandinat:
 - drivers for Samsung Exynos MIPI DSI and display port
 - i740fb to support those old Intel chips
 - large updates to OMAP, viafb and sh_mobile_lcdcfb
 - some updates to s3c-fb and udlfb, few patches to others

Fix up conflicts in drivers/video/udlfb.c due to Key Sievers' fix making
it in twice.

* tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6: (156 commits)
  Revert "video:uvesafb: Fix oops that uvesafb try to execute NX-protected page"
  OMAPDSS: register dss drivers in module init
  video: pxafb: add clk_prepare/clk_unprepare calls
  fbdev: bfin_adv7393fb: Drop needless include
  fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info
  fbdev: remove dependency of FB_SH_MOBILE_MERAM from FB_SH_MOBILE_LCDC
  Revert "MAINTAINERS: add entry for exynos mipi display drivers"
  fbdev: da8xx: add support for SP10Q010 display
  fbdev: da8xx:: fix reporting of the display timing info
  drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
  OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update
  fbdev: sh_mobile_meram: Implement system suspend/resume
  fbdev: sh_mobile_meram: Remove unneeded sanity checks
  fbdev: sh_mobile_meram: Don't perform update in register operation
  arm: mach-shmobile: Constify sh_mobile_meram_cfg structures
  fbdev: sh_mobile_lcdc: Don't store copy of platform data
  fbdev: sh_mobile_meram: Remove unused sh_mobile_meram_icb_cfg fields
  arm: mach-shmobile: Don't set MERAM ICB numbers in platform data
  fbdev: sh_mobile_meram: Allocate ICBs automatically
  fbdev: sh_mobile_meram: Use genalloc to manage MERAM allocation
  ...

1 files changed, 69 insertions, 15 deletions

diff --git a/drivers/video/sh_mobile_lcdcfb.h b/drivers/video/sh_mobile_lcdcfb.h
index a58a0f38848b..da1c26e78a57 100644
--- a/drivers/video/sh_mobile_lcdcfb.h
+++ b/drivers/video/sh_mobile_lcdcfb.h
@@ -14,9 +14,35 @@ enum { LDDCKPAT1R, LDDCKPAT2R, LDMT1R, LDMT2R, LDMT3R, LDDFR, LDSM1R,
 
 #define PALETTE_NR 16
 
-struct sh_mobile_lcdc_priv;
-struct fb_info;
 struct backlight_device;
+struct fb_info;
+struct module;
+struct sh_mobile_lcdc_chan;
+struct sh_mobile_lcdc_entity;
+struct sh_mobile_lcdc_format_info;
+struct sh_mobile_lcdc_priv;
+
+#define SH_MOBILE_LCDC_DISPLAY_DISCONNECTED     0
+#define SH_MOBILE_LCDC_DISPLAY_CONNECTED        1
+
+struct sh_mobile_lcdc_entity_ops {
+        /* Display */
+        int (*display_on)(struct sh_mobile_lcdc_entity *entity);
+        void (*display_off)(struct sh_mobile_lcdc_entity *entity);
+};
+
+enum sh_mobile_lcdc_entity_event {
+        SH_MOBILE_LCDC_EVENT_DISPLAY_CONNECT,
+        SH_MOBILE_LCDC_EVENT_DISPLAY_DISCONNECT,
+        SH_MOBILE_LCDC_EVENT_DISPLAY_MODE,
+};
+
+struct sh_mobile_lcdc_entity {
+        struct module *owner;
+        const struct sh_mobile_lcdc_entity_ops *ops;
+        struct sh_mobile_lcdc_chan *lcdc;
+        struct fb_videomode def_mode;
+};
 
 /*
  * struct sh_mobile_lcdc_chan - LCDC display channel
@@ -27,29 +53,57 @@ struct backlight_device;
  */
 struct sh_mobile_lcdc_chan {
         struct sh_mobile_lcdc_priv *lcdc;
+        struct sh_mobile_lcdc_entity *tx_dev;
+        const struct sh_mobile_lcdc_chan_cfg *cfg;
+
         unsigned long *reg_offs;
         unsigned long ldmt1r_value;
         unsigned long enabled; /* ME and SE in LDCNT2R */
-        struct sh_mobile_lcdc_chan_cfg cfg;
-        u32 pseudo_palette[PALETTE_NR];
-        struct fb_info *info;
-        struct backlight_device *bl;
+        void *meram;
+
+        struct mutex open_lock;         /* protects the use counter */
+        int use_count;
+
+        void *fb_mem;
+        unsigned long fb_size;
+
         dma_addr_t dma_handle;
-        struct fb_deferred_io defio;
-        struct scatterlist *sglist;
-        unsigned long frame_end;
         unsigned long pan_offset;
+
+        unsigned long frame_end;
         wait_queue_head_t frame_end_wait;
         struct completion vsync_completion;
-        struct fb_var_screeninfo display_var;
-        int use_count;
-        int blank_status;
-        struct mutex open_lock;         /* protects the use counter */
-        int meram_enabled;
+
+        const struct sh_mobile_lcdc_format_info *format;
+        u32 colorspace;
+        unsigned int xres;
+        unsigned int xres_virtual;
+        unsigned int yres;
+        unsigned int yres_virtual;
+        unsigned int pitch;
 
         unsigned long base_addr_y;
         unsigned long base_addr_c;
-        unsigned int pitch;
+
+        int (*notify)(struct sh_mobile_lcdc_chan *ch,
+                      enum sh_mobile_lcdc_entity_event event,
+                      const struct fb_videomode *mode,
+                      const struct fb_monspecs *monspec);
+
+        /* Backlight */
+        struct backlight_device *bl;
+
+        /* FB */
+        struct fb_info *info;
+        u32 pseudo_palette[PALETTE_NR];
+        struct {
+                unsigned int width;
+                unsigned int height;
+                struct fb_videomode mode;
+        } display;
+        struct fb_deferred_io defio;
+        struct scatterlist *sglist;
+        int blank_status;
 };
 
 #endif