video: rockchip: hdmi: v2: improved the hdmi nlpcm_mode for bitstream output
[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / rk_fb.c
index 0e0a3d2b25a9876acfcc06cb5aba968e95912992..4a838803dc1ed809d5992c836a78b2f9d7badee6 100644 (file)
@@ -31,6 +31,8 @@
 #include <linux/linux_logo.h>
 #include <linux/dma-mapping.h>
 #include <linux/regulator/consumer.h>
+#include <linux/of_address.h>
+#include <linux/memblock.h>
 
 #include "bmp_helper.h"
 
@@ -88,6 +90,12 @@ module_param(rk_fb_iommu_debug, int, S_IRUGO | S_IWUSR);
 static int rk_fb_config_debug(struct rk_lcdc_driver *dev_drv,
                              struct rk_fb_win_cfg_data *win_data,
                              struct rk_fb_reg_data *regs, u32 cmd);
+static int car_reversing;
+
+static int is_car_camcap(void) {
+       return car_reversing && strcmp("camcap", current->comm);
+}
+
 int support_uboot_display(void)
 {
        return uboot_logo_on;
@@ -192,6 +200,12 @@ int rk_fb_pixel_width(int data_format)
        case YUV444_A:
                pixel_width = 8;
                break;
+       case YUYV422:
+       case UYVY422:
+       case YUYV420:
+       case UYVY420:
+               pixel_width = 16;
+               break;
        default:
                pr_warn("%s: unsupported format: 0x%x\n",
                        __func__, data_format);
@@ -202,7 +216,7 @@ int rk_fb_pixel_width(int data_format)
 
 static int rk_fb_data_fmt(int data_format, int bits_per_pixel)
 {
-       int fb_data_fmt;
+       int fb_data_fmt = 0;
 
        if (data_format) {
                switch (data_format) {
@@ -263,6 +277,18 @@ static int rk_fb_data_fmt(int data_format, int bits_per_pixel)
                case HAL_PIXEL_FORMAT_FBDC_U8U8U8:      /* fbdc rgb888 */
                        fb_data_fmt = FBDC_RGBX_888;
                        break;
+               case HAL_PIXEL_FORMAT_YUYV422:          /* yuyv422 */
+                       fb_data_fmt = YUYV422;
+                       break;
+               case HAL_PIXEL_FORMAT_YUYV420:          /* yuyv420 */
+                       fb_data_fmt = YUYV420;
+                       break;
+               case HAL_PIXEL_FORMAT_UYVY422:          /* uyvy422 */
+                       fb_data_fmt = UYVY422;
+                       break;
+               case HAL_PIXEL_FORMAT_UYVY420:          /* uyvy420 */
+                       fb_data_fmt = UYVY420;
+                       break;
                default:
                        pr_warn("%s: unsupported format: 0x%x\n",
                                __func__, data_format);
@@ -477,6 +503,8 @@ int rk_fb_video_mode_from_timing(const struct display_timing *dt,
        screen->lvds_format = dt->lvds_format;
        screen->face = dt->face;
        screen->color_mode = dt->color_mode;
+       screen->width = dt->screen_widt;
+       screen->height = dt->screen_hight;
        screen->dsp_lut = dt->dsp_lut;
        screen->cabc_lut = dt->cabc_lut;
        screen->cabc_gamma_base = dt->cabc_gamma_base;
@@ -602,6 +630,18 @@ char *get_format_string(enum data_format format, char *fmt)
        case FBDC_RGBX_888:
                strcpy(fmt, "FBDC_RGBX_888");
                break;
+       case YUYV422:
+               strcpy(fmt, "YUYV422");
+               break;
+       case YUYV420:
+               strcpy(fmt, "YUYV420");
+               break;
+       case UYVY422:
+               strcpy(fmt, "UYVY422");
+               break;
+       case UYVY420:
+               strcpy(fmt, "UYVY420");
+               break;
        default:
                strcpy(fmt, "invalid");
                break;
@@ -610,6 +650,34 @@ char *get_format_string(enum data_format format, char *fmt)
        return fmt;
 }
 
+int rk_fb_set_vop_pwm(void)
+{
+       int i = 0;
+       struct rk_fb *inf = NULL;
+       struct rk_lcdc_driver *dev_drv = NULL;
+
+       if (likely(fb_pdev))
+               inf = platform_get_drvdata(fb_pdev);
+       else
+               return -1;
+
+       for (i = 0; i < inf->num_lcdc; i++) {
+               if (inf->lcdc_dev_drv[i]->cabc_mode == 1) {
+                       dev_drv = inf->lcdc_dev_drv[i];
+                       break;
+               }
+       }
+
+       if (!dev_drv)
+               return -1;
+
+       mutex_lock(&dev_drv->win_config);
+       dev_drv->ops->cfg_done(dev_drv);
+       mutex_unlock(&dev_drv->win_config);
+
+       return 0;
+}
+
 /*
  * this is for hdmi
  * name: lcdc device name ,lcdc0 , lcdc1
@@ -1312,7 +1380,7 @@ static int rk_fb_pan_display(struct fb_var_screeninfo *var,
        u16 uv_x_off, uv_y_off, uv_y_act;
        u8 is_pic_yuv = 0;
 
-       if (dev_drv->suspend_flag)
+       if (dev_drv->suspend_flag || is_car_camcap())
                return 0;
        win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
        if (win_id < 0)
@@ -1626,6 +1694,7 @@ static void rk_fb_update_win(struct rk_lcdc_driver *dev_drv,
                                win->area[i].smem_start =
                                        reg_win_data->reg_area_data[i].smem_start;
                                if (inf->disp_mode == DUAL ||
+                                   inf->disp_mode == DUAL_LCD ||
                                    inf->disp_mode == NO_DUAL) {
                                        win->area[i].xpos =
                                                reg_win_data->reg_area_data[i].xpos;
@@ -1697,6 +1766,7 @@ static void rk_fb_update_win(struct rk_lcdc_driver *dev_drv,
                                }
                        } else {
                                win->area[i].state = 0;
+                               win->area[i].fbdc_en = 0;
                                if (dev_drv->iommu_enabled) {
                                        g_now_config_addr[win->id][i] = 0;
                                        g_now_config_state[win->id][i] = 0;
@@ -1863,21 +1933,22 @@ static void rk_fb_update_reg(struct rk_lcdc_driver *dev_drv,
                }
        }
 
+       mutex_lock(&dev_drv->win_config);
        for (i = 0; i < dev_drv->lcdc_win_num; i++) {
                win = dev_drv->win[i];
                win_data = rk_fb_get_win_data(regs, i);
                if (win_data) {
-                       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);
                } else {
                        win->z_order = -1;
                        win->state = 0;
-                       for (j = 0; j < 4; j++)
+                       for (j = 0; j < 4; j++) {
                                win->area[j].state = 0;
+                               win->area[j].fbdc_en = 0;
+                       }
                        if (dev_drv->iommu_enabled) {
                                for (j = 0; j < 4; j++) {
                                        g_now_config_addr[i][j] = 0;
@@ -1902,6 +1973,7 @@ static void rk_fb_update_reg(struct rk_lcdc_driver *dev_drv,
                dev_drv->ops->cfg_done(dev_drv);
        else
                sw_sync_timeline_inc(dev_drv->timeline, 1);
+       mutex_unlock(&dev_drv->win_config);
 
        do {
                timestamp = dev_drv->vsync_info.timestamp;
@@ -2161,24 +2233,24 @@ static int rk_fb_set_win_buffer(struct fb_info *info,
        struct rk_screen *screen = dev_drv->cur_screen;/*screen0;*/
        struct fb_info *fbi;
        int i, ion_fd, acq_fence_fd;
-       u32 xvir, yvir;
-       u32 xoffset, yoffset;
+       u32 xvir = 0, yvir = 0;
+       u32 xoffset = 0, yoffset = 0;
 
        struct ion_handle *hdl;
        size_t len;
-       int index_buf;
-       u8 fb_data_fmt;
-       u8 pixel_width;
-       u32 vir_width_bit;
-       u32 stride, uv_stride;
-       u32 stride_32bit_1;
-       u32 stride_32bit_2;
-       u16 uv_x_off, uv_y_off, uv_y_act;
+       int index_buf = 0;
+       u8 fb_data_fmt = 0;
+       u8 pixel_width = 0;
+       u32 vir_width_bit = 0;
+       u32 stride = 0, uv_stride = 0;
+       u32 stride_32bit_1 = 0;
+       u32 stride_32bit_2 = 0;
+       u16 uv_x_off = 0, uv_y_off = 0, uv_y_act = 0;
        u8 is_pic_yuv = 0;
        u8 ppixel_a = 0, global_a = 0;
        ion_phys_addr_t phy_addr;
        int ret = 0;
-       int buff_len;
+       int buff_len = 0;
 
        reg_win_data->reg_area_data[0].smem_start = -1;
        reg_win_data->area_num = 0;
@@ -2191,8 +2263,10 @@ static int rk_fb_set_win_buffer(struct fb_info *info,
                                    ion_import_dma_buf(rk_fb->ion_client,
                                                       ion_fd);
                                if (IS_ERR(hdl)) {
-                                       pr_info("%s: Could not import handle:"
-                                               " %ld\n", __func__, (long)hdl);
+                                       pr_info("%s: win[%d]area[%d] can't import handle\n",
+                                               __func__, win_par->win_id, i);
+                                       pr_info("fd: %d, hdl: 0x%p, ion_client: 0x%p\n",
+                                               ion_fd, hdl, rk_fb->ion_client);
                                        return -EINVAL;
                                        break;
                                }
@@ -2612,6 +2686,7 @@ err_null_frame:
        win_data->ret_fence_fd = -1;
        pr_info("win num = %d,null frame\n", regs->win_num);
 err2:
+       rk_fb_config_debug(dev_drv, win_data, regs, 0);
        kfree(regs);
        mutex_unlock(&dev_drv->output_lock);
 
@@ -2838,9 +2913,11 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd,
        case RK_FBIOSET_VSYNC_ENABLE:
                if (copy_from_user(&enable, argp, sizeof(enable)))
                        return -EFAULT;
-               dev_drv->vsync_info.active = enable;
+               if (enable)
+                       dev_drv->vsync_info.active++;
+               else
+                       dev_drv->vsync_info.active--;
                break;
-
        case RK_FBIOGET_DSP_ADDR:
                dev_drv->ops->get_dsp_addr(dev_drv, dsp_addr);
                if (copy_to_user(argp, &dsp_addr, sizeof(dsp_addr)))
@@ -2910,6 +2987,15 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd,
                        if (cfgdone_index >= 10)
                                cfgdone_index = 0;
                }
+               if (is_car_camcap()) {
+                       int i = 0;
+
+                       for (i = 0; i < RK_MAX_BUF_NUM; i++)
+                               win_data.rel_fence_fd[i] = -1;
+
+                       win_data.ret_fence_fd = -1;
+                       goto cam_exit;
+               }
                if (copy_from_user(&win_data,
                                   (struct rk_fb_win_cfg_data __user *)argp,
                                   sizeof(win_data))) {
@@ -2920,6 +3006,7 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd,
                dev_drv->wait_fs = win_data.wait_fs;
                ret = rk_fb_set_win_config(info, &win_data);
 
+cam_exit:
                if (copy_to_user((struct rk_fb_win_cfg_data __user *)arg,
                                 &win_data, sizeof(win_data))) {
                        ret = -EFAULT;
@@ -2949,6 +3036,8 @@ static int rk_fb_blank(int blank_mode, struct fb_info *info)
        struct rk_fb *rk_fb = dev_get_drvdata(info->device);
 #endif
 
+       if (is_car_camcap())
+               return 0;
        win_id = dev_drv->ops->fb_get_win_id(dev_drv, fix->id);
        if (win_id < 0)
                return -ENODEV;
@@ -3152,15 +3241,15 @@ static int rk_fb_set_par(struct fb_info *info)
        u32 xvir = var->xres_virtual;
        u8 data_format = var->nonstd & 0xff;
        u8 fb_data_fmt;
-       u8 pixel_width;
+       u8 pixel_width = 0;
        u32 vir_width_bit;
-       u32 stride, uv_stride;
+       u32 stride, uv_stride = 0;
        u32 stride_32bit_1;
        u32 stride_32bit_2;
        u16 uv_x_off, uv_y_off, uv_y_act;
        u8 is_pic_yuv = 0;
        /*var->pixclock = dev_drv->pixclock;*/
-       if (dev_drv->suspend_flag)
+       if (dev_drv->suspend_flag || is_car_camcap())
                return 0;
        win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
        if (win_id < 0)
@@ -3380,7 +3469,7 @@ static int rk_fb_wait_for_vsync_thread(void *data)
                ktime_t timestamp = dev_drv->vsync_info.timestamp;
                int ret = wait_event_interruptible(dev_drv->vsync_info.wait,
                                !ktime_equal(timestamp, dev_drv->vsync_info.timestamp) &&
-                               (dev_drv->vsync_info.active || dev_drv->vsync_info.irq_stop));
+                               (dev_drv->vsync_info.active > 0 || dev_drv->vsync_info.irq_stop));
 
                if (!ret)
                        sysfs_notify(&fbi->dev->kobj, NULL, "vsync");
@@ -3518,10 +3607,10 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
                }
        }
 
-       envp[0] = "switch screen";
+       envp[0] = "switch vop screen";
        memset(envplcdc, 0, sizeof(envplcdc));
        memset(envpfbdev, 0, sizeof(envpfbdev));
-       sprintf(envplcdc, "SCREEN=%d,ENABLE=%d", screen->type, enable);
+       sprintf(envplcdc, "SCREEN=%d,ENABLE=%d,VOPID=%d", screen->type, enable, dev_drv->id);
        sprintf(envpfbdev, "FBDEV=%d", dev_drv->fb_index_base);
        envp[1] = envplcdc;
        envp[2] = envpfbdev;
@@ -3591,7 +3680,6 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
                        /* If there is more than one lcdc device, we disable
                         *  the layer which attached to this device
                         */
-                       dev_drv->suspend_flag = 1;
                        flush_kthread_worker(&dev_drv->update_regs_worker);
                        for (i = 0; i < dev_drv->lcdc_win_num; i++) {
                                if (dev_drv->win[i] && dev_drv->win[i]->state)
@@ -3605,6 +3693,13 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
                mutex_unlock(&dev_drv->switch_screen);
                return 0;
        } else {
+               if (load_screen || (rk_fb->disp_policy != DISPLAY_POLICY_BOX)) {
+                       for (i = 0; i < dev_drv->lcdc_win_num; i++) {
+                               if (dev_drv->win[i] && dev_drv->win[i]->state &&
+                                       dev_drv->ops->win_direct_en)
+                                       dev_drv->ops->win_direct_en(dev_drv, i, 0);
+                       }
+               }
                if (dev_drv->uboot_logo) {
                        if (dev_drv->cur_screen->mode.xres !=
                                screen->mode.xres ||
@@ -3621,51 +3716,40 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
                dev_drv->cur_screen->x_mirror = dev_drv->rotate_mode & X_MIRROR;
                dev_drv->cur_screen->y_mirror = dev_drv->rotate_mode & Y_MIRROR;
        }
+
        if (!dev_drv->uboot_logo || load_screen ||
            (rk_fb->disp_policy != DISPLAY_POLICY_BOX)) {
-               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);
-                       win = dev_drv->win[win_id];
-                       if (win && fb_par->state) {
-                               dev_drv->ops->load_screen(dev_drv, 1);
-
-                               info->var.activate |= FB_ACTIVATE_FORCE;
-                               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);
-                               }
-                               if (dev_drv->uboot_logo && win->state) {
-                                       if (win->area[0].xpos ||
-                                           win->area[0].ypos) {
-                                               win->area[0].xpos =
-                                                       (screen->mode.xres -
-                                                        win->area[0].xsize) / 2;
-                                               win->area[0].ypos =
-                                                       (screen->mode.yres -
-                                                        win->area[0].ysize) / 2;
-                                       } else {
-                                               win->area[0].xsize =
-                                                       screen->mode.xres;
-                                               win->area[0].ysize =
-                                                       screen->mode.yres;
-                                       }
-                                       dev_drv->ops->set_par(dev_drv, i);
-                                       dev_drv->ops->cfg_done(dev_drv);
-                               } else if (!dev_drv->win[win_id]->state) {
-                                       dev_drv->ops->open(dev_drv, win_id, 1);
-                                       dev_drv->suspend_flag = 0;
-                                       mutex_lock(&dev_drv->win_config);
-                                       info->var.xoffset = 0;
-                                       info->var.yoffset = 0;
-                                       info->fbops->fb_set_par(info);
-                                       info->fbops->fb_pan_display(&info->var,
-                                                                   info);
-                                       mutex_unlock(&dev_drv->win_config);
+               info = rk_fb->fb[dev_drv->fb_index_base];
+               fb_par = (struct rk_fb_par *)info->par;
+               win_id = 0;
+               win = dev_drv->win[win_id];
+               if (win && fb_par->state) {
+                       dev_drv->ops->load_screen(dev_drv, 1);
+                       info->var.activate |= FB_ACTIVATE_FORCE;
+                       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);
+                       }
+                       if (dev_drv->uboot_logo && win->state) {
+                               if (win->area[0].xpos ||
+                                   win->area[0].ypos) {
+                                       win->area[0].xpos =
+                                               (screen->mode.xres -
+                                                win->area[0].xsize) / 2;
+                                       win->area[0].ypos =
+                                               (screen->mode.yres -
+                                                win->area[0].ysize) / 2;
+                               } else {
+                                       win->area[0].xsize = screen->mode.xres;
+                                       win->area[0].ysize = screen->mode.yres;
                                }
+                               dev_drv->ops->set_par(dev_drv, i);
+                               dev_drv->ops->cfg_done(dev_drv);
+                       } else if (!dev_drv->win[win_id]->state) {
+                               dev_drv->ops->open(dev_drv, win_id, 1);
+                               info->fbops->fb_pan_display(&info->var, info);
                        }
                }
        } else {
@@ -4090,9 +4174,28 @@ bool is_prmry_rk_lcdc_registered(void)
                return false;
 }
 
-__weak phys_addr_t uboot_logo_base;
-__weak phys_addr_t uboot_logo_size;
-__weak phys_addr_t uboot_logo_offset;
+phys_addr_t uboot_logo_base;
+phys_addr_t uboot_logo_size;
+phys_addr_t uboot_logo_offset;
+
+static int __init rockchip_uboot_mem_late_init(void)
+{
+       int err;
+
+       if (uboot_logo_size) {
+               void *start = phys_to_virt(uboot_logo_base);
+               void *end = phys_to_virt(uboot_logo_base + uboot_logo_size);
+
+               err = memblock_free(uboot_logo_base, uboot_logo_size);
+               if (err < 0)
+                       pr_err("%s: freeing memblock failed: %d\n",
+                              __func__, err);
+               free_reserved_area(start, end, -1, "logo");
+       }
+       return 0;
+}
+
+late_initcall(rockchip_uboot_mem_late_init);
 
 int rk_fb_register(struct rk_lcdc_driver *dev_drv,
                   struct rk_lcdc_win *win, int id)
@@ -4102,6 +4205,7 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
        struct rk_fb_par *fb_par = NULL;
        int i = 0, ret = 0, index = 0;
        unsigned long flags;
+       char time_line_name[16];
 
        if (rk_fb->num_lcdc == RK30_MAX_LCDC_SUPPORT)
                return -ENXIO;
@@ -4138,6 +4242,14 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
                fbi->fix = def_fix;
                sprintf(fbi->fix.id, "fb%d", rk_fb->num_fb);
                fb_videomode_to_var(&fbi->var, &dev_drv->cur_screen->mode);
+               if (dev_drv->dsp_mode == ONE_VOP_DUAL_MIPI_VER_SCAN) {
+                       fbi->var.xres /= 2;
+                       fbi->var.yres *= 2;
+                       fbi->var.xres_virtual /= 2;
+                       fbi->var.yres_virtual *= 2;
+               }
+               fbi->var.width = dev_drv->cur_screen->width;
+               fbi->var.height = dev_drv->cur_screen->height;
                fbi->var.grayscale |=
                    (fbi->var.xres << 8) + (fbi->var.yres << 20);
 #if defined(CONFIG_LOGO_LINUX_BMP)
@@ -4147,8 +4259,6 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
 #endif
                fbi->fix.line_length =
                    (fbi->var.xres_virtual) * (fbi->var.bits_per_pixel >> 3);
-               fbi->var.width = dev_drv->cur_screen->width;
-               fbi->var.height = dev_drv->cur_screen->height;
                if (dev_drv->iommu_enabled)
                        fb_ops.fb_mmap = rk_fb_mmap;
                fbi->fbops = &fb_ops;
@@ -4187,6 +4297,7 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
                        mutex_init(&dev_drv->output_lock);
 
                        INIT_LIST_HEAD(&dev_drv->update_regs_list);
+                       INIT_LIST_HEAD(&dev_drv->saved_list);
                        mutex_init(&dev_drv->update_regs_list_lock);
                        init_kthread_worker(&dev_drv->update_regs_worker);
 
@@ -4203,8 +4314,10 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
                        init_kthread_work(&dev_drv->update_regs_work,
                                          rk_fb_update_regs_handler);
 
+                       snprintf(time_line_name, sizeof(time_line_name),
+                                "vop%d-timeline", id);
                        dev_drv->timeline =
-                           sw_sync_timeline_create("fb-timeline");
+                           sw_sync_timeline_create(time_line_name);
                        dev_drv->timeline_max = 1;
                }
        }
@@ -4250,8 +4363,7 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
                                start += PAGE_SIZE;
                                i++;
                        }
