OMAP: DSS2: Functions to request/release DSI VCs

Introduce functions which request and release VC's. This will be used in panel
drivers in their probes.

omap_dsi_request_vc() takes in the pointer to the omap_dss_device, the VC_ID
parameter which goes into the header of the DSI packets, and returns a Virtual
channel number (or virtual channel register set) which it can use.

omap_dsi_set_vc_id() takes the omap_dss_device pointer, the Virtual Channel
number and the VC_ID that needs to be set for the specifed Virtual Channel.

omap_dsi_release_vc() takes the omap_dss_device pointer and the Virtual Channel
number that needs to be made free.

Initialisation of VC parameters is done in dsi_init().

Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h
index 37658249e48343e35c36194bdf03ae292f73bf72..e81ca66dfbb46920b86454c94983478a6ce5fd8f 100644 (file)
--- a/arch/arm/plat-omap/include/plat/display.h
+++ b/arch/arm/plat-omap/include/plat/display.h
@@ -562,6 +562,9 @@ int omap_dsi_update(struct omap_dss_device *dssdev,
                int channel,
                u16 x, u16 y, u16 w, u16 h,
                void (*callback)(int, void *), void *data);
+int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel);
+int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id);
+void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel);
 
 int omapdss_dsi_display_enable(struct omap_dss_device *dssdev);
 void omapdss_dsi_display_disable(struct omap_dss_device *dssdev);

diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 37ffbb6ecf6918cc90283acff137944685035acf..fe3578bbff7dc902bd1b206e70d57e67d4cd8365 100644 (file)
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -233,6 +233,7 @@ static struct
                enum dsi_vc_mode mode;
                struct omap_dss_device *dssdev;
                enum fifo_size fifo_size;
+               int vc_id;
        } vc[4];
 
        struct mutex lock;
@@ -1764,8 +1765,6 @@ static void dsi_vc_initial_config(int channel)
        r = FLD_MOD(r, 4, 23, 21); /* DMA_TX_REQ_NB = no dma */
 
        dsi_write_reg(DSI_VC_CTRL(channel), r);
-
-       dsi.vc[channel].mode = DSI_VC_MODE_L4;
 }
 
 static int dsi_vc_config_l4(int channel)
@@ -1972,7 +1971,7 @@ static inline void dsi_vc_write_long_header(int channel, u8 data_type,
 
        WARN_ON(!dsi_bus_is_locked());
 
-       data_id = data_type | channel << 6;
+       data_id = data_type | dsi.vc[channel].vc_id << 6;
 
        val = FLD_VAL(data_id, 7, 0) | FLD_VAL(len, 23, 8) |
                FLD_VAL(ecc, 31, 24);
@@ -2075,7 +2074,7 @@ static int dsi_vc_send_short(int channel, u8 data_type, u16 data, u8 ecc)
                return -EINVAL;
        }
 
-       data_id = data_type | channel << 6;
+       data_id = data_type | dsi.vc[channel].vc_id << 6;
 
        r = (data_id << 0) | (data << 8) | (ecc << 24);
 
@@ -3250,6 +3249,57 @@ int dsi_init_display(struct omap_dss_device *dssdev)
        return 0;
 }
 
+int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(dsi.vc); i++) {
+               if (!dsi.vc[i].dssdev) {
+                       dsi.vc[i].dssdev = dssdev;
+                       *channel = i;
+                       return 0;
+               }
+       }
+
+       DSSERR("cannot get VC for display %s", dssdev->name);
+       return -ENOSPC;
+}
+EXPORT_SYMBOL(omap_dsi_request_vc);
+
+int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id)
+{
+       if (vc_id < 0 || vc_id > 3) {
+               DSSERR("VC ID out of range\n");
+               return -EINVAL;
+       }
+
+       if (channel < 0 || channel > 3) {
+               DSSERR("Virtual Channel out of range\n");
+               return -EINVAL;
+       }
+
+       if (dsi.vc[channel].dssdev != dssdev) {
+               DSSERR("Virtual Channel not allocated to display %s\n",
+                       dssdev->name);
+               return -EINVAL;
+       }
+
+       dsi.vc[channel].vc_id = vc_id;
+
+       return 0;
+}
+EXPORT_SYMBOL(omap_dsi_set_vc_id);
+
+void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel)
+{
+       if ((channel >= 0 && channel <= 3) &&
+               dsi.vc[channel].dssdev == dssdev) {
+               dsi.vc[channel].dssdev = NULL;
+               dsi.vc[channel].vc_id = 0;
+       }
+}
+EXPORT_SYMBOL(omap_dsi_release_vc);
+
 void dsi_wait_pll_hsdiv_dispc_active(void)
 {
        if (wait_for_bit_change(DSI_PLL_STATUS, 7, 1) != 1)
@@ -3269,7 +3319,7 @@ void dsi_wait_pll_hsdiv_dsi_active(void)
 static int dsi_init(struct platform_device *pdev)
 {
        u32 rev;
-       int r;
+       int r, i;
        struct resource *dsi_mem;
 
        spin_lock_init(&dsi.errors_lock);
@@ -3323,6 +3373,13 @@ static int dsi_init(struct platform_device *pdev)
                goto err2;
        }
 
+       /* DSI VCs initialization */
+       for (i = 0; i < ARRAY_SIZE(dsi.vc); i++) {
+               dsi.vc[i].mode = DSI_VC_MODE_L4;
+               dsi.vc[i].dssdev = NULL;
+               dsi.vc[i].vc_id = 0;
+       }
+
        enable_clocks(1);
 
        rev = dsi_read_reg(DSI_REVISION);