ENGR00302472-3 video: mxc: Introduce CRTC concept

As the mxc display system is getting more and more complex, various
CRTCs(CRT controllers), such as IPUx DIy and LCDIFz, may drive
various encoders.  For example, imx6sx/imx6dl LCDIF may drive LDB
while imx6dl IPU0 DI0/1 may drive LDB as well.  This patch introduces
CRTC concept to the display framework so that the core logic could be
less IPU specific.

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

9 files changed, 142 insertions, 56 deletions

diff --git a/drivers/video/mxc/crtc.h b/drivers/video/mxc/crtc.h
new file mode 100644
index 000000000000..8bd1c1b95bd1
--- /dev/null
+++ b/drivers/video/mxc/crtc.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+#ifndef __CRTC__
+#define __CRTC__
+
+enum crtc {
+        CRTC_IPU_DI0,
+        CRTC_IPU_DI1,
+        CRTC_IPU1_DI0,
+        CRTC_IPU1_DI1,
+        CRTC_IPU2_DI0,
+        CRTC_IPU2_DI1,
+        CRTC_LCDIF,
+        CRTC_LCDIF1,
+        CRTC_LCDIF2,
+        CRTC_MAX,
+};
+
+struct ipu_di_crtc_map {
+        enum crtc crtc;
+        int ipu_id;
+        int ipu_di;
+};
+
+static const struct ipu_di_crtc_map ipu_di_crtc_maps[] = {
+        {CRTC_IPU1_DI0, 0 , 0}, {CRTC_IPU1_DI1, 0 , 1},
+        {CRTC_IPU2_DI0, 1 , 0}, {CRTC_IPU2_DI1, 1 , 1},
+};
+
+static inline int ipu_di_to_crtc(struct device *dev, int ipu_id,
+                                 int ipu_di, enum crtc *crtc)
+{
+        int i = 0;
+
+        for (; i < ARRAY_SIZE(ipu_di_crtc_maps); i++)
+                if (ipu_di_crtc_maps[i].ipu_id == ipu_id &&
+                    ipu_di_crtc_maps[i].ipu_di == ipu_di) {
+                        *crtc = ipu_di_crtc_maps[i].crtc;
+                        return 0;
+                }
+
+        dev_err(dev, "failed to get valid ipu di crtc "
+                     "ipu_id %d, ipu_di %d\n", ipu_id, ipu_di);
+        return -EINVAL;
+}
+
+#endif
diff --git a/drivers/video/mxc/ldb.c b/drivers/video/mxc/ldb.c
index 2c7d647cc89c..8e9f26011146 100644
--- a/drivers/video/mxc/ldb.c
+++ b/drivers/video/mxc/ldb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2012-2014 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -529,7 +529,7 @@ static int ldb_ipu_ldb_route(int ipu, int di, struct ldb_data *ldb)
 static int ldb_disp_init(struct mxc_dispdrv_handle *disp,
         struct mxc_dispdrv_setting *setting)
 {
-        int ret = 0, i, lvds_channel = 0;
+        int ret = 0, i, lvds_channel = 0, dev_id, ipu_di;
         struct ldb_data *ldb = mxc_dispdrv_getdata(disp);
         struct fsl_mxc_ldb_platform_data *plat_data = ldb->pdev->dev.platform_data;
         struct resource *res;
@@ -563,7 +563,7 @@ static int ldb_disp_init(struct mxc_dispdrv_handle *disp,
                 ldb->gpr3_reg = ldb->reg + 3;
 
                 /* ipu selected by platform data setting */
-                setting->dev_id = plat_data->ipu_id;
+                dev_id = plat_data->ipu_id;
 
                 reg = readl(ldb->control_reg);
 
@@ -628,23 +628,23 @@ static int ldb_disp_init(struct mxc_dispdrv_handle *disp,
                 if (ldb->mode == LDB_SPL_DI0) {
                         reg |= LDB_SPLIT_MODE_EN | LDB_CH0_MODE_EN_TO_DI0
                                 | LDB_CH1_MODE_EN_TO_DI0;
-                        setting->disp_id = 0;
+                        ipu_di = 0;
                 } else if (ldb->mode == LDB_SPL_DI1) {
                         reg |= LDB_SPLIT_MODE_EN | LDB_CH0_MODE_EN_TO_DI1
                                 | LDB_CH1_MODE_EN_TO_DI1;
-                        setting->disp_id = 1;
+                        ipu_di = 1;
                 } else if (ldb->mode == LDB_DUL_DI0) {
                         reg &= ~LDB_SPLIT_MODE_EN;
                         reg |= LDB_CH0_MODE_EN_TO_DI0 | LDB_CH1_MODE_EN_TO_DI0;
-                        setting->disp_id = 0;
+                        ipu_di = 0;
                 } else if (ldb->mode == LDB_DUL_DI1) {
                         reg &= ~LDB_SPLIT_MODE_EN;
                         reg |= LDB_CH0_MODE_EN_TO_DI1 | LDB_CH1_MODE_EN_TO_DI1;
-                        setting->disp_id = 1;
+                        ipu_di = 1;
                 } else if (ldb->mode == LDB_SIN0) {
                         reg &= ~LDB_SPLIT_MODE_EN;
-                        setting->disp_id = plat_data->disp_id;
-                        if (setting->disp_id == 0)
+                        ipu_di = plat_data->disp_id;
+                        if (ipu_di == 0)
                                 reg |= LDB_CH0_MODE_EN_TO_DI0;
                         else
                                 reg |= LDB_CH0_MODE_EN_TO_DI1;
@@ -652,15 +652,15 @@ static int ldb_disp_init(struct mxc_dispdrv_handle *disp,
                         ch_val = reg & LDB_CH0_MODE_MASK;
                 } else if (ldb->mode == LDB_SIN1) {
                         reg &= ~LDB_SPLIT_MODE_EN;
-                        setting->disp_id = plat_data->disp_id;
-                        if (setting->disp_id == 0)
+                        ipu_di = plat_data->disp_id;
+                        if (ipu_di == 0)
                                 reg |= LDB_CH1_MODE_EN_TO_DI0;
                         else
                                 reg |= LDB_CH1_MODE_EN_TO_DI1;
                         ch_mask = LDB_CH1_MODE_MASK;
                         ch_val = reg & LDB_CH1_MODE_MASK;
                 } else { /* separate mode*/
-                        setting->disp_id = plat_data->disp_id;
+                        ipu_di = plat_data->disp_id;
 
                         /* first output is LVDS0 or LVDS1 */
                         if (ldb->mode == LDB_SEP0)
@@ -670,11 +670,11 @@ static int ldb_disp_init(struct mxc_dispdrv_handle *disp,
 
                         reg &= ~LDB_SPLIT_MODE_EN;
 
-                        if ((lvds_channel == 0) && (setting->disp_id == 0))
+                        if ((lvds_channel == 0) && (ipu_di == 0))
                                 reg |= LDB_CH0_MODE_EN_TO_DI0;
-                        else if ((lvds_channel == 0) && (setting->disp_id == 1))
+                        else if ((lvds_channel == 0) && (ipu_di == 1))
                                 reg |= LDB_CH0_MODE_EN_TO_DI1;
-                        else if ((lvds_channel == 1) && (setting->disp_id == 0))
+                        else if ((lvds_channel == 1) && (ipu_di == 0))
                                 reg |= LDB_CH1_MODE_EN_TO_DI0;
                         else
                                 reg |= LDB_CH1_MODE_EN_TO_DI1;
@@ -714,13 +714,13 @@ static int ldb_disp_init(struct mxc_dispdrv_handle *disp,
 
                 setting_idx = 1;
                 if (is_imx6_ldb(plat_data)) {
-                        setting->dev_id = plat_data->sec_ipu_id;
-                        setting->disp_id = plat_data->sec_disp_id;
+                        dev_id = plat_data->sec_ipu_id;
+                        ipu_di = plat_data->sec_disp_id;
                 } else {
-                        setting->dev_id = plat_data->ipu_id;
-                        setting->disp_id = !plat_data->disp_id;
+                        dev_id = plat_data->ipu_id;
+                        ipu_di = !plat_data->disp_id;
                 }
-                if (setting->disp_id == ldb->setting[0].di) {
+                if (ipu_di == ldb->setting[0].di) {
                         dev_err(&ldb->pdev->dev, "Err: for second ldb disp in"
                                 "separate mode, DI should be different!\n");
                         return -EINVAL;
@@ -733,11 +733,11 @@ static int ldb_disp_init(struct mxc_dispdrv_handle *disp,
                         lvds_channel = 0;
 
                 reg = readl(ldb->control_reg);
-                if ((lvds_channel == 0) && (setting->disp_id == 0))
+                if ((lvds_channel == 0) && (ipu_di == 0))
                         reg |= LDB_CH0_MODE_EN_TO_DI0;
-                else if ((lvds_channel == 0) && (setting->disp_id == 1))
+                else if ((lvds_channel == 0) && (ipu_di == 1))
                         reg |= LDB_CH0_MODE_EN_TO_DI1;
-                else if ((lvds_channel == 1) && (setting->disp_id == 0))
+                else if ((lvds_channel == 1) && (ipu_di == 0))
                         reg |= LDB_CH1_MODE_EN_TO_DI0;
                 else
                         reg |= LDB_CH1_MODE_EN_TO_DI1;
@@ -767,10 +767,10 @@ static int ldb_disp_init(struct mxc_dispdrv_handle *disp,
                 div_7_clk[2] += lvds_channel;
                 div_sel_clk[2] += lvds_channel;
         } else {
-                ldb_clk[6] += setting->disp_id;
-                div_3_5_clk[2] += setting->disp_id;
-                div_7_clk[2] += setting->disp_id;
-                div_sel_clk[2] += setting->disp_id;
+                ldb_clk[6] += ipu_di;
+                div_3_5_clk[2] += ipu_di;
+                div_7_clk[2] += ipu_di;
+                div_sel_clk[2] += ipu_di;
         }
         ldb->setting[setting_idx].ldb_di_clk = clk_get(&ldb->pdev->dev,
                                                         ldb_clk);
@@ -799,8 +799,8 @@ static int ldb_disp_init(struct mxc_dispdrv_handle *disp,
                 return PTR_ERR(ldb->setting[setting_idx].div_sel_clk);
         }
 
-        di_clk[3] += setting->dev_id;
-        di_clk[7] += setting->disp_id;
+        di_clk[3] += dev_id;
+        di_clk[7] += ipu_di;
         ldb->setting[setting_idx].di_clk = clk_get(&ldb->pdev->dev,
                                                         di_clk);
         if (IS_ERR(ldb->setting[setting_idx].di_clk)) {
@@ -812,7 +812,7 @@ static int ldb_disp_init(struct mxc_dispdrv_handle *disp,
         ldb->setting[setting_idx].ch_val = ch_val;
 
         if (is_imx6_ldb(plat_data))
-                ldb_ipu_ldb_route(setting->dev_id, setting->disp_id, ldb);
+                ldb_ipu_ldb_route(dev_id, ipu_di, ldb);
 
         /* must use spec video mode defined by driver */
         ret = fb_find_mode(&setting->fbi->var, setting->fbi, setting->dft_mode_str,
@@ -831,8 +831,13 @@ static int ldb_disp_init(struct mxc_dispdrv_handle *disp,
                 }
         }
 
-        ldb->setting[setting_idx].ipu = setting->dev_id;
-        ldb->setting[setting_idx].di = setting->disp_id;
+        ret = ipu_di_to_crtc(&ldb->pdev->dev, dev_id,
+                             ipu_di, &setting->crtc);
+        if (ret < 0)
+                return ret;
+
+        ldb->setting[setting_idx].ipu = dev_id;
+        ldb->setting[setting_idx].di = ipu_di;
 
         return ret;
 }
diff --git a/drivers/video/mxc/mipi_dsi.c b/drivers/video/mxc/mipi_dsi.c
index 8517d2ff7302..53741c31e711 100644
--- a/drivers/video/mxc/mipi_dsi.c
+++ b/drivers/video/mxc/mipi_dsi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
  *
  * 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
@@ -38,7 +38,6 @@
 #include <linux/delay.h>
 #include <video/mipi_display.h>
 
-#include "mxc_dispdrv.h"
 #include "mipi_dsi.h"
 
 #define DISPDRV_MIPI                    "mipi_dsi"
@@ -666,8 +665,10 @@ static int mipi_dsi_disp_init(struct mxc_dispdrv_handle *disp,
                 setting->if_fmt = IPU_PIX_FMT_RGB24;
         }
 
-        setting->dev_id = mipi_dsi->dev_id;
-        setting->disp_id = mipi_dsi->disp_id;
+        ret = ipu_di_to_crtc(dev, mipi_dsi->dev_id,
+                             mipi_dsi->disp_id, &setting->crtc);
+        if (ret < 0)
+                return ret;
 
         ret = mipi_dsi_lcd_init(mipi_dsi, setting);
         if (ret) {
diff --git a/drivers/video/mxc/mipi_dsi.h b/drivers/video/mxc/mipi_dsi.h
index 098dea8f6d7f..a7145a583718 100644
--- a/drivers/video/mxc/mipi_dsi.h
+++ b/drivers/video/mxc/mipi_dsi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
  *
  * 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
@@ -20,6 +20,7 @@
 #define __MIPI_DSI_H__
 
 #include <linux/regmap.h>
+#include "mxc_dispdrv.h"
 
 #ifdef DEBUG
 #define mipi_dbg(fmt, ...) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
diff --git a/drivers/video/mxc/mxc_dispdrv.c b/drivers/video/mxc/mxc_dispdrv.c
index 5193c7deef00..def260f7841b 100644
--- a/drivers/video/mxc/mxc_dispdrv.c
+++ b/drivers/video/mxc/mxc_dispdrv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -24,10 +24,10 @@
  * Move all dev_suspend() things into fb_notifier for SUSPEND, if there is;
  * Move all dev_resume() things into fb_notifier for RESUME, if there is;
  *
- * ipuv3 fb driver could call mxc_dispdrv_gethandle(name, setting) before a fb
+ * mxc fb driver could call mxc_dispdrv_gethandle(name, setting) before a fb
  * need be added, with fbi param passing by setting, after
  * mxc_dispdrv_gethandle() return, FB driver should get the basic setting
- * about fbi info and ipuv3-hw (ipu_id and disp_id).
+ * about fbi info and crtc.
  *
  * @ingroup Framebuffer
  */
diff --git a/drivers/video/mxc/mxc_dispdrv.h b/drivers/video/mxc/mxc_dispdrv.h
index 127fd08ea391..c2ee2ca0f01e 100644
--- a/drivers/video/mxc/mxc_dispdrv.h
+++ b/drivers/video/mxc/mxc_dispdrv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -13,6 +13,7 @@
 #ifndef __MXC_DISPDRV_H__
 #define __MXC_DISPDRV_H__
 #include <linux/fb.h>
+#include "crtc.h"
 
 struct mxc_dispdrv_handle {
         struct mxc_dispdrv_driver *drv;
@@ -25,9 +26,8 @@ struct mxc_dispdrv_setting {
         int default_bpp;
         char *dft_mode_str;
 
-        /*feedback parameter*/
-        int dev_id;
-        int disp_id;
+        /* feedback parameter */
+        enum crtc crtc;
 };
 
 struct mxc_dispdrv_driver {
diff --git a/drivers/video/mxc/mxc_hdmi.c b/drivers/video/mxc/mxc_hdmi.c
index bf20720d1452..2c072bdacda8 100644
--- a/drivers/video/mxc/mxc_hdmi.c
+++ b/drivers/video/mxc/mxc_hdmi.c
@@ -2473,8 +2473,11 @@ static int mxc_hdmi_disp_init(struct mxc_dispdrv_handle *disp,
         /* Setting HDMI default to blank state */
         hdmi->blank = FB_BLANK_POWERDOWN;
 
-        setting->dev_id = mxc_hdmi_ipu_id;
-        setting->disp_id = mxc_hdmi_disp_id;
+        ret = ipu_di_to_crtc(&hdmi->pdev->dev, mxc_hdmi_ipu_id,
+                             mxc_hdmi_disp_id, &setting->crtc);
+        if (ret < 0)
+                return ret;
+
         setting->if_fmt = IPU_PIX_FMT_RGB24;
 
         hdmi->dft_mode_str = setting->dft_mode_str;
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c
index 49abe8c284fc..954cbf1e3d52 100644
--- a/drivers/video/mxc/mxc_ipuv3_fb.c
+++ b/drivers/video/mxc/mxc_ipuv3_fb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -1889,6 +1889,22 @@ static ssize_t show_disp_dev(struct device *dev,
 }
 static DEVICE_ATTR(fsl_disp_dev_property, S_IRUGO, show_disp_dev, NULL);
 
+static int mxcfb_get_crtc(struct device *dev, struct mxcfb_info *mxcfbi,
+                          enum crtc crtc)
+{
+        int i = 0;
+
+        for (; i < ARRAY_SIZE(ipu_di_crtc_maps); i++)
+                if (ipu_di_crtc_maps[i].crtc == crtc) {
+                        mxcfbi->ipu_id = ipu_di_crtc_maps[i].ipu_id;
+                        mxcfbi->ipu_di = ipu_di_crtc_maps[i].ipu_di;
+                        return 0;
+                }
+
+        dev_err(dev, "failed to get valid crtc\n");
+        return -EINVAL;
+}
+
 static int mxcfb_dispdrv_init(struct platform_device *pdev,
                 struct fb_info *fbi)
 {
@@ -1925,12 +1941,13 @@ static int mxcfb_dispdrv_init(struct platform_device *pdev,
                 mxcfbi->ipu_di_pix_fmt = setting.if_fmt;
                 mxcfbi->default_bpp = setting.default_bpp;
 
-                /* setting */
-                mxcfbi->ipu_id = setting.dev_id;
-                mxcfbi->ipu_di = setting.disp_id;
+                ret = mxcfb_get_crtc(&pdev->dev, mxcfbi, setting.crtc);
+                if (ret)
+                        return ret;
+
                 dev_dbg(&pdev->dev, "di_pixfmt:0x%x, bpp:0x%x, di:%d, ipu:%d\n",
                                 setting.if_fmt, setting.default_bpp,
-                                setting.disp_id, setting.dev_id);
+                                mxcfbi->ipu_di, mxcfbi->ipu_id);
         }
 
         return ret;
diff --git a/drivers/video/mxc/mxc_lcdif.c b/drivers/video/mxc/mxc_lcdif.c
index a0cca1c347fb..d635eddbef70 100644
--- a/drivers/video/mxc/mxc_lcdif.c
+++ b/drivers/video/mxc/mxc_lcdif.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -56,14 +56,16 @@ static int lcdif_init(struct mxc_dispdrv_handle *disp,
 {
         int ret, i;
         struct mxc_lcdif_data *lcdif = mxc_dispdrv_getdata(disp);
-        struct mxc_lcd_platform_data *plat_data
-                        = lcdif->pdev->dev.platform_data;
+        struct device *dev = &lcdif->pdev->dev;
+        struct mxc_lcd_platform_data *plat_data = dev->platform_data;
         struct fb_videomode *modedb = lcdif_modedb;
         int modedb_sz = lcdif_modedb_sz;
 
         /* use platform defined ipu/di */
-        setting->dev_id = plat_data->ipu_id;
-        setting->disp_id = plat_data->disp_id;
+        ret = ipu_di_to_crtc(dev, plat_data->ipu_id,
+                             plat_data->disp_id, &setting->crtc);
+        if (ret < 0)
+                return ret;
 
         ret = fb_find_mode(&setting->fbi->var, setting->fbi, setting->dft_mode_str,
                                 modedb, modedb_sz, NULL, setting->default_bpp);