1 files changed, 30 insertions, 146 deletions

diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 5ea17f49c611..c06fbe0bc678 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -32,8 +32,9 @@
 #include <linux/ktime.h>
 #include <linux/hrtimer.h>
 #include <linux/seq_file.h>
+#include <linux/semaphore.h>
 
-#include <plat/display.h>
+#include <video/omapdss.h>
 #include "dss.h"
 
 struct rfbi_reg { u16 idx; };
@@ -65,9 +66,6 @@ struct rfbi_reg { u16 idx; };
 #define REG_FLD_MOD(idx, val, start, end) \
         rfbi_write_reg(idx, FLD_MOD(rfbi_read_reg(idx), val, start, end))
 
-/* To work around an RFBI transfer rate limitation */
-#define OMAP_RFBI_RATE_LIMIT    1
-
 enum omap_rfbi_cycleformat {
         OMAP_DSS_RFBI_CYCLEFORMAT_1_1 = 0,
         OMAP_DSS_RFBI_CYCLEFORMAT_2_1 = 1,
@@ -89,11 +87,6 @@ enum omap_rfbi_parallelmode {
         OMAP_DSS_RFBI_PARALLELMODE_16 = 3,
 };
 
-enum update_cmd {
-        RFBI_CMD_UPDATE = 0,
-        RFBI_CMD_SYNC   = 1,
-};
-
 static int rfbi_convert_timings(struct rfbi_timings *t);
 static void rfbi_get_clk_info(u32 *clk_period, u32 *max_clk_div);
 
@@ -114,20 +107,9 @@ static struct {
 
         struct omap_dss_device *dssdev[2];
 
-        struct kfifo      cmd_fifo;
-        spinlock_t        cmd_lock;
-        struct completion cmd_done;
-        atomic_t          cmd_fifo_full;
-        atomic_t          cmd_pending;
+        struct semaphore bus_lock;
 } rfbi;
 
-struct update_region {
-        u16     x;
-        u16     y;
-        u16     w;
-        u16     h;
-};
-
 static inline void rfbi_write_reg(const struct rfbi_reg idx, u32 val)
 {
         __raw_writel(val, rfbi.base + idx.idx);
@@ -146,9 +128,20 @@ static void rfbi_enable_clocks(bool enable)
                 dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK);
 }
 
+void rfbi_bus_lock(void)
+{
+        down(&rfbi.bus_lock);
+}
+EXPORT_SYMBOL(rfbi_bus_lock);
+
+void rfbi_bus_unlock(void)
+{
+        up(&rfbi.bus_lock);
+}
+EXPORT_SYMBOL(rfbi_bus_unlock);
+
 void omap_rfbi_write_command(const void *buf, u32 len)
 {
-        rfbi_enable_clocks(1);
         switch (rfbi.parallelmode) {
         case OMAP_DSS_RFBI_PARALLELMODE_8:
         {
@@ -172,13 +165,11 @@ void omap_rfbi_write_command(const void *buf, u32 len)
         default:
                 BUG();
         }
-        rfbi_enable_clocks(0);
 }
 EXPORT_SYMBOL(omap_rfbi_write_command);
 
 void omap_rfbi_read_data(void *buf, u32 len)
 {
-        rfbi_enable_clocks(1);
         switch (rfbi.parallelmode) {
         case OMAP_DSS_RFBI_PARALLELMODE_8:
         {
@@ -206,13 +197,11 @@ void omap_rfbi_read_data(void *buf, u32 len)
         default:
                 BUG();
         }
-        rfbi_enable_clocks(0);
 }
 EXPORT_SYMBOL(omap_rfbi_read_data);
 
 void omap_rfbi_write_data(const void *buf, u32 len)
 {
-        rfbi_enable_clocks(1);
         switch (rfbi.parallelmode) {
         case OMAP_DSS_RFBI_PARALLELMODE_8:
         {
@@ -237,7 +226,6 @@ void omap_rfbi_write_data(const void *buf, u32 len)
                 BUG();
 
         }
-        rfbi_enable_clocks(0);
 }
 EXPORT_SYMBOL(omap_rfbi_write_data);
 
@@ -249,8 +237,6 @@ void omap_rfbi_write_pixels(const void __iomem *buf, int scr_width,
         int horiz_offset = scr_width - w;
         int i;
 
-        rfbi_enable_clocks(1);
-
         if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&
            rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {
                 const u16 __iomem *pd = buf;
@@ -295,12 +281,10 @@ void omap_rfbi_write_pixels(const void __iomem *buf, int scr_width,
         } else {
                 BUG();
         }
-
-        rfbi_enable_clocks(0);
 }
 EXPORT_SYMBOL(omap_rfbi_write_pixels);
 
-void rfbi_transfer_area(struct omap_dss_device *dssdev, u16 width,
+static void rfbi_transfer_area(struct omap_dss_device *dssdev, u16 width,
                 u16 height, void (*callback)(void *data), void *data)
 {
         u32 l;
@@ -317,8 +301,6 @@ void rfbi_transfer_area(struct omap_dss_device *dssdev, u16 width,
         rfbi.framedone_callback = callback;
         rfbi.framedone_callback_data = data;
 
-        rfbi_enable_clocks(1);
-
         rfbi_write_reg(RFBI_PIXEL_CNT, width * height);
 
         l = rfbi_read_reg(RFBI_CONTROL);
@@ -337,15 +319,11 @@ static void framedone_callback(void *data, u32 mask)
 
         REG_FLD_MOD(RFBI_CONTROL, 0, 0, 0);
 
-        rfbi_enable_clocks(0);
-
         callback = rfbi.framedone_callback;
         rfbi.framedone_callback = NULL;
 
         if (callback != NULL)
                 callback(rfbi.framedone_callback_data);
-
-        atomic_set(&rfbi.cmd_pending, 0);
 }
 
 #if 1 /* VERBOSE */
@@ -435,7 +413,7 @@ static int calc_extif_timings(struct rfbi_timings *t)
 }
 
 
-void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t)
+static void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t)
 {
         int r;
 
@@ -447,7 +425,6 @@ void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t)
 
         BUG_ON(!t->converted);
 
-        rfbi_enable_clocks(1);
         rfbi_write_reg(RFBI_ONOFF_TIME(rfbi_module), t->tim[0]);
         rfbi_write_reg(RFBI_CYCLE_TIME(rfbi_module), t->tim[1]);
 
@@ -456,7 +433,6 @@ void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t)
                     (t->tim[2] ? 1 : 0), 4, 4);
 
         rfbi_print_timings();
-        rfbi_enable_clocks(0);
 }
 
 static int ps_to_rfbi_ticks(int time, int div)
