#include <linux/rk_fb.h>
#include <linux/linux_logo.h>
#include <linux/dma-mapping.h>
+#include <linux/regulator/consumer.h>
#if defined(CONFIG_RK_HDMI)
#include "hdmi/rk_hdmi.h"
EXPORT_SYMBOL(video_data_to_mirroring);
#endif
-struct rk_fb_reg_win_data g_reg_win_data[4];
-static int g_last_win_num;
-static int g_first_buf = 1;
static struct rk_fb_trsm_ops *trsm_lvds_ops;
static struct rk_fb_trsm_ops *trsm_edp_ops;
static struct rk_fb_trsm_ops *trsm_mipi_ops;
return uboot_logo_on;
}
+int rk_fb_get_display_policy(void)
+{
+ struct rk_fb *rk_fb;
+
+ if (fb_pdev) {
+ rk_fb = platform_get_drvdata(fb_pdev);
+ return rk_fb->disp_policy;
+ } else {
+ return DISPLAY_POLICY_SDK;
+ }
+}
+
int rk_fb_trsm_ops_register(struct rk_fb_trsm_ops *ops, int type)
{
switch (type) {
} else {
pwr_ctr->pwr_ctr.type = REGULATOR;
-
+ pwr_ctr->pwr_ctr.rgl_name = NULL;
+ ret = of_property_read_string(child, "rockchip,regulator_name",
+ &(pwr_ctr->pwr_ctr.rgl_name));
+ if (ret || IS_ERR_OR_NULL(pwr_ctr->pwr_ctr.rgl_name))
+ dev_err(dev_drv->dev, "get regulator name failed!\n");
+ if (!of_property_read_u32(child, "rockchip,regulator_voltage", &val))
+ pwr_ctr->pwr_ctr.volt = val;
+ else
+ pwr_ctr->pwr_ctr.volt = 0;
}
};
- of_property_read_u32(child, "rockchip,delay", &val);
- pwr_ctr->pwr_ctr.delay = val;
+
+ if (!of_property_read_u32(child, "rockchip,delay", &val))
+ pwr_ctr->pwr_ctr.delay = val;
+ else
+ pwr_ctr->pwr_ctr.delay = 0;
list_add_tail(&pwr_ctr->list, &dev_drv->pwrlist_head);
}
struct list_head *pos;
struct rk_disp_pwr_ctr_list *pwr_ctr_list;
struct pwr_ctr *pwr_ctr;
+ struct regulator *regulator_lcd = NULL;
+ int count = 10;
+
if (list_empty(&dev_drv->pwrlist_head))
return 0;
list_for_each(pos, &dev_drv->pwrlist_head) {
if (pwr_ctr->type == GPIO) {
gpio_direction_output(pwr_ctr->gpio, pwr_ctr->atv_val);
mdelay(pwr_ctr->delay);
+ } else if (pwr_ctr->type == REGULATOR) {
+ if (pwr_ctr->rgl_name)
+ regulator_lcd = regulator_get(NULL, pwr_ctr->rgl_name);
+ if (regulator_lcd == NULL) {
+ dev_err(dev_drv->dev,
+ "%s: regulator get failed,regulator name:%s\n",
+ __func__, pwr_ctr->rgl_name);
+ continue;
+ }
+ regulator_set_voltage(regulator_lcd, pwr_ctr->volt, pwr_ctr->volt);
+ while (!regulator_is_enabled(regulator_lcd)) {
+ if (regulator_enable(regulator_lcd) == 0 || count == 0)
+ break;
+ else
+ dev_err(dev_drv->dev,
+ "regulator_enable failed,count=%d\n",
+ count);
+ count--;
+ }
+ regulator_put(regulator_lcd);
+ msleep(pwr_ctr->delay);
}
}
struct list_head *pos;
struct rk_disp_pwr_ctr_list *pwr_ctr_list;
struct pwr_ctr *pwr_ctr;
+ struct regulator *regulator_lcd = NULL;
+ int count = 10;
+
if (list_empty(&dev_drv->pwrlist_head))
return 0;
list_for_each(pos, &dev_drv->pwrlist_head) {
pwr_ctr_list = list_entry(pos, struct rk_disp_pwr_ctr_list,
list);
pwr_ctr = &pwr_ctr_list->pwr_ctr;
- if (pwr_ctr->type == GPIO)
+ if (pwr_ctr->type == GPIO) {
gpio_set_value(pwr_ctr->gpio, !pwr_ctr->atv_val);
+ } else if (pwr_ctr->type == REGULATOR) {
+ if (pwr_ctr->rgl_name)
+ regulator_lcd = regulator_get(NULL, pwr_ctr->rgl_name);
+ if (regulator_lcd == NULL) {
+ dev_err(dev_drv->dev,
+ "%s: regulator get failed,regulator name:%s\n",
+ __func__, pwr_ctr->rgl_name);
+ continue;
+ }
+ while (regulator_is_enabled(regulator_lcd) > 0) {
+ if (regulator_disable(regulator_lcd) == 0 || count == 0)
+ break;
+ else
+ dev_err(dev_drv->dev,
+ "regulator_disable failed,count=%d\n",
+ count);
+ count--;
+ }
+ regulator_put(regulator_lcd);
+ }
}
return 0;
}
strcpy(fmt, "XBGR888");
break;
case ABGR888:
- strcpy(fmt, "XBGR888");
+ strcpy(fmt, "ABGR888");
break;
default:
strcpy(fmt, "invalid");
static int rk_fb_open(struct fb_info *info, int user)
{
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
int win_id;
win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
- dev_drv->win[win_id]->logicalstate++;
+ fb_par->state++;
/* if this win aready opened ,no need to reopen */
if (dev_drv->win[win_id]->state)
return 0;
{
int fb_id = 0;
char *id = info->fix.id;
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
if (!strcmp(id, "fb0"))
fb_id = 0;
static int rk_fb_close(struct fb_info *info, int user)
{
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_lcdc_win *win = NULL;
int win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
if (win_id >= 0) {
- dev_drv->win[win_id]->logicalstate--;
- if (!dev_drv->win[win_id]->logicalstate) {
- win = dev_drv->win[win_id];
- info->fix.smem_start = win->reserved;
+ win = dev_drv->win[win_id];
+ fb_par->state--;
+ if (!fb_par->state) {
+ if (fb_par->fb_phy_base > 0)
+ info->fix.smem_start = fb_par->fb_phy_base;
info->var.xres = dev_drv->screen0->mode.xres;
info->var.yres = dev_drv->screen0->mode.yres;
/*
int dst_w, dst_h, dst_vir_w;
int ipp_fmt;
u8 data_format = (dst_info->var.nonstd) & 0xff;
- struct rk_lcdc_driver *ext_dev_drv =
- (struct rk_lcdc_driver *)dst_info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)dst_info->par;
+ struct rk_lcdc_driver *ext_dev_drv = fb_par->lcdc_drv;
u16 orientation = ext_dev_drv->rotate_mode;
memset(&ipp_req, 0, sizeof(struct rk29_ipp_req));
static void fb_copy_by_rga(struct fb_info *dst_info,
struct fb_info *src_info)
{
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)src_info->par;
- struct rk_lcdc_driver *ext_dev_drv =
- (struct rk_lcdc_driver *)dst_info->par;
+ struct rk_fb_par *src_fb_par = (struct rk_fb_par *)src_info->par;
+ struct rk_fb_par *dst_fb_par = (struct rk_fb_par *)dst_info->par;
+ struct rk_lcdc_driver *dev_drv = src_fb_par->lcdc_drv;
+ struct rk_lcdc_driver *ext_dev_drv = dst_fb_par->lcdc_drv;
int win_id = 0, ext_win_id;
struct rk_lcdc_win *src_win, *dst_win;
static int rk_fb_rotate(struct fb_info *dst_info,
struct fb_info *src_info)
{
+
#if defined(CONFIG_RK29_IPP)
fb_copy_by_ipp(dst_info, src_info);
#elif defined(CONFIG_ROCKCHIP_RGA) || defined(CONFIG_ROCKCHIP_RGA2)
{
struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
struct fb_info *ext_info = rk_fb->fb[(rk_fb->num_fb >> 1)];
+ struct rk_fb_par *ext_fb_par = (struct rk_fb_par *)ext_info->par;
struct rk_lcdc_driver *ext_dev_drv = rk_get_extend_lcdc_drv();
struct rk_lcdc_win *last_win;
static u8 fb_index = 0;
/* rotate mode */
if (!iommu_en) {
if (ext_win->id == 0) {
- ext_win->area[0].smem_start = rk_fb->ext_fb_phy_base;
+ ext_win->area[0].smem_start = ext_fb_par->fb_phy_base;
ext_win->area[0].y_offset = (get_rotate_fb_size() >> 1) * fb_index;
if ((++fb_index) > 1)
fb_index = 0;
struct fb_info *info)
{
struct rk_fb *rk_fb = dev_get_drvdata(info->device);
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_fb_par *extend_fb_par = NULL;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct fb_fix_screeninfo *fix = &info->fix;
struct fb_info *extend_info = NULL;
struct rk_lcdc_driver *extend_dev_drv = NULL;
if (rk_fb->disp_mode == DUAL) {
fb_id = get_extend_fb_id(info);
extend_info = rk_fb->fb[(rk_fb->num_fb >> 1) + fb_id];
- extend_dev_drv = (struct rk_lcdc_driver *)extend_info->par;
+ extend_fb_par = (struct rk_fb_par *)extend_info->par;
+ extend_dev_drv = extend_fb_par->lcdc_drv;
extend_win_id = dev_drv->ops->fb_get_win_id(extend_dev_drv,
extend_info->fix.id);
extend_win = extend_dev_drv->win[extend_win_id];
win->area[0].cbr_start = fix->mmio_start;
win->area[0].state = 1;
win->area_num = 1;
- win->state = 1;
dev_drv->ops->pan_display(dev_drv, win_id);
if (rk_fb->disp_mode == DUAL) {
- if (extend_win->state && hdmi_switch_complete) {
+ if (extend_info != info && extend_win->state &&
+ hdmi_switch_complete) {
rk_fb_set_ext_win_buffer(extend_win, win,
extend_dev_drv->rotate_mode,
extend_dev_drv->iommu_enabled);
if (err < 0)
printk("error waiting on fence\n");
}
-
+#if 0
static int rk_fb_copy_from_loader(struct fb_info *info)
{
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
void *dst = info->screen_base;
u32 dsp_addr[4];
u32 src;
- u32 i;
- struct rk_lcdc_win *win = dev_drv->win[0];
- u32 size = (win->area[0].xact) * (win->area[0].yact) << 2;
+ u32 i,size;
+ int win_id;
+ struct rk_lcdc_win *win;
+
+ win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
+ win = dev_drv->win[win_id];
+ size = (win->area[0].xact) * (win->area[0].yact) << 2;
dev_drv->ops->get_dsp_addr(dev_drv, dsp_addr);
- src = dsp_addr[0];
+ src = dsp_addr[win_id];
dev_info(info->dev, "copy fb data %d x %d from dst_addr:%08x\n",
win->area[0].xact, win->area[0].yact, src);
for (i = 0; i < size; i += PAGE_SIZE) {
void *to_virt = dst + i;
memcpy(to_virt, from_virt, PAGE_SIZE);
}
+ dev_drv->ops->direct_set_addr(dev_drv, win_id,
+ info->fix.smem_start);
return 0;
}
-
+#endif
#ifdef CONFIG_ROCKCHIP_IOMMU
static int g_last_addr[4];
int g_last_timeout;
index_buf = area_data->index_buf;
#if defined(CONFIG_ROCKCHIP_IOMMU)
if (dev_drv->iommu_enabled) {
+ if (rk_fb->disp_policy != DISPLAY_POLICY_BOX)
ion_unmap_iommu(dev_drv->dev, rk_fb->ion_client,
area_data->ion_handle);
freed_addr[freed_index++] = area_data->smem_start;
} else {
ext_win->area[0].xact = win->area[0].xact;
ext_win->area[0].yact = win->area[0].yact;
- ext_win->area[0].xvir = win->area[0].xvir;
- ext_win->area[0].yvir = win->area[0].yvir;
+ if (win->area[0].xvir == 0)
+ ext_win->area[0].xvir = win->area[0].xact;
+ else
+ ext_win->area[0].xvir = win->area[0].xvir;
+ if (win->area[0].yvir == 0)
+ ext_win->area[0].yvir = win->area[0].yact;
+ else
+ ext_win->area[0].yvir = win->area[0].yvir;
ext_win->area[0].y_vir_stride = win->area[0].y_vir_stride;
if (is_yuv)
ext_win->area[0].uv_vir_stride = win->area[0].uv_vir_stride;
win->g_alpha_val = reg_win_data->g_alpha_val;
for (i = 0; i < RK_WIN_MAX_AREA; i++) {
if (reg_win_data->reg_area_data[i].smem_start > 0) {
- win->area[i].ion_hdl =
+ if (inf->disp_policy != DISPLAY_POLICY_BOX)
+ win->area[i].ion_hdl =
reg_win_data->reg_area_data[i].ion_handle;
win->area[i].smem_start =
reg_win_data->reg_area_data[i].smem_start;
- if (inf->disp_mode == DUAL) {
+ if (inf->disp_mode == DUAL ||
+ inf->disp_policy == DISPLAY_POLICY_BOX) {
win->area[i].xpos =
reg_win_data->reg_area_data[i].xpos;
win->area[i].ypos =
reg_win_data->reg_area_data[i].ysize *
cur_screen->mode.yres /
primary_screen.mode.yres;
+
+ /* recalc display size if set hdmi scaler when at ONE_DUAL mode */
+ if (inf->disp_mode == ONE_DUAL && hdmi_switch_complete) {
+ if (cur_screen->xsize > 0 &&
+ cur_screen->xsize <= cur_screen->mode.xres) {
+ win->area[i].xpos =
+ ((cur_screen->mode.xres - cur_screen->xsize) >> 1) +
+ cur_screen->xsize * win->area[i].xpos / cur_screen->mode.xres;
+ win->area[i].xsize =
+ win->area[i].xsize * cur_screen->xsize / cur_screen->mode.xres;
+ }
+ if (cur_screen->ysize > 0 && cur_screen->ysize <= cur_screen->mode.yres) {
+ win->area[i].ypos =
+ ((cur_screen->mode.yres - cur_screen->ysize) >> 1) +
+ cur_screen->ysize * win->area[i].ypos / cur_screen->mode.yres;
+ win->area[i].ysize =
+ win->area[i].ysize * cur_screen->ysize / cur_screen->mode.yres;
+ }
+ }
}
win->area[i].xact =
reg_win_data->reg_area_data[i].xact;
win = dev_drv->win[i];
win_data = rk_fb_get_win_data(regs, i);
if (win_data) {
+ if (rk_fb->disp_policy == DISPLAY_POLICY_BOX &&
+ (win_data->data_format == YUV420 ||
+ win_data->data_format == YUV420_A))
+ continue;
+ mutex_lock(&dev_drv->win_config);
rk_fb_update_win(dev_drv, win, win_data);
win->state = 1;
dev_drv->ops->set_par(dev_drv, i);
dev_drv->ops->pan_display(dev_drv, i);
+ mutex_unlock(&dev_drv->win_config);
#if defined(CONFIG_ROCKCHIP_IOMMU)
if (dev_drv->iommu_enabled) {
g_last_addr[i] = win_data->reg_area_data[0].smem_start +
}
}
dev_drv->ops->ovl_mgr(dev_drv, 0, 1);
-
+ if (rk_fb->disp_policy == DISPLAY_POLICY_BOX)
+ dev_drv->ops->cfg_done(dev_drv);
if ((rk_fb->disp_mode == DUAL)
&& (hdmi_get_hotplug() == HDMI_HPD_ACTIVED)
&& hdmi_switch_complete) {
timeout = wait_event_interruptible_timeout(dev_drv->vsync_info.wait,
ktime_compare(dev_drv->vsync_info.timestamp, timestamp) > 0,
msecs_to_jiffies(25));
+ if ((rk_fb->disp_mode == DUAL) &&
+ (hdmi_get_hotplug() == HDMI_HPD_ACTIVED) &&
+ hdmi_switch_complete) {
+ /*
+ * If dual output, we need make sure the extend display
+ * cfg take effect before release fence.
+ */
+ ext_dev_drv = rk_get_extend_lcdc_drv();
+ timeout = wait_event_interruptible_timeout(ext_dev_drv->vsync_info.wait,
+ ktime_compare(ext_dev_drv->vsync_info.timestamp, timestamp) > 0,
+ msecs_to_jiffies(25));
+ }
+
dev_drv->ops->get_dsp_addr(dev_drv, dsp_addr);
wait_for_vsync = false;
for (i = 0; i < dev_drv->lcdc_win_num; i++) {
if (dev_drv->win[i]->state == 1) {
- u32 new_start =
- dev_drv->win[i]->area[0].smem_start +
- dev_drv->win[i]->area[0].y_offset;
- u32 reg_start = dsp_addr[i];
-
- if (unlikely(new_start != reg_start)) {
- wait_for_vsync = true;
- dev_info(dev_drv->dev,
- "win%d:new_addr:0x%08x cur_addr:0x%08x--%d\n",
- i, new_start, reg_start, 101 - count);
- break;
+ if (rk_fb->disp_policy == DISPLAY_POLICY_BOX &&
+ (dev_drv->win[i]->format == YUV420 ||
+ dev_drv->win[i]->format == YUV420_A ||
+ !strcmp(dev_drv->win[i]->name, "hwc"))) {
+ continue;
+ } else {
+ u32 new_start =
+ dev_drv->win[i]->area[0].smem_start +
+ dev_drv->win[i]->area[0].y_offset;
+ u32 reg_start = dsp_addr[i];
+
+ if ((rk_fb->disp_policy ==
+ DISPLAY_POLICY_BOX) &&
+ (new_start == 0x0 ||
+ dev_drv->suspend_flag))
+ continue;
+ if (unlikely(new_start != reg_start)) {
+ wait_for_vsync = true;
+ dev_info(dev_drv->dev,
+ "win%d:new_addr:0x%08x cur_addr:0x%08x--%d\n",
+ i, new_start, reg_start, 101 - count);
+ break;
+ }
}
}
}
#ifdef H_USE_FENCE
sw_sync_timeline_inc(dev_drv->timeline, 1);
#endif
- if (!g_first_buf) {
+ if (dev_drv->front_regs) {
#if defined(CONFIG_ROCKCHIP_IOMMU)
if (dev_drv->iommu_enabled) {
+ if (dev_drv->ops->mmu_en)
+ dev_drv->ops->mmu_en(dev_drv);
freed_index = 0;
g_last_timeout = timeout;
}
#endif
- for (i = 0; i < g_last_win_num; i++)
- rk_fb_free_dma_buf(dev_drv, &g_reg_win_data[i]);
+
+ mutex_lock(&dev_drv->front_lock);
+
+ for (i = 0; i < dev_drv->front_regs->win_num; i++) {
+ win_data = &dev_drv->front_regs->reg_win_data[i];
+ rk_fb_free_dma_buf(dev_drv, win_data);
+ }
+ kfree(dev_drv->front_regs);
+
+ mutex_unlock(&dev_drv->front_lock);
#if defined(CONFIG_ROCKCHIP_IOMMU)
if (dev_drv->iommu_enabled)
freed_addr[freed_index] = 0xfefefefe;
#endif
}
- for (i = 0; i < regs->win_num; i++) {
- memcpy(&g_reg_win_data[i], &(regs->reg_win_data[i]),
- sizeof(struct rk_fb_reg_win_data));
- }
- g_last_win_num = regs->win_num;
- g_first_buf = 0;
+
+ mutex_lock(&dev_drv->front_lock);
+
+ dev_drv->front_regs = regs;
+
+ mutex_unlock(&dev_drv->front_lock);
}
static void rk_fb_update_regs_handler(struct kthread_work *work)
list_for_each_entry_safe(data, next, &saved_list, list) {
rk_fb_update_reg(dev_drv, data);
list_del(&data->list);
- kfree(data);
}
if (dev_drv->wait_fs && list_empty(&dev_drv->update_regs_list))
{
struct rk_fb *rk_fb = dev_get_drvdata(info->device);
struct fb_fix_screeninfo *fix = &info->fix;
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_screen *screen = dev_drv->cur_screen;
struct rk_screen primary_screen;
struct fb_info *fbi = rk_fb->fb[0];
reg_win_data->win_id = -1;
}
- rk_fb_get_prmry_screen(&primary_screen);
+ rk_fb_get_prmry_screen(&primary_screen);
for (i = 0; i < reg_win_data->area_num; i++) {
- rk_fb_check_config_var(&win_par->area_par[i], &primary_screen);
+ if (rk_fb->disp_policy == DISPLAY_POLICY_BOX)
+ rk_fb_check_config_var(&win_par->area_par[i], screen);
+ else
+ rk_fb_check_config_var(&win_par->area_par[i], &primary_screen);
/* visiable pos in panel */
reg_win_data->reg_area_data[i].xpos = win_par->area_par[i].xpos;
reg_win_data->reg_area_data[i].ypos = win_par->area_par[i].ypos;
}
}
}
+
+ /* record buffer information for rk_fb_disp_scale to prevent fence timeout
+ * because rk_fb_disp_scale will call function info->fbops->fb_set_par(info);
+ */
+ info->var.yoffset = yoffset;
+ info->var.xoffset = xoffset;
return 0;
}
static int rk_fb_set_win_config(struct fb_info *info,
struct rk_fb_win_cfg_data *win_data)
{
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_fb_reg_data *regs;
#ifdef H_USE_FENCE
struct sync_fence *release_fence[RK_MAX_BUF_NUM];
mutex_lock(&dev_drv->output_lock);
if (!(dev_drv->suspend_flag == 0)) {
rk_fb_update_reg(dev_drv, regs);
- kfree(regs);
printk(KERN_INFO "suspend_flag = 1\n");
goto err;
}
} else if (ret == 0) {
rk_fb_update_reg(dev_drv, regs);
}
- kfree(regs);
}
err:
unsigned long arg)
{
struct rk_fb *rk_fb = dev_get_drvdata(info->device);
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_fb_par *extend_fb_par = NULL;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct fb_fix_screeninfo *fix = &info->fix;
int fb_id = 0, extend_win_id = 0;
struct fb_info *extend_info = NULL;
if (rk_fb->disp_mode == DUAL) {
fb_id = get_extend_fb_id(info);
extend_info = rk_fb->fb[(rk_fb->num_fb >> 1) + fb_id];
- extend_dev_drv = (struct rk_lcdc_driver *)extend_info->par;
+ extend_fb_par = (struct rk_fb_par *)extend_info->par;
+ extend_dev_drv = extend_fb_par->lcdc_drv;
extend_win_id = dev_drv->ops->fb_get_win_id(extend_dev_drv,
extend_info->fix.id);
extend_win = extend_dev_drv->win[extend_win_id];
u32 hwc_phy[1];
if (copy_from_user(hwc_phy, argp, 4))
return -EFAULT;
+#ifdef CONFIG_ROCKCHIP_IOMMU
if (!dev_drv->iommu_enabled) {
+#endif
fix->smem_start = hwc_phy[0];
+#ifdef CONFIG_ROCKCHIP_IOMMU
} else {
int usr_fd;
struct ion_handle *hdl;
fix->smem_start = phy_addr;
ion_hwc[0] = hdl;
}
+#endif
break;
}
case RK_FBIOSET_YUV_ADDR:
case RK_FBIOSET_ENABLE:
if (copy_from_user(&enable, argp, sizeof(enable)))
return -EFAULT;
+ if (enable)
+ fb_par->state++;
+ else
+ fb_par->state--;
dev_drv->ops->open(dev_drv, win_id, enable);
break;
case RK_FBIOGET_ENABLE:
}
case RK_FBIOGET_DMABUF_FD:
{
- int fd =
- ion_share_dma_buf_fd(rk_fb->ion_client,
- win->area[0].ion_hdl);
+ int fd = -1;
+
+ if (IS_ERR_OR_NULL(fb_par->ion_hdl)) {
+ dev_err(info->dev,
+ "get dma_buf fd failed,ion handle is err\n");
+ return PTR_ERR(fb_par->ion_hdl);
+ }
+ fd = ion_share_dma_buf_fd(rk_fb->ion_client,
+ fb_par->ion_hdl);
if (fd < 0) {
dev_err(info->dev,
"ion_share_dma_buf_fd failed\n");
}
#endif
case RK_FBIOSET_CLEAR_FB:
- memset(info->screen_base, 0, info->fix.smem_len);
+ memset(fb_par->fb_virt_base, 0, fb_par->fb_size);
break;
case RK_FBIOSET_CONFIG_DONE:
{
static int rk_fb_blank(int blank_mode, struct fb_info *info)
{
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct fb_fix_screeninfo *fix = &info->fix;
int win_id;
#if defined(CONFIG_RK_HDMI)
u8 __iomem *src;
int c, cnt = 0, err = 0;
unsigned long total_size;
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_lcdc_win *win = NULL;
int win_id = 0;
u8 __iomem *dst;
int c, cnt = 0, err = 0;
unsigned long total_size;
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_lcdc_win *win = NULL;
int win_id = 0;
* function: update extend info acorrding to primary info that only used for dual display mode
* @ext_info: the fb_info of extend screen
* @info: the fb_info of primary screen
+ * @update_buffer: whether to update extend info buffer, 0: no;1: yes
*/
static int rk_fb_update_ext_info(struct fb_info *ext_info,
- struct fb_info *info)
+ struct fb_info *info, int update_buffer)
{
struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
+ struct rk_fb_par *fb_par = NULL;
+ struct rk_fb_par *ext_fb_par = NULL;
struct rk_lcdc_driver *dev_drv = NULL;
struct rk_lcdc_driver *ext_dev_drv = NULL;
struct rk_lcdc_win *win = NULL;
if (unlikely(!info) || unlikely(!ext_info))
return -1;
- dev_drv = (struct rk_lcdc_driver *)info->par;
- ext_dev_drv = (struct rk_lcdc_driver *)ext_info->par;
+ fb_par = (struct rk_fb_par *)info->par;
+ ext_fb_par = (struct rk_fb_par *)ext_info->par;
+ dev_drv = fb_par->lcdc_drv;
+ ext_dev_drv = ext_fb_par->lcdc_drv;
if (unlikely(!dev_drv) || unlikely(!ext_dev_drv))
return -1;
ext_win = ext_dev_drv->win[ext_win_id];
rk_fb_update_ext_win(ext_dev_drv, dev_drv, ext_win, win);
- rk_fb_set_ext_win_buffer(ext_win, win, ext_dev_drv->rotate_mode,
- ext_dev_drv->iommu_enabled);
+ if (update_buffer) {
+ rk_fb_set_ext_win_buffer(ext_win, win, ext_dev_drv->rotate_mode,
+ ext_dev_drv->iommu_enabled);
- /* update extend info display address */
- ext_info->fix.smem_start = win->area[0].smem_start;
- ext_info->fix.mmio_start = win->area[0].cbr_start;
+ /* update extend info display address */
+ ext_info->fix.smem_start = ext_win->area[0].smem_start;
+ ext_info->fix.mmio_start = ext_win->area[0].cbr_start;
- if (ext_dev_drv->rotate_mode > X_Y_MIRROR)
- rk_fb_rotate(ext_info, info);
+ if (ext_dev_drv->rotate_mode > X_Y_MIRROR)
+ rk_fb_rotate(ext_info, info);
+ }
/* update extend info */
ext_info->var.xres = ext_win->area[0].xact;
{
struct fb_var_screeninfo *var = &info->var;
struct fb_fix_screeninfo *fix = &info->fix;
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_fb_par *extend_fb_par = NULL;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_fb *rk_fb = dev_get_drvdata(info->device);
int fb_id, extend_win_id = 0;
struct fb_info *extend_info = NULL;
if (rk_fb->disp_mode == DUAL) {
fb_id = get_extend_fb_id(info);
extend_info = rk_fb->fb[(rk_fb->num_fb >> 1) + fb_id];
- extend_dev_drv = (struct rk_lcdc_driver *)extend_info->par;
+ extend_fb_par = (struct rk_fb_par *)extend_info->par;
+ extend_dev_drv = extend_fb_par->lcdc_drv;
extend_win_id = dev_drv->ops->fb_get_win_id(extend_dev_drv,
extend_info->fix.id);
extend_win = extend_dev_drv->win[extend_win_id];
(win->format == ABGR888)) ? 1 : 0;
win->g_alpha_val = 0;
+ if (rk_fb->disp_policy == DISPLAY_POLICY_BOX &&
+ (win->format == YUV420 || win->format == YUV420_A))
+ win->state = 1;
if (rk_fb->disp_mode == DUAL) {
if (extend_win->state && hdmi_switch_complete) {
if (info != extend_info) {
static int rk_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
{
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
- int win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
- struct rk_lcdc_win *win;
- win = dev_drv->win[win_id];
+ struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct ion_handle *handle = fb_par->ion_hdl;
+ struct dma_buf *dma_buf = NULL;
+
+ if (IS_ERR_OR_NULL(handle)) {
+ dev_err(info->dev, "failed to get ion handle:%ld\n",
+ PTR_ERR(handle));
+ return -ENOMEM;
+ }
+ dma_buf = ion_share_dma_buf(rk_fb->ion_client, handle);
+ if (IS_ERR_OR_NULL(dma_buf)) {
+ printk("get ion share dma buf failed\n");
+ return -ENOMEM;
+ }
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
- return dma_buf_mmap(win->area[0].dma_buf, vma, 0);
+ return dma_buf_mmap(dma_buf, vma, 0);
}
static struct fb_ops fb_ops = {
struct device_attribute *attr, char *buf)
{
struct fb_info *fbi = dev_get_drvdata(dev);
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)fbi->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
return scnprintf(buf, PAGE_SIZE, "%llu\n",
ktime_to_ns(dev_drv->vsync_info.timestamp));
}
struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
struct fb_info *info = NULL;
struct fb_info *pmy_info = NULL;
+ struct rk_fb_par *fb_par = NULL;
+ struct rk_fb_par *pmy_fb_par = NULL;
struct rk_lcdc_driver *dev_drv = NULL;
- struct rk_lcdc_driver *pmy_dev_drv = rk_get_prmry_lcdc_drv();
char name[6] = {0};
int i, win_id, load_screen = 0;
- if (unlikely(!rk_fb) || unlikely(!pmy_dev_drv) || unlikely(!screen))
+ if (unlikely(!rk_fb) || unlikely(!screen))
return -ENODEV;
+ hdmi_switch_complete = 0;
/* get lcdc driver */
sprintf(name, "lcdc%d", lcdc_id);
if (rk_fb->disp_mode != DUAL)
if (screen->type == SCREEN_HDMI)
printk("hdmi %s lcdc%d\n", enable ? "connect to" : "remove from",
dev_drv->id);
- else if (screen->type == SCREEN_TVOUT)
+ else if (screen->type == SCREEN_TVOUT ||
+ screen->type == SCREEN_TVOUT_TEST )
printk("cvbs %s lcdc%d\n", enable ? "connect to" : "remove from",
dev_drv->id);
-
if (enable == 2 /*&& dev_drv->enable*/)
return 0;
if (rk_fb->disp_mode == ONE_DUAL) {
- if (dev_drv->trsm_ops && dev_drv->trsm_ops->disable)
- dev_drv->trsm_ops->disable();
+ if (dev_drv->ops->dsp_black)
+ dev_drv->ops->dsp_black(dev_drv, 1);
if (dev_drv->ops->set_screen_scaler)
dev_drv->ops->set_screen_scaler(dev_drv, dev_drv->screen0, 0);
}
if (rk_fb->disp_mode == ONE_DUAL) {
dev_drv->cur_screen = dev_drv->screen0;
dev_drv->ops->load_screen(dev_drv, 1);
- if (dev_drv->trsm_ops && dev_drv->trsm_ops->enable)
- dev_drv->trsm_ops->enable();
+
+ /* force modify dsp size */
+ info = rk_fb->fb[dev_drv->fb_index_base];
+ info->var.grayscale &= 0xff;
+ info->var.grayscale |=
+ (dev_drv->cur_screen->mode.xres << 8) +
+ (dev_drv->cur_screen->mode.yres << 20);
+ mutex_lock(&dev_drv->win_config);
+ info->fbops->fb_set_par(info);
+ info->fbops->fb_pan_display(&info->var, info);
+ mutex_unlock(&dev_drv->win_config);
+
+ if (dev_drv->ops->dsp_black)
+ dev_drv->ops->dsp_black(dev_drv, 0);
} else if (rk_fb->num_lcdc > 1) {
/* If there is more than one lcdc device, we disable
the layer which attached to this device */
dev_drv->cur_screen->x_mirror = dev_drv->rotate_mode & X_MIRROR;
dev_drv->cur_screen->y_mirror = dev_drv->rotate_mode & Y_MIRROR;
}
-
- for (i = 0; i < dev_drv->lcdc_win_num; i++) {
- info = rk_fb->fb[dev_drv->fb_index_base + i];
- win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
- if (dev_drv->win[win_id]) {
- if (rk_fb->disp_mode == DUAL) {
- if (dev_drv != pmy_dev_drv &&
- pmy_dev_drv->win[win_id]) {
- dev_drv->win[win_id]->logicalstate =
- pmy_dev_drv->win[win_id]->logicalstate;
- pmy_info = rk_fb->fb[pmy_dev_drv->fb_index_base + i];
+ if (!dev_drv->uboot_logo) {
+ for (i = 0; i < dev_drv->lcdc_win_num; i++) {
+ info = rk_fb->fb[dev_drv->fb_index_base + i];
+ fb_par = (struct rk_fb_par *)info->par;
+ win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
+ if (dev_drv->win[win_id]) {
+ if (rk_fb->disp_mode == DUAL) {
+ pmy_info = rk_fb->fb[i];
+ if (pmy_info != info) {
+ pmy_fb_par =
+ (struct rk_fb_par *)pmy_info->par;
+ fb_par->state = pmy_fb_par->state;
+ }
}
- }
- if (dev_drv->win[win_id]->logicalstate) {
- if (!dev_drv->win[win_id]->state)
- dev_drv->ops->open(dev_drv, win_id, 1);
- if (!load_screen) {
- dev_drv->ops->load_screen(dev_drv, 1);
- load_screen = 1;
+ if (fb_par->state) {
+ if (!dev_drv->win[win_id]->state)
+ dev_drv->ops->open(dev_drv, win_id, 1);
+ if (!load_screen) {
+ dev_drv->ops->load_screen(dev_drv, 1);
+ load_screen = 1;
+ }
+ info->var.activate |= FB_ACTIVATE_FORCE;
+ if (rk_fb->disp_mode == DUAL) {
+ rk_fb_update_ext_info(info, pmy_info, 1);
+ } else if (rk_fb->disp_mode == ONE_DUAL) {
+ info->var.grayscale &= 0xff;
+ info->var.grayscale |=
+ (dev_drv->cur_screen->xsize << 8) +
+ (dev_drv->cur_screen->ysize << 20);
+ }
+
+ mutex_lock(&dev_drv->win_config);
+ info->fbops->fb_set_par(info);
+ info->fbops->fb_pan_display(&info->var, info);
+ mutex_unlock(&dev_drv->win_config);
}
- info->var.activate |= FB_ACTIVATE_FORCE;
- if (rk_fb->disp_mode == DUAL)
- rk_fb_update_ext_info(info, pmy_info);
- info->fbops->fb_set_par(info);
- info->fbops->fb_pan_display(&info->var, info);
}
}
+ }else {
+ dev_drv->uboot_logo = 0;
}
-
hdmi_switch_complete = 1;
if (rk_fb->disp_mode == ONE_DUAL) {
if (dev_drv->ops->set_screen_scaler)
dev_drv->ops->set_screen_scaler(dev_drv, dev_drv->screen0, 1);
- if (dev_drv->trsm_ops && dev_drv->trsm_ops->enable)
- dev_drv->trsm_ops->enable();
+ if (dev_drv->ops->dsp_black)
+ dev_drv->ops->dsp_black(dev_drv, 0);
}
return 0;
}
dev_drv->cur_screen->xsize = screen_x * scale_x / 100;
dev_drv->cur_screen->ysize = screen_y * scale_y / 100;
if (inf->disp_mode == DUAL) {
- rk_fb_update_ext_info(info, pmy_info);
+ rk_fb_update_ext_info(info, pmy_info, 0);
} else {
var->nonstd &= 0xff;
var->nonstd |= (xpos << 8) + (ypos << 20);
}
}
+ mutex_lock(&dev_drv->win_config);
info->fbops->fb_set_par(info);
- /* info->fbops->fb_ioctl(info, RK_FBIOSET_CONFIG_DONE, 0); */
dev_drv->ops->cfg_done(dev_drv);
+ mutex_unlock(&dev_drv->win_config);
+
return 0;
}
unsigned long fb_mem_size)
{
struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)fbi->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct ion_handle *handle;
ion_phys_addr_t phy_addr;
size_t len;
PTR_ERR(handle));
return -ENOMEM;
}
+
+ fb_par->ion_hdl = handle;
win->area[0].dma_buf = ion_share_dma_buf(rk_fb->ion_client, handle);
if (IS_ERR_OR_NULL(win->area[0].dma_buf)) {
printk("ion_share_dma_buf() failed\n");
if (dev_drv->prop == PRMRY)
fbi->screen_base = ion_map_kernel(rk_fb->ion_client, handle);
#ifdef CONFIG_ROCKCHIP_IOMMU
- if (dev_drv->iommu_enabled)
+ if (dev_drv->iommu_enabled && dev_drv->mmu_dev)
ret = ion_map_iommu(dev_drv->dev, rk_fb->ion_client, handle,
(unsigned long *)&phy_addr,
(unsigned long *)&len);
}
fbi->fix.smem_start = phy_addr;
fbi->fix.smem_len = len;
- if (dev_drv->prop == PRMRY)
- rk_fb->fb_phy_base = phy_addr;
- else
- rk_fb->ext_fb_phy_base = phy_addr;
printk(KERN_INFO "alloc_buffer:ion_phy_addr=0x%lx\n", phy_addr);
return 0;
static int rk_fb_alloc_buffer(struct fb_info *fbi, int fb_id)
{
struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)fbi->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_lcdc_win *win = NULL;
int win_id;
int ret = 0;
fbi->fix.smem_len = fb_mem_size;
fbi->fix.smem_start = fb_mem_phys;
fbi->screen_base = fb_mem_virt;
- rk_fb->fb_phy_base = fb_mem_phys;
#endif
memset(fbi->screen_base, 0, fbi->fix.smem_len);
printk(KERN_INFO "fb%d:phy:%lx>>vir:%p>>len:0x%x\n", fb_id,
fbi->fix.smem_len = fb_mem_size;
fbi->fix.smem_start = fb_mem_phys;
fbi->screen_base = fb_mem_virt;
- rk_fb->ext_fb_phy_base = fb_mem_phys;
#endif
} else {
fbi->fix.smem_start = rk_fb->fb[0]->fix.smem_start;
fbi->fix.smem_len = rk_fb->fb[0]->fix.smem_len;
fbi->screen_base = rk_fb->fb[0]->screen_base;
- rk_fb->ext_fb_phy_base = rk_fb->fb_phy_base;
}
printk(KERN_INFO "fb%d:phy:%lx>>vir:%p>>len:0x%x\n", fb_id,
}
fbi->screen_size = fbi->fix.smem_len;
- win_id = dev_drv->ops->fb_get_win_id(dev_drv, fbi->fix.id);
- if (win_id >= 0) {
- win = dev_drv->win[win_id];
- win->reserved = fbi->fix.smem_start;
- }
+ fb_par->fb_phy_base = fbi->fix.smem_start;
+ fb_par->fb_virt_base = fbi->screen_base;
+ fb_par->fb_size = fbi->fix.smem_len;
return ret;
}
init_completion(&dev_drv->frame_done);
spin_lock_init(&dev_drv->cpl_lock);
mutex_init(&dev_drv->fb_win_id_mutex);
+ mutex_init(&dev_drv->win_config);
+ mutex_init(&dev_drv->front_lock);
dev_drv->ops->fb_win_remap(dev_drv, dev_drv->fb_win_map);
dev_drv->first_frame = 1;
dev_drv->overscan.left = 100;
{
struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
struct fb_info *fbi;
+ struct rk_fb_par *fb_par = NULL;
int i = 0, ret = 0, index = 0;
-/*
-#if defined(CONFIG_ROCKCHIP_IOMMU)
- struct device *mmu_dev = NULL;
-#endif
-*/
+
if (rk_fb->num_lcdc == RK30_MAX_LCDC_SUPPORT)
return -ENXIO;
dev_err(&fb_pdev->dev, "fb framebuffer_alloc fail!");
ret = -ENOMEM;
}
- fbi->par = dev_drv;
+ fb_par = devm_kzalloc(&fb_pdev->dev, sizeof(struct rk_fb_par),
+ GFP_KERNEL);
+ if (!fb_par) {
+ dev_err(&fb_pdev->dev, "malloc fb_par for fb%d fail!",
+ rk_fb->num_fb);
+ return -ENOMEM;
+ }
+ fb_par->id = rk_fb->num_fb;
+ fb_par->lcdc_drv = dev_drv;
+ fbi->par = (void *)fb_par;
fbi->var = def_var;
fbi->fix = def_fix;
sprintf(fbi->fix.id, "fb%d", rk_fb->num_fb);
}
/* show logo for primary display device */
-#if !defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_LOGO)
+#if !defined(CONFIG_FRAMEBUFFER_CONSOLE)
if (dev_drv->prop == PRMRY) {
struct fb_info *main_fbi = rk_fb->fb[0];
main_fbi->fbops->fb_open(main_fbi, 1);
#endif
rk_fb_alloc_buffer(main_fbi, 0); /* only alloc memory for main fb */
+ dev_drv->uboot_logo = support_uboot_display();
+#if !defined(CONFIG_LOGO)
if (support_uboot_display()) {
- rk_fb_copy_from_loader(main_fbi);
- dev_drv->ops->direct_set_addr(dev_drv, 0,
- main_fbi->fix.smem_start);
+ /*
+ if (dev_drv->iommu_enabled)
+ rk_fb_copy_from_loader(main_fbi);
+ */
return 0;
}
+#else
main_fbi->fbops->fb_set_par(main_fbi);
#if defined(CONFIG_LOGO_LINUX_BMP)
if (fb_prewine_bmp_logo(main_fbi, FB_ROTATE_UR)) {
}
#endif
main_fbi->fbops->fb_pan_display(&main_fbi->var, main_fbi);
+#endif
} else {
struct fb_info *extend_fbi = rk_fb->fb[rk_fb->num_fb >> 1];
int extend_fb_id = get_extend_fb_id(extend_fbi);
dev_err(&pdev->dev, "no disp-mode node found!");
return -ENODEV;
}
+
+ if (!of_property_read_u32(np, "rockchip,disp-policy", &mode)) {
+ rk_fb->disp_policy = mode;
+ pr_info("fb disp policy is %s\n", rk_fb->disp_policy ? "box":"sdk");
+ }
if (!of_property_read_u32(np, "rockchip,uboot-logo-on", &uboot_logo_on))
printk(KERN_DEBUG "uboot-logo-on:%d\n", uboot_logo_on);