if (ft > 0)
fps = div64_u64(1000000000000llu, ft);
- return snprintf(buf, PAGE_SIZE, "xres:%d\nyres:%d\nfps:%d\n",
- screen->mode.xres, screen->mode.yres, fps);
+ return snprintf(buf, PAGE_SIZE,
+ "xres:%d\nyres:%d\nfps:%d\ntype:%d\ninterlace:%d\n",
+ screen->mode.xres, screen->mode.yres,
+ fps, screen->type, screen->mode.vmode);
}
static ssize_t show_disp_info(struct device *dev,
start = phys_addr;
nr_pages = roundup(width * height * (bits >> 3), PAGE_SIZE);
nr_pages /= PAGE_SIZE;
- pages = kzalloc(sizeof(struct page) * nr_pages,GFP_KERNEL);
+ pages = kzalloc(sizeof(struct page) * nr_pages, GFP_KERNEL);
while (i < nr_pages) {
pages[i] = phys_to_page(start);
start += PAGE_SIZE;
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"
struct rk_fb_reg_win_data *win_data;
struct rk_fb_reg_area_data *area_data;
struct rkfb_sys_trace *trace = dev_drv->trace_buf;
- int i,j;
+ int i, j;
if (!trace)
return;
if (kstrtoint(p + 4, 0, &win))
dev_err(dev, "can't found trace frames\n");
- if (win < 10)
+ if (win < 10) {
mask_win |= 1 << win;
- else {
+ } else {
mask_win |= 1 << (win / 10);
mask_area |= 1 << (win % 10);
}
continue;
}
if (!strncmp(p, "multi", 5)) {
- is_append = true;
- is_bmp = false;
+ is_append = false;
continue;
}
u16 xact, yact;
int data_format;
u32 dsp_addr;
+ int ymirror;
mutex_unlock(&dev_drv->front_lock);
if (dev_drv->ops->get_dspbuf_info)
dev_drv->ops->get_dspbuf_info(dev_drv, &xact,
- &yact, &data_format, &dsp_addr);
+ &yact, &data_format, &dsp_addr,
+ &ymirror);
dump_win(NULL, NULL, dsp_addr, xact, yact, data_format,
0, 0, 0, is_bmp, false);
win_data = &front_regs->reg_win_data[i];
area_data = &win_data->reg_area_data[j];
- dump_win(rk_fb->ion_client, area_data->ion_handle,
+ dump_win(rk_fb->ion_client,
+ area_data->ion_handle,
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);
+ area_data->data_format,
+ 0, i, j, is_bmp, false);
if (area_data->ion_handle)
ion_handle_put(area_data->ion_handle);
}
}
}
- if (win_config.ret_fence_fd > 0){
+ if (win_config.ret_fence_fd > 0) {
acq_fence =
sync_fence_fdget(win_config.ret_fence_fd);
sync_fence_put(acq_fence);
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;
- int ovl;
+ int ovl = 0;
if (dev_drv->ops->ovl_mgr)
ovl = dev_drv->ops->ovl_mgr(dev_drv, 0, 0);
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;
- int fps;
+ int fps = 0;
if (dev_drv->ops->fps_mgr)
fps = dev_drv->ops->fps_mgr(dev_drv, 0, 0);
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);
else
start++;
}
-#if 0
- for (i = 0; i < 16; i++) {
- for (j = 0; j < 16; j++)
- printk("0x%08x ", hwc_lut[i * 16 + j]);
- printk("\n");
- }
-#endif
if (dev_drv->ops->set_hwc_lut)
dev_drv->ops->set_hwc_lut(dev_drv, hwc_lut, 1);
else
start++;
}
-#if 0
- for (i = 0; i < 16; i++) {
- for (j = 0; j < 16; j++)
- printk("0x%08x ", dsp_lut[i * 16 + j]);
- printk("\n");
- }
-#endif
if (dev_drv->ops->set_dsp_lut)
dev_drv->ops->set_dsp_lut(dev_drv, dsp_lut);
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;
- int space_max, ret, mode = 0, calc = 0,up = 0, down = 0, global = 0;
+ int space_max, ret = 0, mode = 0, calc = 0, up = 0, down = 0, global = 0;
const char *start = buf;
space_max = 10; /*max space number 10*/
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;
- int brightness, contrast, sat_con, sin_hue, cos_hue;
+ int brightness = 0, contrast = 0, sat_con = 0, sin_hue = 0, cos_hue = 0;
if (dev_drv->ops->get_dsp_bcsh_bcs) {
brightness = dev_drv->ops->get_dsp_bcsh_bcs(dev_drv,
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)
+{
+ 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;
+ int win_id = 0;
+
+ win_id = dev_drv->ops->fb_get_win_id(dev_drv, fbi->fix.id);
+ return snprintf(buf, PAGE_SIZE,
+ "feature: %d, max_input_x: %d, max_input_y: %d\n",
+ dev_drv->win[win_id]->property.feature,
+ dev_drv->win[win_id]->property.max_input_x,
+ 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),
__ATTR(bcsh, S_IRUGO | S_IWUSR, show_dsp_bcsh, set_dsp_bcsh),
__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)
projects / firefly-linux-kernel-4.4.55.git / blobdiff