ENGR00302472-5 video: mxc disp: Let encoder know fbi when enable/disable

This patch adds framebuffer info structure to the mxc display driver
enable/disable callback parameters so that the encoder drivers may
know the framebuffer information.  In this way, the encoder drivers
which may deal with more than one framebuffer are able to figure out
the one it is handling.  A real example is the LDB encoder, which may
deal with two standalone framebuffers at most.

Signed-off-by: Liu Ying <Ying.Liu@freescale.com>

4 files changed, 19 insertions, 8 deletions

diff --git a/drivers/video/mxc/mipi_dsi.c b/drivers/video/mxc/mipi_dsi.c
index 53741c31e711..ca1b53f61b59 100644
--- a/drivers/video/mxc/mipi_dsi.c
+++ b/drivers/video/mxc/mipi_dsi.c
@@ -622,7 +622,8 @@ static int mipi_dsi_lcd_init(struct mipi_dsi_info *mipi_dsi,
         return 0;
 }
 
-int mipi_dsi_enable(struct mxc_dispdrv_handle *disp)
+static int mipi_dsi_enable(struct mxc_dispdrv_handle *disp,
+                           struct fb_info *fbi)
 {
         int err;
         struct mipi_dsi_info *mipi_dsi = mxc_dispdrv_getdata(disp);
@@ -652,6 +653,14 @@ int mipi_dsi_enable(struct mxc_dispdrv_handle *disp)
         return 0;
 }
 
+static void mipi_dsi_disable(struct mxc_dispdrv_handle *disp,
+                            struct fb_info *fbi)
+{
+        struct mipi_dsi_info *mipi_dsi = mxc_dispdrv_getdata(disp);
+
+        mipi_dsi_power_off(mipi_dsi->disp_mipi);
+}
+
 static int mipi_dsi_disp_init(struct mxc_dispdrv_handle *disp,
         struct mxc_dispdrv_setting *setting)
 {
@@ -696,7 +705,7 @@ static struct mxc_dispdrv_driver mipi_dsi_drv = {
         .init   = mipi_dsi_disp_init,
         .deinit = mipi_dsi_disp_deinit,
         .enable = mipi_dsi_enable,
-        .disable = mipi_dsi_power_off,
+        .disable = mipi_dsi_disable,
 };
 
 static int imx6q_mipi_dsi_get_mux(int dev_id, int disp_id)
diff --git a/drivers/video/mxc/mxc_dispdrv.h b/drivers/video/mxc/mxc_dispdrv.h
index c2ee2ca0f01e..3be09353911b 100644
--- a/drivers/video/mxc/mxc_dispdrv.h
+++ b/drivers/video/mxc/mxc_dispdrv.h
@@ -37,9 +37,9 @@ struct mxc_dispdrv_driver {
         int (*post_init) (struct mxc_dispdrv_handle *, int dev_id, int disp_id);
         void (*deinit) (struct mxc_dispdrv_handle *);
         /* display driver enable function for extension */
-        int (*enable) (struct mxc_dispdrv_handle *);
+        int (*enable) (struct mxc_dispdrv_handle *, struct fb_info *);
         /* display driver disable function, called at early part of fb_blank */
-        void (*disable) (struct mxc_dispdrv_handle *);
+        void (*disable) (struct mxc_dispdrv_handle *, struct fb_info *);
         /* display driver setup function, called at early part of fb_set_par */
         int (*setup) (struct mxc_dispdrv_handle *, struct fb_info *fbi);
 };
diff --git a/drivers/video/mxc/mxc_hdmi.c b/drivers/video/mxc/mxc_hdmi.c
index 2c072bdacda8..fa3ceda03556 100644
--- a/drivers/video/mxc/mxc_hdmi.c
+++ b/drivers/video/mxc/mxc_hdmi.c
@@ -1953,14 +1953,16 @@ static void mxc_hdmi_cable_connected(struct mxc_hdmi *hdmi)
         dev_dbg(&hdmi->pdev->dev, "%s exit\n", __func__);
 }
 
-static int mxc_hdmi_power_on(struct mxc_dispdrv_handle *disp)
+static int mxc_hdmi_power_on(struct mxc_dispdrv_handle *disp,
+                             struct fb_info *fbi)
 {
         struct mxc_hdmi *hdmi = mxc_dispdrv_getdata(disp);
         mxc_hdmi_phy_init(hdmi);
         return 0;
 }
 
-static void mxc_hdmi_power_off(struct mxc_dispdrv_handle *disp)
+static void mxc_hdmi_power_off(struct mxc_dispdrv_handle *disp,
+                               struct fb_info *fbi)
 {
         struct mxc_hdmi *hdmi = mxc_dispdrv_getdata(disp);
         mxc_hdmi_phy_disable(hdmi);
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c
index 963a56a21bd4..b197be4ef878 100644
--- a/drivers/video/mxc/mxc_ipuv3_fb.c
+++ b/drivers/video/mxc/mxc_ipuv3_fb.c
@@ -655,7 +655,7 @@ static int mxcfb_set_par(struct fb_info *fbi)
                 ipu_enable_channel(mxc_fbi_fg->ipu, mxc_fbi_fg->ipu_ch);
 
         if (mxc_fbi->dispdrv && mxc_fbi->dispdrv->drv->enable) {
-                retval = mxc_fbi->dispdrv->drv->enable(mxc_fbi->dispdrv);
+                retval = mxc_fbi->dispdrv->drv->enable(mxc_fbi->dispdrv, fbi);
                 if (retval < 0) {
                         dev_err(fbi->device, "enable error, dispdrv:%s.\n",
                                         mxc_fbi->dispdrv->drv->name);
@@ -1380,7 +1380,7 @@ static int mxcfb_blank(int blank, struct fb_info *info)
         case FB_BLANK_HSYNC_SUSPEND:
         case FB_BLANK_NORMAL:
                 if (mxc_fbi->dispdrv && mxc_fbi->dispdrv->drv->disable)
-                        mxc_fbi->dispdrv->drv->disable(mxc_fbi->dispdrv);
+                        mxc_fbi->dispdrv->drv->disable(mxc_fbi->dispdrv, info);
                 ipu_disable_channel(mxc_fbi->ipu, mxc_fbi->ipu_ch, true);
                 if (mxc_fbi->ipu_di >= 0)
                         ipu_uninit_sync_panel(mxc_fbi->ipu, mxc_fbi->ipu_di);