-                       vaddr = vmap(pages, nr_pages, VM_MAP,
-                                    pgprot_writecombine(PAGE_KERNEL));
+                       vaddr = vmap(pages, nr_pages, VM_MAP, PAGE_KERNEL);
                        if (!vaddr) {
                                pr_err("failed to vmap phy addr 0x%lx\n",
                                       (long)(uboot_logo_base +
@@ -4325,8 +4437,7 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
                                start += PAGE_SIZE;
                                i++;
                        }
-                       vaddr = vmap(pages, nr_pages, VM_MAP,
-                                    pgprot_writecombine(PAGE_KERNEL));
+                       vaddr = vmap(pages, nr_pages, VM_MAP, PAGE_KERNEL);
                        if (!vaddr) {
                                pr_err("failed to vmap phy addr 0x%x\n",
                                       start);
@@ -4382,13 +4493,15 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
                struct fb_info *extend_fbi = rk_fb->fb[dev_drv->fb_index_base];
 
                extend_fbi->var.pixclock = rk_fb->fb[0]->var.pixclock;
-               extend_fbi->fbops->fb_open(extend_fbi, 1);
-               if (dev_drv->iommu_enabled) {
-                       if (dev_drv->mmu_dev)
-                               rockchip_iovmm_set_fault_handler(dev_drv->dev,
-                                                                rk_fb_sysmmu_fault_handler);
+               if (rk_fb->disp_mode == DUAL_LCD) {
+                       extend_fbi->fbops->fb_open(extend_fbi, 1);
+                       if (dev_drv->iommu_enabled) {
+                               if (dev_drv->mmu_dev)
+                                       rockchip_iovmm_set_fault_handler(dev_drv->dev,
+                                                                        rk_fb_sysmmu_fault_handler);
+                       }
+                       rk_fb_alloc_buffer(extend_fbi);
                }
-               rk_fb_alloc_buffer(extend_fbi);
        }
 #endif
        return 0;
@@ -4422,11 +4535,35 @@ int rk_fb_unregister(struct rk_lcdc_driver *dev_drv)
        return 0;
 }
 
+int rk_fb_set_car_reverse_status(struct rk_lcdc_driver *dev_drv,
+                                int status)
+{
+       char *envp[3] = {"Request", "FORCE UPDATE", NULL};
+
+       if (status) {
+               car_reversing = 1;
+               flush_kthread_worker(&dev_drv->update_regs_worker);
+               dev_drv->timeline_max++;
+#ifdef H_USE_FENCE
+               sw_sync_timeline_inc(dev_drv->timeline, 1);
+#endif
+               pr_debug("%s: camcap reverse start...\n", __func__);
+       } else {
+               car_reversing = 0;
+               kobject_uevent_env(&dev_drv->dev->kobj,
+                                  KOBJ_CHANGE, envp);
+               pr_debug("%s: camcap reverse finish...\n", __func__);
+       }
+
+       return 0;
+}
+
 static int rk_fb_probe(struct platform_device *pdev)
 {
        struct rk_fb *rk_fb = NULL;
        struct device_node *np = pdev->dev.of_node;
-       u32 mode;
+       u32 mode, ret;
+       struct device_node *node;
 
        if (!np) {
                dev_err(&pdev->dev, "Missing device tree node.\n");
@@ -4468,6 +4605,27 @@ static int rk_fb_probe(struct platform_device *pdev)
        }
 #endif
 
+       node = of_parse_phandle(np, "memory-region", 0);
+       if (node) {
+               struct resource r;
+
+               ret = of_address_to_resource(node, 0, &r);
+               if (ret)
+                       return ret;
+
+               if (uboot_logo_on) {
+                       uboot_logo_base = r.start;
+                       uboot_logo_size = resource_size(&r);
+
+                       if (uboot_logo_size > SZ_16M)
+                               uboot_logo_offset = SZ_16M;
+                       else
+                               uboot_logo_offset = 0;
+               }
+               pr_info("logo: base=0x%llx, size=0x%llx, offset=0x%llx\n",
+                       uboot_logo_base, uboot_logo_size, uboot_logo_offset);
+       }
+
        fb_pdev = pdev;
        dev_info(&pdev->dev, "rockchip framebuffer driver probe\n");
        return 0;