#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"
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;
switch (data_format) {
case XBGR888:
+ case XRGB888:
case ABGR888:
case ARGB888:
case FBDC_ARGB_888:
pixel_width = 4 * 8;
break;
case RGB888:
+ case BGR888:
pixel_width = 3 * 8;
break;
case RGB565:
+ case BGR565:
case FBDC_RGB_565:
pixel_width = 2 * 8;
break;
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);
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) {
case HAL_PIXEL_FORMAT_RGBX_8888:
fb_data_fmt = XBGR888;
break;
+ case HAL_PIXEL_FORMAT_BGRX_8888:
+ fb_data_fmt = XRGB888;
+ break;
case HAL_PIXEL_FORMAT_RGBA_8888:
fb_data_fmt = ABGR888;
break;
case HAL_PIXEL_FORMAT_RGB_888:
fb_data_fmt = RGB888;
break;
+ case HAL_PIXEL_FORMAT_BGR_888:
+ fb_data_fmt = BGR888;
+ break;
case HAL_PIXEL_FORMAT_RGB_565:
fb_data_fmt = RGB565;
break;
+ case HAL_PIXEL_FORMAT_BGR_565:
+ fb_data_fmt = BGR565;
+ break;
case HAL_PIXEL_FORMAT_YCbCr_422_SP: /* yuv422 */
fb_data_fmt = YUV422;
break;
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);
for_each_child_of_node(root, child) {
pwr_ctr = kmalloc(sizeof(struct rk_disp_pwr_ctr_list),
GFP_KERNEL);
+ if (!pwr_ctr)
+ return -ENOMEM;
strcpy(pwr_ctr->pwr_ctr.name, child->name);
if (!of_property_read_u32(child, "rockchip,power_type", &val)) {
if (val == GPIO) {
screen->mode.yres = dt->vactive.typ;
screen->mode.vsync_len = dt->vsync_len.typ;
screen->type = dt->screen_type;
+ screen->refresh_mode = dt->refresh_mode;
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;
case RGB888:
strcpy(fmt, "RGB888");
break;
+ case BGR888:
+ strcpy(fmt, "BGR888");
+ break;
case RGB565:
strcpy(fmt, "RGB565");
break;
+ case BGR565:
+ strcpy(fmt, "BGR565");
+ break;
case YUV420:
case YUV420_NV21:
strcpy(fmt, "YUV420");
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;
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);
+ if (dev_drv->ops->extern_func)
+ dev_drv->ops->extern_func(dev_drv, UPDATE_CABC_PWM);
+ mutex_unlock(&dev_drv->win_config);
+
+ return 0;
+}
+
/*
* this is for hdmi
* name: lcdc device name ,lcdc0 , lcdc1
switch (fmt) {
case HAL_PIXEL_FORMAT_RGBX_8888:
+ case HAL_PIXEL_FORMAT_BGRX_8888:
case HAL_PIXEL_FORMAT_RGBA_8888:
case HAL_PIXEL_FORMAT_BGRA_8888:
case HAL_PIXEL_FORMAT_RGB_888:
+ case HAL_PIXEL_FORMAT_BGR_888:
ipp_fmt = IPP_XRGB_8888;
break;
case HAL_PIXEL_FORMAT_RGB_565:
+ case HAL_PIXEL_FORMAT_BGR_565:
ipp_fmt = IPP_RGB_565;
break;
case HAL_PIXEL_FORMAT_YCbCr_422_SP:
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)
return 0;
}
+void rk_fb_free_wb_buf(struct rk_lcdc_driver *dev_drv,
+ struct rk_fb_reg_wb_data *wb_data)
+{
+ struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
+
+ if (dev_drv->iommu_enabled && wb_data->ion_handle)
+ ion_unmap_iommu(dev_drv->dev, rk_fb->ion_client,
+ wb_data->ion_handle);
+ if (wb_data->ion_handle)
+ ion_free(rk_fb->ion_client, wb_data->ion_handle);
+}
+
void rk_fb_free_dma_buf(struct rk_lcdc_driver *dev_drv,
struct rk_fb_reg_win_data *reg_win_data)
{
if (area_data->acq_fence)
sync_fence_put(area_data->acq_fence);
}
- memset(reg_win_data, 0, sizeof(struct rk_fb_reg_win_data));
}
static void rk_fb_update_win(struct rk_lcdc_driver *dev_drv,
if (reg_win_data->reg_area_data[i].smem_start > 0) {
win->area[i].format =
reg_win_data->reg_area_data[i].data_format;
+ win->area[i].data_space =
+ reg_win_data->reg_area_data[i].data_space;
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 ||
+ inf->disp_mode == DUAL_LCD ||
inf->disp_mode == NO_DUAL) {
win->area[i].xpos =
reg_win_data->reg_area_data[i].xpos;
}
} 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;
if (dev_drv->ops->get_win_state) {
win_status =
dev_drv->ops->get_win_state(dev_drv, i, j);
- if (win_status)
+ if (win_status) {
wait_for_vsync = true;
+ dev_info(dev_drv->dev,
+ "win[%d]area[%d]: "
+ "state: %d, "
+ "cur state: %d,"
+ "count: %d\n",
+ i, j,
+ dev_drv->win[i]->area[j].state,
+ win_status,
+ 101 - count);
+ }
}
} else {
pr_err("!!!win[%d]state:%d,error!!!\n",
win_data = ®s->reg_win_data[i];
rk_fb_free_dma_buf(dev_drv, win_data);
}
+ if (dev_drv->property.feature & SUPPORT_WRITE_BACK)
+ rk_fb_free_wb_buf(dev_drv, ®s->reg_wb_data);
+ kfree(regs);
return;
}
/* acq_fence wait */
}
}
+ 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;
}
dev_drv->ops->ovl_mgr(dev_drv, 0, 1);
+ if (dev_drv->property.feature & SUPPORT_WRITE_BACK) {
+ memcpy(&dev_drv->wb_data, ®s->reg_wb_data,
+ sizeof(struct rk_fb_reg_wb_data));
+ if (dev_drv->ops->set_wb)
+ dev_drv->ops->set_wb(dev_drv);
+ }
+
if (rk_fb_iommu_debug > 0)
pagefault = rk_fb_iommu_page_fault_dump(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;
timeout = wait_event_interruptible_timeout(dev_drv->vsync_info.wait,
ktime_compare(dev_drv->vsync_info.timestamp, timestamp) > 0,
msecs_to_jiffies(50));
-
+ if (timeout <= 0)
+ dev_info(dev_drv->dev, "timeout: %ld\n", timeout);
wait_for_vsync = rk_fb_reg_effect(dev_drv, regs, count);
} while (wait_for_vsync && count--);
#ifdef H_USE_FENCE
win_data = &dev_drv->front_regs->reg_win_data[i];
rk_fb_free_dma_buf(dev_drv, win_data);
}
+ if (dev_drv->property.feature & SUPPORT_WRITE_BACK)
+ rk_fb_free_wb_buf(dev_drv,
+ &dev_drv->front_regs->reg_wb_data);
kfree(dev_drv->front_regs);
mutex_unlock(&dev_drv->front_lock);
mutex_unlock(&dev_drv->update_regs_list_lock);
list_for_each_entry_safe(data, next, &dev_drv->saved_list, list) {
- rk_fb_update_reg(dev_drv, data);
list_del(&data->list);
+ rk_fb_update_reg(dev_drv, data);
}
if (dev_drv->wait_fs && list_empty(&dev_drv->update_regs_list))
rk_fb_dbg(cmd, " xact=%d,yact=%d,xvir=%d,yvir=%d\n",
area_par->xact, area_par->yact,
area_par->xvir, area_par->yvir);
+ rk_fb_dbg(cmd, " data_space%d\n",
+ area_par->data_space);
}
}
return 0;
}
+
+static int rk_fb_set_wb_buffer(struct fb_info *info,
+ struct rk_fb_wb_cfg *wb_cfg,
+ struct rk_fb_reg_wb_data *wb_data)
+{
+ int ret = 0;
+ ion_phys_addr_t phy_addr;
+ size_t len;
+ u8 fb_data_fmt;
+ 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 *rk_fb = dev_get_drvdata(info->device);
+
+ if ((wb_cfg->phy_addr == 0) && (wb_cfg->ion_fd == 0)) {
+ wb_data->state = 0;
+ return 0;
+ }
+ if (wb_cfg->phy_addr == 0) {
+ wb_data->ion_handle =
+ ion_import_dma_buf(rk_fb->ion_client,
+ wb_cfg->ion_fd);
+ if (IS_ERR(wb_data->ion_handle)) {
+ pr_info("Could not import handle: %ld\n",
+ (long)wb_data->ion_handle);
+ return -EINVAL;
+ }
+ if (dev_drv->iommu_enabled)
+ ret = ion_map_iommu(dev_drv->dev,
+ rk_fb->ion_client,
+ wb_data->ion_handle,
+ (unsigned long *)&phy_addr,
+ (unsigned long *)&len);
+ else
+ ret = ion_phys(rk_fb->ion_client, wb_data->ion_handle,
+ &phy_addr, &len);
+ if (ret < 0) {
+ pr_err("ion map to get phy addr failed\n");
+ ion_free(rk_fb->ion_client, wb_data->ion_handle);
+ return -ENOMEM;
+ }
+ wb_data->smem_start = phy_addr;
+ } else {
+ wb_data->smem_start = wb_cfg->phy_addr;
+ }
+
+ fb_data_fmt = rk_fb_data_fmt(wb_cfg->data_format, 0);
+ if (IS_YUV_FMT(fb_data_fmt))
+ wb_data->cbr_start = wb_data->smem_start +
+ wb_cfg->xsize * wb_cfg->ysize;
+ wb_data->xsize = wb_cfg->xsize;
+ wb_data->ysize = wb_cfg->ysize;
+ wb_data->data_format = fb_data_fmt;
+ wb_data->state = 1;
+
+ return 0;
+}
+
static int rk_fb_set_win_buffer(struct fb_info *info,
struct rk_fb_win_par *win_par,
struct rk_fb_reg_win_data *reg_win_data)
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;
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;
}
data_format &= ~CSC_MASK;
fb_data_fmt = rk_fb_data_fmt(data_format, 0);
reg_win_data->reg_area_data[i].data_format = fb_data_fmt;
+ reg_win_data->reg_area_data[i].data_space =
+ win_par->area_par[i].data_space;
if (IS_FBDC_FMT(fb_data_fmt)) {
reg_win_data->reg_area_data[i].fbdc_en = 1;
reg_win_data->reg_area_data[i].fbdc_cor_en = 1;
* reg_win_data->reg_area_data[i].y_offset =
* yoffset*stride+xoffset*pixel_width/8;
*/
- if ((screen->y_mirror == 1) || (reg_win_data->mirror_en)) {
+ if (screen->y_mirror || reg_win_data->mirror_en) {
if (screen->interlace == 1) {
reg_win_data->reg_area_data[i].y_offset =
yoffset * stride * 2 +
}
}
if (IS_RGB_FMT(fb_data_fmt) && dev_drv->iommu_enabled) {
- buff_len = reg_win_data->reg_area_data[i].y_offset +
+ buff_len = yoffset * stride +
+ xoffset * pixel_width / 8 +
reg_win_data->reg_area_data[i].xvir *
reg_win_data->reg_area_data[i].yact *
pixel_width / 8 -
}
}
buff_len = reg_win_data->reg_area_data[0].cbr_start +
- reg_win_data->reg_area_data[0].c_offset +
+ uv_y_off * uv_stride + uv_x_off * pixel_width / 8 +
reg_win_data->reg_area_data[0].xvir *
reg_win_data->reg_area_data[0].yact *
pixel_width / 16 -
win_data->win_par[i].win_id);
}
}
-
+ if (dev_drv->property.feature & SUPPORT_WRITE_BACK)
+ rk_fb_set_wb_buffer(info, &win_data->wb_cfg,
+ ®s->reg_wb_data);
if (regs->win_num <= 0)
goto 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);
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)))
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))) {
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;
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;
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)
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");
dev_drv->id);
if (enable == 2 /*&& dev_drv->enable*/)
return 0;
- pr_info("switch:en=%d,lcdc_id=%d,screen type=%d,cur type=%d\n",
+ pr_info("switch:en=%d,lcdc_id=%d,screen type=%d,cur type=%d",
enable, lcdc_id, screen->type, dev_drv->cur_screen->type);
+ pr_info("data space: %d, color mode: %d\n",
+ screen->data_space, screen->color_mode);
mutex_lock(&dev_drv->switch_screen);
+ dev_drv->hot_plug_state = enable;
hdmi_switch_state = 0;
dev_drv->hdmi_switch = 1;
if (!dev_drv->uboot_logo) {
}
}
- 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;
/* 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)
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 ||
memcpy(dev_drv->cur_screen, screen, sizeof(struct rk_screen));
dev_drv->cur_screen->xsize = dev_drv->cur_screen->mode.xres;
dev_drv->cur_screen->ysize = dev_drv->cur_screen->mode.yres;
- dev_drv->cur_screen->x_mirror = dev_drv->rotate_mode & X_MIRROR;
- dev_drv->cur_screen->y_mirror = dev_drv->rotate_mode & Y_MIRROR;
+ 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 {
fb_par->ion_hdl);
dev_drv->win[win_id]->area[0].ion_hdl =
fb_par->ion_hdl;
- if (dev_drv->iommu_enabled && dev_drv->mmu_dev)
+ if (dev_drv->mmu_dev)
ret = ion_map_iommu(dev_drv->dev,
rk_fb->ion_client,
fb_par->ion_hdl,
strcpy(win->name, def_win[i].name);
win->id = def_win[i].id;
win->support_3d = def_win[i].support_3d;
+ win->property.feature = def_win[i].property.feature;
+ win->property.max_input_x = def_win[i].property.max_input_x;
+ win->property.max_input_y = def_win[i].property.max_input_y;
dev_drv->win[i] = win;
}
screen->overscan.right = 100;
screen->overscan.bottom = 100;
- screen->x_mirror = dev_drv->rotate_mode & X_MIRROR;
- screen->y_mirror = dev_drv->rotate_mode & Y_MIRROR;
+ screen->x_mirror = !!(dev_drv->rotate_mode & X_MIRROR);
+ screen->y_mirror = !!(dev_drv->rotate_mode & Y_MIRROR);
dev_drv->screen0 = screen;
dev_drv->cur_screen = screen;
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)
struct rk_fb_par *fb_par = NULL;
int i = 0, ret = 0, index = 0;
unsigned long flags;
+ char time_line_name[16];
+ int mirror = 0;
if (rk_fb->num_lcdc == RK30_MAX_LCDC_SUPPORT)
return -ENXIO;
fbi = framebuffer_alloc(0, &fb_pdev->dev);
if (!fbi) {
dev_err(&fb_pdev->dev, "fb framebuffer_alloc fail!");
- ret = -ENOMEM;
+ return -ENOMEM;
}
fb_par = devm_kzalloc(&fb_pdev->dev, sizeof(struct rk_fb_par),
GFP_KERNEL);
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)
#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;
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);
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;
}
}
int ymirror = 0;
struct page **pages;
char *vaddr;
- int i = 0;
+ int logo_len, i = 0;
if (dev_drv->ops->get_dspbuf_info)
dev_drv->ops->get_dspbuf_info(dev_drv, &xact,
&yact, &format, &dsp_addr, &ymirror);
+ logo_len = rk_fb_pixel_width(format) * xact * yact >> 3;
nr_pages = size >> PAGE_SHIFT;
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;
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 +
uboot_logo_offset));
+ kfree(pages);
return -1;
}
}
kfree(pages);
vunmap(vaddr);
- if (dev_drv->uboot_logo &&
- (width != xact || height != yact)) {
+ if (width != xact || height != yact) {
pr_err("can't support uboot kernel logo use different size [%dx%d] != [%dx%d]\n",
xact, yact, width, height);
return 0;
local_irq_save(flags);
if (dev_drv->ops->wait_frame_start)
dev_drv->ops->wait_frame_start(dev_drv, 0);
+ mirror = ymirror || dev_drv->cur_screen->y_mirror;
if (dev_drv->ops->post_dspbuf) {
dev_drv->ops->post_dspbuf(dev_drv,
- main_fbi->fix.smem_start,
+ main_fbi->fix.smem_start +
+ (mirror ? logo_len : 0),
rk_fb_data_fmt(0, bits),
width, height, xvir,
ymirror);
nr_pages = PAGE_ALIGN(logo_len + align) >> PAGE_SHIFT;
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;
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);
+ kfree(pages);
return -1;
}
local_irq_save(flags);
if (dev_drv->ops->wait_frame_start)
dev_drv->ops->wait_frame_start(dev_drv, 0);
+ mirror = y_mirror || dev_drv->cur_screen->y_mirror;
dev_drv->ops->post_dspbuf(dev_drv,
main_fbi->fix.smem_start +
- (y_mirror ? logo_len : 0),
+ (mirror ? logo_len : 0),
format, xact, yact,
xvir,
y_mirror);
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];
+ 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;
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");
}
#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;
static int rk_fb_remove(struct platform_device *pdev)
{
- struct rk_fb *rk_fb = platform_get_drvdata(pdev);
-
- kfree(rk_fb);
platform_set_drvdata(pdev, NULL);
return 0;
}
projects / firefly-linux-kernel-4.4.55.git / blobdiff