video: rockchip: sysfs: fixup dump_buf node

[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / rkfb_sysfs.c

diff --git a/drivers/video/rockchip/rkfb_sysfs.c b/drivers/video/rockchip/rkfb_sysfs.c
index c375577888dd3c90d307a54c4bfb7dd94a10e410..894ed23cd7b83e850c66e8ea79d0f8e103a52b0d 100644 (file)
--- a/drivers/video/rockchip/rkfb_sysfs.c
+++ b/drivers/video/rockchip/rkfb_sysfs.c
@@ -254,8 +254,10 @@ static ssize_t show_dump_buffer(struct device *dev,
 
        size = snprintf(buf, PAGE_SIZE,
                        "bmp       -- dump buffer to bmp image\n"
+                       "             can't support dump to single file\n"
                        "bin       -- dump buffer to bin image\n"
-                       "multi    --  each dump will create new file\n"
+                       "multi     -- each dump will create new file\n"
+                       "             only works on trace context\n"
                        "win=num   -- mask win to dump, default mask all\n"
                        "             win=1, will dump win1 buffer\n"
                        "             win=23, will dump win2 area3 buffer\n"
@@ -382,8 +384,7 @@ static ssize_t set_dump_buffer(struct device *dev,
                        continue;
                }
                if (!strncmp(p, "multi", 5)) {
-                       is_append = true;
-                       is_bmp = false;
+                       is_append = false;
                        continue;
                }
 
@@ -457,8 +458,7 @@ static ssize_t set_dump_buffer(struct device *dev,
                                         area_data->smem_start,
                                         area_data->xvir, area_data->yvir,
                                         area_data->data_format,
-                                        trace->count_frame,
-                                        i, j, trace->is_bmp, trace->is_append);
+                                        0, i, j, is_bmp, false);
                                if (area_data->ion_handle)
                                        ion_handle_put(area_data->ion_handle);
                        }
@@ -743,17 +743,22 @@ static ssize_t set_fps(struct device *dev, struct device_attribute *attr,
        struct fb_info *fbi = dev_get_drvdata(dev);
        struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
        struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
-       u32 fps;
+       struct rk_screen *screen = dev_drv->cur_screen;
+       u32 fps, origin_fps;
        int ret;
 
        ret = kstrtou32(buf, 0, &fps);
        if (ret)
                return ret;
 
-       if (fps == 0 || fps > 60) {
-               dev_info(dev, "unsupport fps value,pelase set 1~60\n");
-               return count;
-       }
+       origin_fps = rk_fb_calc_fps(screen, dev_drv->pixclock);
+
+       /*
+        * use too low or too high fps would make screen abnormal,
+        * and maybe can't recovery, so limit the fps.
+        */
+       if (fps <= 40 || fps > origin_fps)
+               fps = origin_fps;
 
        if (dev_drv->ops->fps_mgr)
                ret = dev_drv->ops->fps_mgr(dev_drv, fps, 1);
@@ -1194,6 +1199,28 @@ static ssize_t show_lcdc_id(struct device *dev,
        return snprintf(buf, PAGE_SIZE, "%d\n", dev_drv->id);
 }
 
+static ssize_t show_dsp_mode(struct device *dev,
+                           struct device_attribute *attr,
+                           char *buf)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
+       struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
+
+       return snprintf(buf, PAGE_SIZE, "%d\n", dev_drv->dsp_mode);
+}
+
+static ssize_t show_hot_plug_state(struct device *dev,
+                           struct device_attribute *attr,
+                           char *buf)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
+       struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
+
+       return snprintf(buf, PAGE_SIZE, "%d\n", dev_drv->hot_plug_state);
+}
+
 static ssize_t show_win_property(struct device *dev,
                            struct device_attribute *attr,
                            char *buf)
@@ -1211,6 +1238,24 @@ static ssize_t show_win_property(struct device *dev,
                        dev_drv->win[win_id]->property.max_input_y);
 }
 
+static ssize_t set_car_reverse(struct device *dev,
+                              struct device_attribute *attr,
+                              const char *buf, size_t count)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
+       struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
+       u32 status;
+       int ret;
+
+       ret = kstrtou32(buf, 0, &status);
+       if (ret)
+               return ret;
+       rk_fb_set_car_reverse_status(dev_drv, status);
+
+       return count;
+}
+
 static struct device_attribute rkfb_attrs[] = {
        __ATTR(phys_addr, S_IRUGO, show_phys, NULL),
        __ATTR(virt_addr, S_IRUGO, show_virt, NULL),
@@ -1231,6 +1276,9 @@ static struct device_attribute rkfb_attrs[] = {
        __ATTR(scale, S_IRUGO | S_IWUSR, show_scale, set_scale),
        __ATTR(lcdcid, S_IRUGO, show_lcdc_id, NULL),
        __ATTR(win_property, S_IRUGO, show_win_property, NULL),
+       __ATTR(car_reverse, S_IWUSR, NULL, set_car_reverse),
+       __ATTR(dsp_mode, S_IRUGO, show_dsp_mode, NULL),
+       __ATTR(hot_plug_state, S_IRUGO, show_hot_plug_state, NULL),
 };
 
 int rkfb_create_sysfs(struct fb_info *fbi)