@@ -472,59 +448,6 @@ static int ps_to_rfbi_ticks(int time, int div)
         return ret;
 }
 
-#ifdef OMAP_RFBI_RATE_LIMIT
-unsigned long rfbi_get_max_tx_rate(void)
-{
-        unsigned long   l4_rate, dss1_rate;
-        int             min_l4_ticks = 0;
-        int             i;
-
-        /* According to TI this can't be calculated so make the
-         * adjustments for a couple of known frequencies and warn for
-         * others.
-         */
-        static const struct {
-                unsigned long l4_clk;           /* HZ */
-                unsigned long dss1_clk;         /* HZ */
-                unsigned long min_l4_ticks;
-        } ftab[] = {
-                { 55,   132,    7, },           /* 7.86 MPix/s */
-                { 110,  110,    12, },          /* 9.16 MPix/s */
-                { 110,  132,    10, },          /* 11   Mpix/s */
-                { 120,  120,    10, },          /* 12   Mpix/s */
-                { 133,  133,    10, },          /* 13.3 Mpix/s */
-        };
-
-        l4_rate = rfbi.l4_khz / 1000;
-        dss1_rate = dss_clk_get_rate(DSS_CLK_FCK) / 1000000;
-
-        for (i = 0; i < ARRAY_SIZE(ftab); i++) {
-                /* Use a window instead of an exact match, to account
-                 * for different DPLL multiplier / divider pairs.
-                 */
-                if (abs(ftab[i].l4_clk - l4_rate) < 3 &&
-                    abs(ftab[i].dss1_clk - dss1_rate) < 3) {
-                        min_l4_ticks = ftab[i].min_l4_ticks;
-                        break;
-                }
-        }
-        if (i == ARRAY_SIZE(ftab)) {
-                /* Can't be sure, return anyway the maximum not
-                 * rate-limited. This might cause a problem only for the
-                 * tearing synchronisation.
-                 */
-                DSSERR("can't determine maximum RFBI transfer rate\n");
-                return rfbi.l4_khz * 1000;
-        }
-        return rfbi.l4_khz * 1000 / min_l4_ticks;
-}
-#else
-int rfbi_get_max_tx_rate(void)
-{
-        return rfbi.l4_khz * 1000;
-}
-#endif
-
 static void rfbi_get_clk_info(u32 *clk_period, u32 *max_clk_div)
 {
         *clk_period = 1000000000 / rfbi.l4_khz;
@@ -644,7 +567,6 @@ int omap_rfbi_setup_te(enum omap_rfbi_te_mode mode,
         DSSDBG("setup_te: mode %d hs %d vs %d hs_inv %d vs_inv %d\n",
                 mode, hs, vs, hs_pol_inv, vs_pol_inv);
 
-        rfbi_enable_clocks(1);
         rfbi_write_reg(RFBI_HSYNC_WIDTH, hs);
         rfbi_write_reg(RFBI_VSYNC_WIDTH, vs);
 
@@ -657,7 +579,6 @@ int omap_rfbi_setup_te(enum omap_rfbi_te_mode mode,
                 l &= ~(1 << 20);
         else
                 l |= 1 << 20;
-        rfbi_enable_clocks(0);
 
         return 0;
 }
@@ -672,7 +593,6 @@ int omap_rfbi_enable_te(bool enable, unsigned line)
         if (line > (1 << 11) - 1)
                 return -EINVAL;
 
-        rfbi_enable_clocks(1);
         l = rfbi_read_reg(RFBI_CONFIG(0));
         l &= ~(0x3 << 2);
         if (enable) {
@@ -682,50 +602,12 @@ int omap_rfbi_enable_te(bool enable, unsigned line)
                 rfbi.te_enabled = 0;
         rfbi_write_reg(RFBI_CONFIG(0), l);
         rfbi_write_reg(RFBI_LINE_NUMBER, line);
-        rfbi_enable_clocks(0);
 
         return 0;
 }
 EXPORT_SYMBOL(omap_rfbi_enable_te);
 
-#if 0
-static void rfbi_enable_config(int enable1, int enable2)
-{
-        u32 l;
-        int cs = 0;
-
-        if (enable1)
-                cs |= 1<<0;
-        if (enable2)
-                cs |= 1<<1;
-
-        rfbi_enable_clocks(1);
-
-        l = rfbi_read_reg(RFBI_CONTROL);
-
-        l = FLD_MOD(l, cs, 3, 2);
-        l = FLD_MOD(l, 0, 1, 1);
-
-        rfbi_write_reg(RFBI_CONTROL, l);
-
-
-        l = rfbi_read_reg(RFBI_CONFIG(0));
-        l = FLD_MOD(l, 0, 3, 2); /* TRIGGERMODE: ITE */
-        /*l |= FLD_VAL(2, 8, 7); */ /* L4FORMAT, 2pix/L4 */
-        /*l |= FLD_VAL(0, 8, 7); */ /* L4FORMAT, 1pix/L4 */
-
-        l = FLD_MOD(l, 0, 16, 16); /* A0POLARITY */
-        l = FLD_MOD(l, 1, 20, 20); /* TE_VSYNC_POLARITY */
-        l = FLD_MOD(l, 1, 21, 21); /* HSYNCPOLARITY */
-
-        l = FLD_MOD(l, OMAP_DSS_RFBI_PARALLELMODE_8, 1, 0);
-        rfbi_write_reg(RFBI_CONFIG(0), l);
-
-        rfbi_enable_clocks(0);
-}
-#endif
-
-int rfbi_configure(int rfbi_module, int bpp, int lines)
+static int rfbi_configure(int rfbi_module, int bpp, int lines)
 {
         u32 l;
         int cycle1 = 0, cycle2 = 0, cycle3 = 0;
@@ -821,8 +703,6 @@ int rfbi_configure(int rfbi_module, int bpp, int lines)
                 break;
         }
 
-        rfbi_enable_clocks(1);
-
         REG_FLD_MOD(RFBI_CONTROL, 0, 3, 2); /* clear CS */
 
         l = 0;
@@ -856,11 +736,15 @@ int rfbi_configure(int rfbi_module, int bpp, int lines)
         DSSDBG("RFBI config: bpp %d, lines %d, cycles: 0x%x 0x%x 0x%x\n",
                bpp, lines, cycle1, cycle2, cycle3);
 
-        rfbi_enable_clocks(0);
-
         return 0;
 }
-EXPORT_SYMBOL(rfbi_configure);
+
+int omap_rfbi_configure(struct omap_dss_device *dssdev, int pixel_size,
+                int data_lines)
+{
+        return rfbi_configure(dssdev->phy.rfbi.channel, pixel_size, data_lines);
+}
+EXPORT_SYMBOL(omap_rfbi_configure);
 
 int omap_rfbi_prepare_update(struct omap_dss_device *dssdev,
                 u16 *x, u16 *y, u16 *w, u16 *h)
@@ -960,6 +844,8 @@ int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev)
 {
         int r;
 
+        rfbi_enable_clocks(1);
+
         r = omap_dss_start_device(dssdev);
         if (r) {
                 DSSERR("failed to start device\n");
@@ -1002,6 +888,8 @@ void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev)
         omap_dispc_unregister_isr(framedone_callback, NULL,
                         DISPC_IRQ_FRAMEDONE);
         omap_dss_stop_device(dssdev);
+
+        rfbi_enable_clocks(0);
 }
 EXPORT_SYMBOL(omapdss_rfbi_display_disable);
 
@@ -1021,11 +909,7 @@ static int omap_rfbihw_probe(struct platform_device *pdev)
 
         rfbi.pdev = pdev;
 
-        spin_lock_init(&rfbi.cmd_lock);
-
-        init_completion(&rfbi.cmd_done);
-        atomic_set(&rfbi.cmd_fifo_full, 0);
-        atomic_set(&rfbi.cmd_pending, 0);
+        sema_init(&rfbi.bus_lock, 1);
 
         rfbi_mem = platform_get_resource(rfbi.pdev, IORESOURCE_MEM, 0);
         if (!rfbi_mem) {