rk30 lcdc: add vysnc support

diff --git a/drivers/video/rockchip/lcdc/rk30_lcdc.c b/drivers/video/rockchip/lcdc/rk30_lcdc.c
index e17609c57ead2bacd481d4b873d8e90a37f193ed..f277a3345f0be1907800ccec21da2b70e6515c52 100644 (file)
--- a/drivers/video/rockchip/lcdc/rk30_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk30_lcdc.c
@@ -30,6 +30,8 @@
 #include <linux/earlysuspend.h>
 #include <asm/div64.h>
 #include <asm/uaccess.h>
+#include <linux/kthread.h>
+
 #include "rk30_lcdc.h"
 
 
@@ -906,6 +908,7 @@ int rk30_lcdc_ioctl(struct rk_lcdc_device_driver * dev_drv,unsigned int cmd, uns
        u32 panel_size[2];
        void __user *argp = (void __user *)arg;
        int ret = 0;
+       int enable;
        switch(cmd)
        {
                case FBIOGET_PANEL_SIZE:    //get panel size
@@ -914,6 +917,11 @@ int rk30_lcdc_ioctl(struct rk_lcdc_device_driver * dev_drv,unsigned int cmd, uns
                        if(copy_to_user(argp, panel_size, 8)) 
                                return -EFAULT;
                        break;
+               case RK_FBIOSET_VSYNC_ENABLE:
+                       if (copy_from_user(&enable, argp, sizeof(enable)))
+                               return -EFAULT;
+                       lcdc_dev->vsync_info.active = enable;
+                       break;
                default:
                        break;
        }
@@ -1387,9 +1395,39 @@ int rk30_lcdc_early_resume(struct rk_lcdc_device_driver *dev_drv)
                
        return 0;
 }
+
+static int lcdc_wait_for_vsync_thread(void *data)
+{
+       struct rk30_lcdc_device  *lcdc_dev = data;
+
+       while (!kthread_should_stop()) {
+               ktime_t timestamp = lcdc_dev->vsync_info.timestamp;
+               int ret = wait_event_interruptible(lcdc_dev->vsync_info.wait,
+                       !ktime_equal(timestamp, lcdc_dev->vsync_info.timestamp) &&
+                       lcdc_dev->vsync_info.active);
+
+               if (!ret) {
+                       sysfs_notify(&lcdc_dev->driver.dev->kobj, NULL, "vsync");
+               }
+       }
+
+       return 0;
+}
+
+static ssize_t rk30_lcdc_vsync_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct rk30_lcdc_device *lcdc_dev = dev_get_drvdata(dev);
+       return scnprintf(buf, PAGE_SIZE, "%llu\n",
+                       ktime_to_ns(lcdc_dev->vsync_info.timestamp));
+}
+
+static DEVICE_ATTR(vsync, S_IRUGO, rk30_lcdc_vsync_show, NULL);
+
 static irqreturn_t rk30_lcdc_isr(int irq, void *dev_id)
 {
        struct rk30_lcdc_device *lcdc_dev = (struct rk30_lcdc_device *)dev_id;
+       ktime_t timestamp = ktime_get();
        
        lcdc_msk_reg(lcdc_dev, INT_STATUS, m_FRM_START_INT_CLEAR, v_FRM_START_INT_CLEAR(1));
        lcdc_cfg_done(lcdc_dev);
@@ -1401,6 +1439,10 @@ static irqreturn_t rk30_lcdc_isr(int irq, void *dev_id)
                complete(&(lcdc_dev->driver.frame_done));
                spin_unlock(&(lcdc_dev->driver.cpl_lock));
        }
+
+       lcdc_dev->vsync_info.timestamp = timestamp;
+       wake_up_interruptible_all(&lcdc_dev->vsync_info.wait);
+       
        return IRQ_HANDLED;
 }
 
@@ -1557,7 +1599,22 @@ static int __devinit rk30_lcdc_probe (struct platform_device *pdev)
                ret =  -ENODEV;
                goto err4;
        }
-               
+
+       init_waitqueue_head(&lcdc_dev->vsync_info.wait);
+       ret = device_create_file(&pdev->dev, &dev_attr_vsync);
+       if (ret) {
+               dev_err(&pdev->dev, "failed to create vsync file\n");
+       }
+       lcdc_dev->vsync_info.thread = kthread_run(lcdc_wait_for_vsync_thread,
+               lcdc_dev, "lcdc-vsync");
+
+       
+       if (lcdc_dev->vsync_info.thread == ERR_PTR(-ENOMEM)) {
+               dev_err(&pdev->dev, "failed to run vsync thread\n");
+               lcdc_dev->vsync_info.thread = NULL;
+       }
+       lcdc_dev->vsync_info.active = 1;
+       
        ret = rk_fb_register(&(lcdc_dev->driver),&lcdc_driver,lcdc_dev->id);
        if(ret < 0)
        {

diff --git a/drivers/video/rockchip/lcdc/rk30_lcdc.h b/drivers/video/rockchip/lcdc/rk30_lcdc.h
index 45cfc55e1bc09ca644e458f22555591a5e384788..e2b467e99ac88b65ed9e54b973d08dc22f3a0987 100644 (file)
--- a/drivers/video/rockchip/lcdc/rk30_lcdc.h
+++ b/drivers/video/rockchip/lcdc/rk30_lcdc.h
@@ -590,6 +590,8 @@ struct rk30_lcdc_device{
        bool clk_on;                    //if aclk or hclk is closed ,acess to register is not allowed
        u8 atv_layer_cnt;               //active layer counter,when  atv_layer_cnt = 0,disable lcdc
 
+       struct rk_fb_vsync       vsync_info;
+       
        unsigned int            irq;
 
        struct clk              *pd;                            //lcdc power domain