Merge tag 'fbdev-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev

Pull fbdev update from Jean-Christophe PLAGNIOL-VILLARD:
 "Various fbdev changes for 3.11
   - xilinxfb updates
   - Small cleanups and fixes to multiple drivers
   - OMAP display subsystem bug updates
   - imxfb dt support"

* tag 'fbdev-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev: (95 commits)
  video: imxfb: Add DT support
  video: i740fb: Make i740fb_init static
  fb: make fp_get_options name argument const
  video: mmp: fix graphics/video layer enable/mask swap issue
  video: mmp: fix memcpy wrong size for mmp_addr issue
  radeon: use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
  aty128fb: use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
  video: of_display_timing.h: Declare 'display_timing'
  fbdev: bfin-lq035q1-fb: Use dev_pm_ops
  fbmem: return -EFAULT on copy_to_user() failure
  OMAPDSS: DPI: Fix wrong pixel clock limit
  video: replace strict_strtoul() with kstrtoul()
  uvesafb: Correct/simplify warning message
  fb: fix atyfb unused data warnings
  fb: fix atyfb build warning
  video: imxfb: Make local symbols static
  video: udlfb: Make local symbol static
  video: udlfb: Use NULL instead of 0
  video: smscufx: Use NULL instead of 0
  video: remove unnecessary platform_set_drvdata()
  ...

1 files changed, 39 insertions, 7 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 79b200aee18a..4cec678dba94 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -40,7 +40,7 @@ struct omap_crtc {
          * mgr->id.)  Eventually this will be replaced w/ something
          * more common-panel-framework-y
          */
-        struct omap_overlay_manager mgr;
+        struct omap_overlay_manager *mgr;
 
         struct omap_video_timings timings;
         bool enabled;
@@ -90,7 +90,32 @@ uint32_t pipe2vbl(struct drm_crtc *crtc)
  * job of sequencing the setup of the video pipe in the proper order
  */
 
+/* ovl-mgr-id -> crtc */
+static struct omap_crtc *omap_crtcs[8];
+
 /* we can probably ignore these until we support command-mode panels: */
+static int omap_crtc_connect(struct omap_overlay_manager *mgr,
+                struct omap_dss_device *dst)
+{
+        if (mgr->output)
+                return -EINVAL;
+
+        if ((mgr->supported_outputs & dst->id) == 0)
+                return -EINVAL;
+
+        dst->manager = mgr;
+        mgr->output = dst;
+
+        return 0;
+}
+
+static void omap_crtc_disconnect(struct omap_overlay_manager *mgr,
+                struct omap_dss_device *dst)
+{
+        mgr->output->manager = NULL;
+        mgr->output = NULL;
+}
+
 static void omap_crtc_start_update(struct omap_overlay_manager *mgr)
 {
 }
@@ -107,7 +132,7 @@ static void omap_crtc_disable(struct omap_overlay_manager *mgr)
 static void omap_crtc_set_timings(struct omap_overlay_manager *mgr,
                 const struct omap_video_timings *timings)
 {
-        struct omap_crtc *omap_crtc = container_of(mgr, struct omap_crtc, mgr);
+        struct omap_crtc *omap_crtc = omap_crtcs[mgr->id];
         DBG("%s", omap_crtc->name);
         omap_crtc->timings = *timings;
         omap_crtc->full_update = true;
@@ -116,7 +141,7 @@ static void omap_crtc_set_timings(struct omap_overlay_manager *mgr,
 static void omap_crtc_set_lcd_config(struct omap_overlay_manager *mgr,
                 const struct dss_lcd_mgr_config *config)
 {
-        struct omap_crtc *omap_crtc = container_of(mgr, struct omap_crtc, mgr);
+        struct omap_crtc *omap_crtc = omap_crtcs[mgr->id];
         DBG("%s", omap_crtc->name);
         dispc_mgr_set_lcd_config(omap_crtc->channel, config);
 }
@@ -135,6 +160,8 @@ static void omap_crtc_unregister_framedone_handler(
 }
 
 static const struct dss_mgr_ops mgr_ops = {
+                .connect = omap_crtc_connect,
+                .disconnect = omap_crtc_disconnect,
                 .start_update = omap_crtc_start_update,
                 .enable = omap_crtc_enable,
                 .disable = omap_crtc_disable,
@@ -569,7 +596,7 @@ static void omap_crtc_pre_apply(struct omap_drm_apply *apply)
         } else {
                 if (encoder) {
                         omap_encoder_set_enabled(encoder, false);
-                        omap_encoder_update(encoder, &omap_crtc->mgr,
+                        omap_encoder_update(encoder, omap_crtc->mgr,
                                         &omap_crtc->timings);
                         omap_encoder_set_enabled(encoder, true);
                         omap_crtc->full_update = false;
@@ -595,6 +622,11 @@ static const char *channel_names[] = {
                 [OMAP_DSS_CHANNEL_LCD2] = "lcd2",
 };
 
+void omap_crtc_pre_init(void)
+{
+        dss_install_mgr_ops(&mgr_ops);
+}
+
 /* initialize crtc */
 struct drm_crtc *omap_crtc_init(struct drm_device *dev,
                 struct drm_plane *plane, enum omap_channel channel, int id)
@@ -635,9 +667,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
         omap_irq_register(dev, &omap_crtc->error_irq);
 
         /* temporary: */
-        omap_crtc->mgr.id = channel;
-
-        dss_install_mgr_ops(&mgr_ops);
+        omap_crtc->mgr = omap_dss_get_overlay_manager(channel);
 
         /* TODO: fix hard-coded setup.. add properties! */
         info = &omap_crtc->info;
@@ -651,6 +681,8 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
 
         omap_plane_install_properties(omap_crtc->plane, &crtc->base);
 
+        omap_crtcs[channel] = omap_crtc;
+
         return crtc;
 
 fail: