fps, screen->type, screen->mode.vmode);
}
+static ssize_t set_screen_info(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;
+ int xmirror = 0, ymirror = 0, ret = 0, rotate = 0;
+
+ ret = kstrtoint(buf, 0, &rotate);
+ if (ret)
+ return ret;
+ xmirror = !!(rotate & X_MIRROR);
+ ymirror = !!(rotate & Y_MIRROR);
+ dev_drv->cur_screen->x_mirror = xmirror;
+ dev_drv->cur_screen->y_mirror = ymirror;
+ dev_drv->rotate_mode = rotate;
+ mutex_lock(&dev_drv->output_lock);
+ mutex_lock(&dev_drv->win_config);
+ if (dev_drv->ops->extern_func)
+ dev_drv->ops->extern_func(dev_drv, SET_DSP_MIRROR);
+ mutex_unlock(&dev_drv->win_config);
+ mutex_unlock(&dev_drv->output_lock);
+
+ return count;
+}
+
static ssize_t show_disp_info(struct device *dev,
struct device_attribute *attr, char *buf)
{
nr_pages = roundup(width * height * (bits >> 3), PAGE_SIZE);
nr_pages /= PAGE_SIZE;
pages = kzalloc(sizeof(struct page) * nr_pages, GFP_KERNEL);
+ if (!pages)
+ return -ENOMEM;
while (i < nr_pages) {
pages[i] = phys_to_page(start);
start += PAGE_SIZE;
pr_info("dump win == > %s\n", name);
filp = filp_open(name, flags, 0x600);
if (!filp)
- printk("fail to create %s\n", name);
+ pr_err("fail to create %s\n", name);
old_fs = get_fs();
set_fs(KERNEL_DS);
}
static ssize_t show_dump_buffer(struct device *dev,
- struct device_attribute *attr, char *buf)
+ struct device_attribute *attr, char *buf)
{
ssize_t 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"
continue;
}
if (!strncmp(p, "multi", 5)) {
- is_append = true;
- is_bmp = false;
+ is_append = false;
continue;
}
return PTR_ERR(dentry);
}
+ mutex_lock(&dev_drv->front_lock);
if (!num_frames) {
- mutex_lock(&dev_drv->front_lock);
-
if (!dev_drv->front_regs) {
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,
goto out;
}
front_regs = kmalloc(sizeof(*front_regs), GFP_KERNEL);
- if (!front_regs)
+ if (!front_regs) {
+ mutex_unlock(&dev_drv->front_lock);
return -ENOMEM;
+ }
memcpy(front_regs, dev_drv->front_regs, sizeof(*front_regs));
for (i = 0; i < front_regs->win_num; i++) {
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);
}
}
kfree(front_regs);
-
- mutex_unlock(&dev_drv->front_lock);
} else {
trace->num_frames = num_frames;
trace->count_frame = 0;
trace->mask_area = mask_area;
}
out:
-
+ mutex_unlock(&dev_drv->front_lock);
return count;
}
extern int __close_fd(struct files_struct *files, unsigned fd);
static ssize_t set_dsp_buffer(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
+ 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;
const char *start = buf;
struct ion_handle *handle = NULL;
char __iomem *screen_base;
- struct rk_fb_win_cfg_data win_config;
+ struct rk_fb_win_cfg_data *win_config = NULL;
struct rk_screen *screen = dev_drv->cur_screen;
int space_max = 10;
int format;
}
screen_base = ion_map_kernel(rk_fb->ion_client, handle);
read_buffer(filp, screen_base, mem_size, 0);
+ win_config =
+ kzalloc(sizeof(*win_config), GFP_KERNEL);
+ if (!win_config)
+ return -ENOMEM;
- memset(&win_config, 0, sizeof(win_config));
- win_config.wait_fs = 0;
- win_config.win_par[0].win_id = 0;
- win_config.win_par[0].z_order = 0;
- win_config.win_par[0].area_par[0].data_format = format;
- win_config.win_par[0].area_par[0].ion_fd = fd;
- win_config.win_par[0].area_par[0].x_offset = 0;
- win_config.win_par[0].area_par[0].y_offset = 0;
- win_config.win_par[0].area_par[0].xpos = 0;
- win_config.win_par[0].area_par[0].ypos = 0;
- win_config.win_par[0].area_par[0].xsize = screen->mode.xres;
- win_config.win_par[0].area_par[0].ysize = screen->mode.yres;
- win_config.win_par[0].area_par[0].xact = width;
- win_config.win_par[0].area_par[0].yact = height;
- win_config.win_par[0].area_par[0].xvir = width;
- win_config.win_par[0].area_par[0].yvir = height;
+ memset(win_config, 0, sizeof(struct rk_fb_win_cfg_data));
+ win_config->wait_fs = 0;
+ win_config->win_par[0].win_id = 0;
+ win_config->win_par[0].z_order = 0;
+ win_config->win_par[0].area_par[0].data_format = format;
+ win_config->win_par[0].area_par[0].ion_fd = fd;
+ win_config->win_par[0].area_par[0].x_offset = 0;
+ win_config->win_par[0].area_par[0].y_offset = 0;
+ win_config->win_par[0].area_par[0].xpos = 0;
+ win_config->win_par[0].area_par[0].ypos = 0;
+ win_config->win_par[0].area_par[0].xsize = screen->mode.xres;
+ win_config->win_par[0].area_par[0].ysize = screen->mode.yres;
+ win_config->win_par[0].area_par[0].xact = width;
+ win_config->win_par[0].area_par[0].yact = height;
+ win_config->win_par[0].area_par[0].xvir = width;
+ win_config->win_par[0].area_par[0].yvir = height;
for (i = 0; i < frame_num; i++) {
- win_config.win_par[0].area_par[0].y_offset = height * i;
+ win_config->win_par[0].area_par[0].y_offset = height * i;
fbi->fbops->fb_ioctl(fbi, RK_FBIOSET_CONFIG_DONE,
- (unsigned long)(&win_config));
+ (unsigned long)(win_config));
for (j = 0; j < RK_MAX_BUF_NUM; j++) {
- if (win_config.rel_fence_fd[j] > 0) {
+ if (win_config->rel_fence_fd[j] > 0) {
acq_fence =
- sync_fence_fdget(win_config.rel_fence_fd[j]);
+ sync_fence_fdget(win_config->rel_fence_fd[j]);
sync_fence_put(acq_fence);
}
}
- 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_fdget(win_config->ret_fence_fd);
sync_fence_put(acq_fence);
}
}
set_fs(old_fs);
filp_close(filp, NULL);
-
+ kfree(win_config);
return 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 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);
static ssize_t set_hwc_lut(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
- int hwc_lut[256];
+ int *hwc_lut = NULL;
const char *start = buf;
int i = 256, temp;
int space_max;
struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
+ hwc_lut = kzalloc(256 * 4, GFP_KERNEL);
+ if (!hwc_lut)
+ return -ENOMEM;
/*printk("count:%d\n>>%s\n\n",count,start);*/
for (i = 0; i < 256; i++) {
space_max = 15; /*max space number 15*/
}
if (dev_drv->ops->set_hwc_lut)
dev_drv->ops->set_hwc_lut(dev_drv, hwc_lut, 1);
+ kfree(hwc_lut);
return count;
}
static ssize_t set_cabc_lut(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
- int cabc_lut[256];
+ int *cabc_lut = NULL;
const char *start = buf;
int i = 256, temp;
int space_max = 10;
struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
+ cabc_lut = kzalloc(256 * 4, GFP_KERNEL);
+ if (!cabc_lut)
+ return -ENOMEM;
for (i = 0; i < 256; i++) {
temp = i;
/*init by default value*/
if (dev_drv->ops->set_cabc_lut)
dev_drv->ops->set_cabc_lut(dev_drv, cabc_lut);
+ kfree(cabc_lut);
return count;
}
static ssize_t set_dsp_lut(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
- int dsp_lut[256];
+ int *dsp_lut = NULL;
const char *start = buf;
int i = 256, temp;
int space_max = 10;
struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
+ dsp_lut = kzalloc(256 * 4, GFP_KERNEL);
+ if (!dsp_lut)
+ return -ENOMEM;
for (i = 0; i < 256; i++) {
temp = i;
/*init by default value*/
if (dev_drv->ops->set_dsp_lut)
dev_drv->ops->set_dsp_lut(dev_drv, dsp_lut);
+ kfree(dsp_lut);
return 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;
- int space_max, ret = 0, mode = 0, calc = 0, up = 0, down = 0, global = 0;
+ int space_max, ret = 0;
+ int mode = 0, calc = 0, up = 0, down = 0, global = 0;
const char *start = buf;
space_max = 10; /*max space number 10*/
start++;
global = simple_strtoul(start, NULL, 10);
- if (dev_drv->ops->set_dsp_cabc)
- ret = dev_drv->ops->set_dsp_cabc(dev_drv, mode, calc, up, down, global);
+ if (dev_drv->ops->set_dsp_cabc)
+ ret = dev_drv->ops->set_dsp_cabc(dev_drv, mode,
+ calc, up, down, global);
if (ret < 0)
return ret;
return snprintf(buf, PAGE_SIZE, "%d\n", dev_drv->id);
}
-static ssize_t show_win_property(struct device *dev,
+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);
__ATTR(disp_info, S_IRUGO, show_disp_info, NULL),
__ATTR(dump_buf, S_IRUGO | S_IWUSR, show_dump_buffer, set_dump_buffer),
__ATTR(dsp_buf, S_IRUGO | S_IWUSR, show_dsp_buffer, set_dsp_buffer),
- __ATTR(screen_info, S_IRUGO, show_screen_info, NULL),
+ __ATTR(screen_info, S_IRUGO | S_IWUSR,
+ show_screen_info, set_screen_info),
__ATTR(dual_mode, S_IRUGO, show_dual_mode, NULL),
__ATTR(enable, S_IRUGO | S_IWUSR, show_fb_state, set_fb_state),
__ATTR(overlay, S_IRUGO | S_IWUSR, show_overlay, set_overlay),
__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