screen->type = dt->screen_type;
screen->lvds_format = dt->lvds_format;
screen->face = dt->face;
+ screen->color_mode = dt->color_mode;
+ screen->dsp_lut = dt->dsp_lut;
if (dt->flags & DISPLAY_FLAGS_PIXDATA_POSEDGE)
screen->pin_dclk = 1;
return 0;
}
-static int rk_fb_set_screen_scaler(struct rk_screen *screen, bool enable)
-{
- struct rk_lcdc_driver *dev_drv = rk_get_prmry_lcdc_drv();
-
- if(unlikely(!dev_drv) || unlikely(!screen))
- return -1;
- if (!enable)
- return 0;
-
- rk_fb_set_prmry_screen_status(SCREEN_PREPARE_DDR_CHANGE);
- if (dev_drv->ops->set_screen_scaler)
- dev_drv->ops->set_screen_scaler(dev_drv, screen, enable);
- rk_fb_set_prmry_screen_status(SCREEN_UNPREPARE_DDR_CHANGE);
- return 0;
-}
-
static struct rk_lcdc_driver *rk_get_extend_lcdc_drv(void)
{
struct rk_fb *inf = NULL;
}
-/****
-1,success : pointer to the device inside of platform device
-2,fail : NULL
-****/
+/* rk_fb_get_sysmmu_device_by_compatible()
+ * @compt: dts device compatible name
+ * return value: success: pointer to the device inside of platform device
+ * fail: NULL
+ */
struct device *rk_fb_get_sysmmu_device_by_compatible(const char *compt)
{
struct device_node *dn = NULL;
struct platform_device *pd = NULL;
struct device *ret = NULL ;
- dn = of_find_compatible_node(NULL,NULL,compt);
- if(!dn)
- {
- printk("can't find device node %s \r\n",compt);
+ dn = of_find_compatible_node(NULL, NULL, compt);
+ if (!dn) {
+ printk("can't find device node %s \r\n", compt);
return NULL;
}
pd = of_find_device_by_node(dn);
- if(!pd)
- {
- printk("can't find platform device in device node %s \r\n",compt);
+ if (!pd) {
+ printk("can't find platform device in device node %s \r\n", compt);
return NULL;
}
ret = &pd->dev;
return ret;
-
}
#ifdef CONFIG_IOMMU_API
#else
void rk_fb_platform_set_sysmmu(struct device *sysmmu, struct device *dev)
{
-
+
}
#endif
}
static void win_copy_by_rga(struct rk_lcdc_win *dst_win,
- struct rk_lcdc_win *src_win, u16 orientation)
+ struct rk_lcdc_win *src_win,
+ u16 orientation, int iommu_en)
{
struct rga_req Rga_Request;
long ret = 0;
break;
}
-#if defined(CONFIG_ROCKCHIP_RGA)
- Rga_Request.src.yrgb_addr =
- src_win->area[0].smem_start + src_win->area[0].y_offset;
- Rga_Request.src.uv_addr = 0;
- Rga_Request.src.v_addr = 0;
-
- Rga_Request.dst.yrgb_addr =
- dst_win->area[0].smem_start + dst_win->area[0].y_offset;
- Rga_Request.dst.uv_addr = 0;
- Rga_Request.dst.v_addr = 0;
-#elif defined(CONFIG_ROCKCHIP_RGA2)
/*
fd = ion_share_dma_buf_fd(rk_fb->ion_client, src_win->area[0].ion_hdl);
Rga_Request.src.yrgb_addr = fd;
Rga_Request.dst.uv_addr =
dst_win->area[0].smem_start + dst_win->area[0].y_offset;
Rga_Request.dst.v_addr = 0;
-#endif
Rga_Request.src.vir_w = src_win->area[0].xvir;
Rga_Request.src.vir_h = src_win->area[0].yvir;
Rga_Request.clip.ymax = dst_win->area[0].yact - 1;
Rga_Request.scale_mode = 0;
#if defined(CONFIG_ROCKCHIP_IOMMU)
- Rga_Request.mmu_info.mmu_en = 1; /* TODO Modify for use mmu */
- Rga_Request.mmu_info.mmu_flag = 1;
+ if (iommu_en) {
+ Rga_Request.mmu_info.mmu_en = 1;
+ Rga_Request.mmu_info.mmu_flag = 1;
+ } else {
+ Rga_Request.mmu_info.mmu_en = 0;
+ Rga_Request.mmu_info.mmu_flag = 0;
+ }
#else
Rga_Request.mmu_info.mmu_en = 0;
Rga_Request.mmu_info.mmu_flag = 0;
ext_dev_drv->ops->fb_get_win_id(ext_dev_drv, dst_info->fix.id);
dst_win = ext_dev_drv->win[ext_win_id];
- win_copy_by_rga(dst_win, src_win, ext_dev_drv->rotate_mode);
+ win_copy_by_rga(dst_win, src_win, ext_dev_drv->rotate_mode,
+ ext_dev_drv->iommu_enabled);
}
#endif
}
static int rk_fb_win_rotate(struct rk_lcdc_win *dst_win,
- struct rk_lcdc_win *src_win, u16 rotate)
+ struct rk_lcdc_win *src_win,
+ u16 rotate, int iommu_en)
{
#if defined(CONFIG_ROCKCHIP_RGA) || defined(CONFIG_ROCKCHIP_RGA2)
- win_copy_by_rga(dst_win, src_win, rotate);
+ win_copy_by_rga(dst_win, src_win, rotate, iommu_en);
#else
return -1;
#endif
u32 stride_32bit_2;
u16 uv_x_off, uv_y_off, uv_y_act;
u8 is_pic_yuv = 0;
+#ifdef CONFIG_ROCKCHIP_IOMMU
+ ion_phys_addr_t phy_addr;
+ size_t len = 0;
+ int ret = 0;
+#endif
win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
if (win_id < 0)
dev_drv->ops->pan_display(dev_drv, win_id);
if (rk_fb->disp_mode == DUAL) {
- if (extend_win->state && (hdmi_switch_complete)) {
+ if (extend_win->state &&
+ (hdmi_switch_complete & (1 << extend_win_id))) {
extend_win->area[0].y_offset = win->area[0].y_offset;
if (extend_dev_drv->rotate_mode > X_Y_MIRROR) {
rk_fb_rotate(extend_info, info,
win->area[0].y_offset);
} else {
+#ifdef CONFIG_ROCKCHIP_IOMMU
+ if (extend_dev_drv->iommu_enabled) {
+ ret = ion_map_iommu(extend_dev_drv->dev,
+ rk_fb->ion_client,
+ win->area[0].ion_hdl,
+ (unsigned long *)&phy_addr,
+ (unsigned long *)&len);
+ if (ret < 0) {
+ dev_err(extend_dev_drv->dev, "ion map to get phy addr failed\n");
+ ion_free(rk_fb->ion_client, win->area[0].ion_hdl);
+ return -ENOMEM;
+ }
+ extend_win->area[0].smem_start = phy_addr;
+ extend_win->area[0].cbr_start =
+ win->area[0].cbr_start;
+ } else {
+ extend_win->area[0].smem_start =
+ win->area[0].smem_start;
+ extend_win->area[0].cbr_start =
+ win->area[0].cbr_start;
+ }
+#else
extend_win->area[0].smem_start =
win->area[0].smem_start;
extend_win->area[0].cbr_start =
win->area[0].cbr_start;
+#endif
}
extend_dev_drv->ops->pan_display(extend_dev_drv,
extend_win_id);
int i, index_buf;
struct rk_fb_reg_area_data *area_data;
struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
+#if defined(CONFIG_ROCKCHIP_IOMMU)
+ struct rk_lcdc_driver *ext_dev_drv = rk_get_extend_lcdc_drv();
+#endif
for (i = 0; i < reg_win_data->area_num; i++) {
area_data = ®_win_data->reg_area_data[i];
area_data->ion_handle);
freed_addr[freed_index++] = area_data->smem_start;
}
+ if (rk_fb->disp_mode == DUAL && hdmi_switch_complete == 0xff) {
+ if (ext_dev_drv->iommu_enabled)
+ ion_unmap_iommu(ext_dev_drv->dev,
+ rk_fb->ion_client,
+ area_data->ion_handle);
+ }
#endif
if (area_data->ion_handle != NULL) {
ion_unmap_kernel(rk_fb->ion_client,
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 =
+ reg_win_data->reg_area_data[i].ion_handle;
win->area[i].smem_start =
- reg_win_data->reg_area_data[i].smem_start;
+ reg_win_data->reg_area_data[i].smem_start;
if (inf->disp_mode == DUAL) {
win->area[i].xpos =
reg_win_data->reg_area_data[i].xpos;
struct rk_lcdc_win *last_win;
bool is_yuv = false;
static u8 fb_index = 0;
-
+#ifdef CONFIG_ROCKCHIP_IOMMU
+ ion_phys_addr_t phy_addr;
+ size_t len = 0;
+ int ret = 0;
+#endif
if ((rk_fb->disp_mode != DUAL) ||
(hdmi_get_hotplug() != HDMI_HPD_ACTIVED) ||
- (!hdmi_switch_complete)) {
+ (hdmi_switch_complete != 0xff)) {
printk(KERN_INFO "%s: hdmi is disconnect!\n", __func__);
return -1;
}
y_stride = ALIGN_N_TIMES(vir_width_bit, 32) / 8;
ext_win->area[0].y_vir_stride = y_stride >> 2;
} else {
+#ifdef CONFIG_ROCKCHIP_IOMMU
+ if (ext_dev_drv->iommu_enabled) {
+ ret = ion_map_iommu(ext_dev_drv->dev,
+ rk_fb->ion_client,
+ win->area[0].ion_hdl,
+ (unsigned long *)&phy_addr,
+ (unsigned long *)&len);
+ if (ret < 0) {
+ dev_err(ext_dev_drv->dev, "ion map to get phy addr failed\n");
+ ion_free(rk_fb->ion_client, win->area[0].ion_hdl);
+ return -ENOMEM;
+ }
+ ext_win->area[0].smem_start = phy_addr;
+ } else {
+ ext_win->area[0].smem_start = win->area[0].smem_start;
+ }
+#else
ext_win->area[0].smem_start = win->area[0].smem_start;
+#endif
ext_win->area[0].y_offset = win->area[0].y_offset;
ext_win->area[0].xact = win->area[0].xact;
ext_win->area[0].yact = win->area[0].yact;
ext_win->area[0].c_offset = win->area[0].c_offset;
} else {
ext_win->area[0].uv_vir_stride = win->area[0].uv_vir_stride;
+#ifdef CONFIG_ROCKCHIP_IOMMU
+ if (ext_dev_drv->iommu_enabled)
+ ext_win->area[0].cbr_start =
+ ext_win->area[0].smem_start +
+ ext_win->area[0].y_offset +
+ ext_win->area[0].xvir * ext_win->area[0].yvir;
+ else
+ ext_win->area[0].cbr_start = win->area[0].cbr_start;
+#else
ext_win->area[0].cbr_start = win->area[0].cbr_start;
+#endif
ext_win->area[0].c_offset = win->area[0].c_offset;
}
if ((rk_fb->disp_mode == DUAL)
&& (hdmi_get_hotplug() == HDMI_HPD_ACTIVED)
- && hdmi_switch_complete) {
+ && (hdmi_switch_complete == 0xff)) {
ext_dev_drv = rk_get_extend_lcdc_drv();
if (!ext_dev_drv) {
printk(KERN_ERR "hdmi lcdc driver not found!\n");
if (ext_dev_drv->rotate_mode > X_Y_MIRROR)
rk_fb_win_rotate(ext_win, win,
- ext_dev_drv->rotate_mode);
+ ext_dev_drv->rotate_mode,
+ ext_dev_drv->iommu_enabled);
ext_dev_drv->ops->set_par(ext_dev_drv, i);
ext_dev_drv->ops->pan_display(ext_dev_drv, i);
u8 is_pic_yuv = 0;
u8 ppixel_a = 0, global_a = 0;
ion_phys_addr_t phy_addr;
+ int ret = 0;
reg_win_data->reg_area_data[0].smem_start = -1;
reg_win_data->area_num = 0;
reg_win_data->area_num++;
reg_win_data->reg_area_data[i].ion_handle = hdl;
#ifndef CONFIG_ROCKCHIP_IOMMU
- ion_phys(rk_fb->ion_client, hdl, &phy_addr,
- &len);
+ ret = ion_phys(rk_fb->ion_client, hdl, &phy_addr,
+ &len);
#else
if (dev_drv->iommu_enabled)
- ion_map_iommu(dev_drv->dev,
- rk_fb->ion_client,
- hdl,
- (unsigned long *)&phy_addr,
- (unsigned long *)&len);
+ ret = ion_map_iommu(dev_drv->dev,
+ rk_fb->ion_client,
+ hdl,
+ (unsigned long *)&phy_addr,
+ (unsigned long *)&len);
else
- ion_phys(rk_fb->ion_client, hdl,
- &phy_addr, &len);
+ ret = ion_phys(rk_fb->ion_client, hdl,
+ &phy_addr, &len);
#endif
+ if (ret < 0) {
+ dev_err(fbi->dev, "ion map to get phy addr failed\n");
+ ion_free(rk_fb->ion_client, hdl);
+ return -ENOMEM;
+ }
reg_win_data->reg_area_data[i].smem_start = phy_addr;
reg_win_data->area_buf_num++;
reg_win_data->reg_area_data[i].index_buf = 1;
for (i = 0; i < dev_drv->lcdc_win_num; i++) {
if (win_data->win_par[i].win_id < dev_drv->lcdc_win_num) {
- rk_fb_set_win_buffer(info, &win_data->win_par[i],
- ®s->reg_win_data[j]);
+ if (rk_fb_set_win_buffer(info, &win_data->win_par[i],
+ ®s->reg_win_data[j]))
+ return -ENOMEM;
if (regs->reg_win_data[j].area_num > 0) {
regs->win_num++;
regs->buf_num +=
#ifdef CONFIG_ROCKCHIP_IOMMU
#define ION_MAX 10
static struct ion_handle *ion_hanle[ION_MAX];
+static struct ion_handle *ion_hwc[1];
#endif
static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg)
}
switch (cmd) {
+ case RK_FBIOSET_HWC_ADDR:
+ {
+ u32 hwc_phy[1];
+ if (copy_from_user(hwc_phy, argp, 4))
+ return -EFAULT;
+ if (!dev_drv->iommu_enabled) {
+ fix->smem_start = hwc_phy[0];
+ } else {
+ int usr_fd;
+ struct ion_handle *hdl;
+ ion_phys_addr_t phy_addr;
+ size_t len;
+
+ usr_fd = hwc_phy[0];
+ if (!usr_fd) {
+ fix->smem_start = 0;
+ fix->mmio_start = 0;
+ break;
+ }
+
+ if (ion_hwc[0] != 0) {
+ ion_free(rk_fb->ion_client, ion_hwc[0]);
+ ion_hwc[0] = 0;
+ }
+
+ hdl = ion_import_dma_buf(rk_fb->ion_client, usr_fd);
+ if (IS_ERR(hdl)) {
+ dev_err(info->dev, "failed to get hwc ion handle:%ld\n",
+ PTR_ERR(hdl));
+ return -EFAULT;
+ }
+
+ ret = ion_map_iommu(dev_drv->dev, rk_fb->ion_client, hdl,
+ (unsigned long *)&phy_addr,
+ (unsigned long *)&len);
+ if (ret < 0) {
+ dev_err(info->dev, "ion map to get hwc phy addr failed");
+ ion_free(rk_fb->ion_client, hdl);
+ return -ENOMEM;
+ }
+ fix->smem_start = phy_addr;
+ ion_hwc[0] = hdl;
+ }
+ break;
+ }
case RK_FBIOSET_YUV_ADDR:
{
u32 yuv_phy[2];
break;
}
+ if (ion_hanle[ION_MAX - 1] != 0) {
+ /*ion_unmap_kernel(rk_fb->ion_client, ion_hanle[ION_MAX - 1]);*/
+ /*ion_unmap_iommu(dev_drv->dev, rk_fb->ion_client, ion_hanle[ION_MAX - 1]);*/
+ ion_free(rk_fb->ion_client, ion_hanle[ION_MAX - 1]);
+ ion_hanle[ION_MAX - 1] = 0;
+ }
+
hdl = ion_import_dma_buf(rk_fb->ion_client, usr_fd);
- ion_map_iommu(dev_drv->dev, rk_fb->ion_client, hdl,
- (unsigned long *)&phy_addr, (unsigned long *)&len);
+ if (IS_ERR(hdl)) {
+ dev_err(info->dev, "failed to get ion handle:%ld\n",
+ PTR_ERR(hdl));
+ return -EFAULT;
+ }
+ ret = ion_map_iommu(dev_drv->dev, rk_fb->ion_client, hdl,
+ (unsigned long *)&phy_addr,
+ (unsigned long *)&len);
+ if (ret < 0) {
+ dev_err(info->dev, "ion map to get phy addr failed");
+ ion_free(rk_fb->ion_client, hdl);
+ return -ENOMEM;
+ }
fix->smem_start = phy_addr;
fix->mmio_start = phy_addr + offset;
+ fix->smem_len = len;
+ /*info->screen_base = ion_map_kernel(rk_fb->ion_client, hdl);*/
- if (ion_hanle[ION_MAX - 1] != 0) {
- ion_unmap_iommu(dev_drv->dev, rk_fb->ion_client, ion_hanle[ION_MAX - 1]);
- ion_free(rk_fb->ion_client, ion_hanle[ION_MAX - 1]);
- }
ion_hanle[0] = hdl;
-
for (tmp = ION_MAX - 1; tmp > 0; tmp--)
ion_hanle[tmp] = ion_hanle[tmp - 1];
ion_hanle[0] = 0;
struct rk_lcdc_win *extend_win = NULL;
struct rk_lcdc_win *win = NULL;
struct rk_screen *screen = dev_drv->cur_screen;
- struct rk_screen screen_primary;
int win_id = 0;
u32 cblen = 0, crlen = 0;
u16 xsize = 0, ysize = 0; /* winx display window height/width --->LCDC_WINx_DSP_INFO */
if (var->grayscale >> 8) {
xsize = (var->grayscale >> 8) & 0xfff;
ysize = (var->grayscale >> 20) & 0xfff;
+ if (xsize > screen->mode.xres)
+ xsize = screen->mode.xres;
+ if (ysize > screen->mode.yres)
+ ysize = screen->mode.yres;
} else { /*ohterwise full screen display */
xsize = screen->mode.xres;
ysize = screen->mode.yres;
}
- /* this is for device like rk2928/rk312x,
- * which have one lcdc but two display outputs
- * save win parameter set by android
- */
- if (rk_fb->disp_mode != DUAL) {
- if (screen->screen_id == 0) {
- dev_drv->screen0->xsize = xsize;
- dev_drv->screen0->ysize = ysize;
- dev_drv->screen0->xpos = xpos;
- dev_drv->screen0->ypos = ypos;
- } else {
- xsize = dev_drv->screen1->xsize;
- ysize = dev_drv->screen1->ysize;
- xpos = dev_drv->screen1->xpos;
- ypos = dev_drv->screen1->ypos;
- }
- }
-
fb_data_fmt = rk_fb_data_fmt(data_format, var->bits_per_pixel);
pixel_width = rk_fb_pixel_width(fb_data_fmt);
vir_width_bit = pixel_width * xvir;
}
}
- rk_fb_get_prmry_screen(&screen_primary);
win->format = fb_data_fmt;
win->area[0].y_vir_stride = stride >> 2;
win->area[0].uv_vir_stride = uv_stride >> 2;
- win->area[0].xpos = xpos*screen->mode.xres/screen_primary.mode.xres;
- win->area[0].ypos = ypos*screen->mode.yres/screen_primary.mode.yres;
- win->area[0].xsize = screen->mode.xres*xsize/screen_primary.mode.xres;
- win->area[0].ysize = screen->mode.yres*ysize/screen_primary.mode.yres;
+ win->area[0].xpos = xpos;
+ win->area[0].ypos = ypos;
+ win->area[0].xsize = xsize;
+ win->area[0].ysize = ysize;
win->area[0].xact = var->xres; /* winx active window height,is a wint of vir */
win->area[0].yact = var->yres;
win->area[0].xvir = var->xres_virtual; /* virtual resolution stride --->LCDC_WINx_VIR */
win->g_alpha_val = 0;
if (rk_fb->disp_mode == DUAL) {
- if (extend_win->state && (hdmi_switch_complete)) {
+ if (extend_win->state && (hdmi_switch_complete == 0xff)) {
if (info != extend_info) {
if (win->area[0].xact < win->area[0].yact) {
extend_win->area[0].xact =
return ret;
}
-#if 0
-static int set_xact_yact_for_hdmi(struct fb_var_screeninfo *pmy_var,
- struct fb_var_screeninfo *hdmi_var)
+/*
+ * function: this function will be called to modify hdmi info according to
+ * pmy info for DUAL disp_mode when HDMI is used as EXTEND
+ * @pmy_info: primary screen fb_info
+ * @hdmi_info: hdmi screen fb_info
+ * @screen: the hdmi screen info
+ */
+static int rk_fb_hdmi_info_align(struct fb_info *pmy_info,
+ struct fb_info *hdmi_info,
+ struct rk_screen *screen)
{
- if (pmy_var->xres < pmy_var->yres) { /* vertical lcd screen */
+ struct rk_fb *inf = platform_get_drvdata(fb_pdev);
+ struct fb_var_screeninfo *hdmi_var = NULL;
+ struct fb_var_screeninfo *pmy_var = NULL;
+
+ if(unlikely(!pmy_info) || unlikely(!hdmi_info))
+ return -1;
+
+ if (inf->disp_mode != DUAL || pmy_info == hdmi_info)
+ return 0;
+
+ pmy_var = &pmy_info->var;
+ hdmi_var = &hdmi_info->var;
+ if (pmy_var->xres < pmy_var->yres) { /* vertical lcd screen */
hdmi_var->xres = pmy_var->yres;
hdmi_var->yres = pmy_var->xres;
hdmi_var->xres_virtual = pmy_var->yres;
hdmi_var->xres_virtual = pmy_var->xres_virtual;
}
+ /* use the same format as primary screen */
+ hdmi_var->nonstd &= 0xffffff00;
+ hdmi_var->nonstd |= (pmy_var->nonstd & 0xff);
+
+ if (screen) {
+ hdmi_var->grayscale &= 0xff;
+ hdmi_var->grayscale |= (screen->mode.xres << 8) +
+ (screen->mode.yres << 20);
+ }
+
return 0;
}
-#endif
-#if 1
/*
- *function:this function will be called by display device, enable/disable lcdc
- *screen: screen timing to be set to lcdc
- *enable: 0 disable lcdc; 1 enable change lcdc timing; 2 just enable dclk
- *lcdc_id: the lcdc id the display device attached ,0 or 1
+ * function: this function will be called by display device, enable/disable lcdc
+ * @screen: screen timing to be set to lcdc
+ * @enable: 0 disable lcdc; 1 enable change lcdc timing; 2 just enable dclk
+ * @lcdc_id: the lcdc id the display device attached ,0 or 1
*/
int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
{
struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
struct fb_info *info = NULL;
+ struct fb_info *pmy_info = NULL;
struct rk_lcdc_driver *dev_drv = NULL;
- char name[6];
+ struct rk_lcdc_driver *pmy_dev_drv = rk_get_prmry_lcdc_drv();
+ char name[6] = {0};
int i, win_id, load_screen = 0;
- if (screen == NULL)
+ if (unlikely(!rk_fb) || unlikely(!pmy_dev_drv) || unlikely(!screen))
return -ENODEV;
+ /* get lcdc driver */
sprintf(name, "lcdc%d", lcdc_id);
- for (i = 0; i < rk_fb->num_lcdc; i++) {
- if (!strcmp(rk_fb->lcdc_dev_drv[i]->name, name)) {
- dev_drv = rk_fb->lcdc_dev_drv[i];
- break;
- }
- }
- if (i == rk_fb->num_lcdc) {
+ if (rk_fb->disp_mode != DUAL)
+ dev_drv = rk_fb->lcdc_dev_drv[0];
+ else
+ dev_drv = rk_get_lcdc_drv(name);
+
+ if (dev_drv == NULL) {
printk(KERN_ERR "%s driver not found!", name);
return -ENODEV;
}
+ 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)
+ 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->set_screen_scaler)
+ dev_drv->ops->set_screen_scaler(dev_drv, dev_drv->screen0, 0);
+ }
+
if (!enable) {
/* if screen type is different, we do not disable lcdc. */
if (dev_drv->cur_screen->type != screen->type)
return 0;
- for (i = 0; i < dev_drv->lcdc_win_num; i++) {
- /* disable the layer which attached to this device */
- if (dev_drv->win[i] && dev_drv->win[i]->state)
- dev_drv->ops->open(dev_drv, i, 0);
+ /* if used one lcdc to dual disp, no need to close win */
+ 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();
+ } else if (rk_fb->num_lcdc > 1) {
+ /* If there is more than one lcdc device, we disable
+ the layer which attached to this device */
+ for (i = 0; i < dev_drv->lcdc_win_num; i++) {
+ if (dev_drv->win[i] && dev_drv->win[i]->state)
+ dev_drv->ops->open(dev_drv, i, 0);
+ }
}
+
+ hdmi_switch_complete = 0;
return 0;
} else {
+ if (dev_drv->screen1)
+ dev_drv->cur_screen = dev_drv->screen1;
memcpy(dev_drv->cur_screen, screen, sizeof(struct rk_screen));
+ 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++) {
- #ifdef DUAL_LCDC_MAP_TO_SAME_FB
- info = rk_fb->fb[i];
- dev_drv1 = (struct rk_lcdc_driver *)info->par;
- if (dev_drv1 != dev_drv) {
- info->par = dev_drv;
- dev_drv->overscan = dev_drv1->overscan;
- dev_drv->vsync_info.active = dev_drv1->vsync_info.active;
- }
- memcpy(dev_drv->cur_screen, screen, sizeof(struct rk_screen));
- #else
info = rk_fb->fb[dev_drv->fb_index_base + i];
- #endif
+ if (rk_fb->disp_mode == DUAL &&
+ dev_drv != pmy_dev_drv) {
+ pmy_info = rk_fb->fb[pmy_dev_drv->fb_index_base + i];
+ rk_fb_hdmi_info_align(pmy_info, info,
+ dev_drv->cur_screen);
+ }
+
win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
if (dev_drv->win[win_id]) {
- #ifdef DUAL_LCDC_MAP_TO_SAME_FB
- if (dev_drv1 && dev_drv1->win[win_id]) {
- dev_drv->win[win_id]->logicalstate = dev_drv1->win[win_id]->logicalstate;
- memcpy(dev_drv->win[win_id]->area, dev_drv1->win[win_id]->area, RK_WIN_MAX_AREA * sizeof(struct rk_lcdc_win_area));
+ 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;
+ }
}
- #endif
if (dev_drv->win[win_id]->logicalstate) {
- dev_drv->ops->open(dev_drv, win_id, 1);
+ 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;
info->fbops->fb_set_par(info);
- info->fbops->fb_pan_display(&info->var, info);
+ hdmi_switch_complete |= (1 << win_id);
+ if (rk_fb->disp_mode == DUAL)
+ pmy_info->fbops->fb_pan_display(&pmy_info->var,
+ pmy_info);
+ else
+ info->fbops->fb_pan_display(&info->var, info);
}
}
}
- return 0;
-}
-#else
-/*
- * function:this function will be called by hdmi,when
- * hdmi plug in/out
- * screen: the screen attached to hdmi
- * enable: 1,hdmi plug in,0,hdmi plug out
- * lcdc_id: the lcdc id the hdmi attached ,0 or 1
- */
-int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
-{
- struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
- struct fb_info *info = NULL;
- struct rk_lcdc_driver *dev_drv = NULL;
- struct fb_var_screeninfo *hdmi_var = NULL;
- struct fb_var_screeninfo *pmy_var = NULL; /* var for primary screen */
- struct fb_fix_screeninfo *hdmi_fix = NULL;
- char name[6];
- int ret;
- int win_id;
-/*
- if (rk_fb->disp_mode != DUAL)
- rk29_backlight_set(0);
-*/
- sprintf(name, "lcdc%d", lcdc_id);
-
- if (rk_fb->disp_mode != DUAL) {
- dev_drv = rk_fb->lcdc_dev_drv[0];
- if (dev_drv->trsm_ops && dev_drv->trsm_ops->disable)
- dev_drv->trsm_ops->disable();
- } else {
- dev_drv = rk_get_lcdc_drv(name);
- if (dev_drv == NULL) {
- printk(KERN_ERR "%s driver not found!", name);
- return -ENODEV;
- }
- }
- printk("hdmi %s lcdc%d\n", enable ? "connect to" : "remove from",
- dev_drv->id);
-
- /* the main fb of lcdc drv */
- info = rk_fb->fb[dev_drv->fb_index_base];
-
- if (dev_drv->screen1) { /* device like rk2928 ,have only one lcdc but two outputs */
- if (enable) {
- memcpy(dev_drv->screen1, screen,
- sizeof(struct rk_screen));
- dev_drv->screen1->lcdc_id = 0; /* connect screen1 to output interface 0 */
- dev_drv->screen1->screen_id = 1;
- dev_drv->screen0->lcdc_id = 1; /* connect screen0 to output interface 1 */
- dev_drv->cur_screen = dev_drv->screen1;
- dev_drv->screen0->ext_screen = dev_drv->screen1;
- if (dev_drv->screen0->sscreen_get)
- dev_drv->screen0->sscreen_get(dev_drv->screen0,
- dev_drv->cur_screen->hdmi_resolution);
-
- } else {
- dev_drv->screen1->lcdc_id = 1; /* connect screen1 to output interface 1 */
- dev_drv->screen0->lcdc_id = 0; /* connect screen0 to output interface 0 */
- dev_drv->cur_screen = dev_drv->screen0;
- if (dev_drv->screen_ctr_info &&
- dev_drv->screen_ctr_info->set_screen_info)
- dev_drv->screen_ctr_info->set_screen_info(dev_drv->cur_screen,
- dev_drv->screen_ctr_info->lcd_info);
- }
- } else {
- if (enable)
- memcpy(dev_drv->cur_screen, screen, sizeof(struct rk_screen));
- }
-
- dev_drv->cur_screen->x_mirror = dev_drv->rotate_mode & X_MIRROR;
- dev_drv->cur_screen->y_mirror = dev_drv->rotate_mode & Y_MIRROR;
-
- win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
-
- if (!enable && !dev_drv->screen1) { /* only double lcdc device need to close */
- if (dev_drv->win[win_id]->state)
- dev_drv->ops->open(dev_drv, win_id, enable); /* disable the win which attached to this fb */
- hdmi_switch_complete = 0;
-
- return 0;
- }
-
- hdmi_var = &info->var;
- hdmi_fix = &info->fix;
- if (rk_fb->disp_mode == DUAL) {
- if (likely(rk_fb->num_lcdc == 2)) {
- pmy_var = &rk_fb->fb[0]->var;
- set_xact_yact_for_hdmi(pmy_var, hdmi_var);
- hdmi_var->nonstd &= 0xffffff00;
- hdmi_var->nonstd |= (pmy_var->nonstd & 0xff); /* use the same format as primary screen */
- } else {
- printk(KERN_WARNING
- "%s>>only one lcdc,dual display no supported!",
- __func__);
- }
- }
- hdmi_var->grayscale &= 0xff;
- hdmi_var->grayscale |=
- (dev_drv->cur_screen->mode.xres << 8) + (dev_drv->cur_screen->mode.yres << 20);
- if (dev_drv->screen1) { /* device like rk2928,whic have one lcdc but two outputs */
- /*
- info->var.nonstd &= 0xff;
- info->var.nonstd |= (dev_drv->cur_screen->mode.xpos<<8) + (dev_drv->cur_screen->mode.ypos<<20);
- info->var.grayscale &= 0xff;
- info->var.grayscale |= (dev_drv->cur_screen->mode.x_res<<8) + (dev_drv->cur_screen->mode.y_res<<20);
- */
- dev_drv->screen1->xsize = dev_drv->cur_screen->mode.xres;
- dev_drv->screen1->ysize = dev_drv->cur_screen->mode.yres;
- dev_drv->screen1->xpos = 0;
- dev_drv->screen1->ypos = 0;
- }
-
- ret = info->fbops->fb_open(info, 1);
- dev_drv->ops->load_screen(dev_drv, 1);
- ret = info->fbops->fb_set_par(info);
- if (dev_drv->ops->lcdc_hdmi_process)
- dev_drv->ops->lcdc_hdmi_process(dev_drv, enable);
-
- hdmi_switch_complete = enable;
- info->fbops->fb_pan_display(hdmi_var, info);
-
- if (dev_drv->screen1) {
- if (dev_drv->screen0->sscreen_set) {
- /*
- dev_drv->ops->blank(dev_drv, 0, FB_BLANK_NORMAL);
- msleep(100);
- */
- dev_drv->screen0->sscreen_set(dev_drv->screen0, enable);
- /*
- dev_drv->ops->blank(dev_drv, 0, FB_BLANK_UNBLANK);
- */
- }
- }
-
- /* info->fbops->fb_ioctl(info, RK_FBIOSET_CONFIG_DONE, 0); */
- if (rk_fb->disp_mode != DUAL) {
- /* rk29_backlight_set(1); */
- if (dev_drv->trsm_ops && dev_drv->trsm_ops->enable)
- dev_drv->trsm_ops->enable();
+ hdmi_switch_complete = 0xff;
+ 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();
}
return 0;
}
-#endif
+
/*
* function:this function current only called by hdmi for
* scale the display
u16 screen_x, screen_y;
u16 xpos, ypos;
char name[6];
+ struct rk_screen primary_screen;
+ rk_fb_get_prmry_screen(&primary_screen);
+ if (primary_screen.type == SCREEN_HDMI) {
+ return 0;
+ }
sprintf(name, "lcdc%d", lcdc_id);
screen_x = dev_drv->cur_screen->mode.xres;
screen_y = dev_drv->cur_screen->mode.yres;
- if (inf->disp_mode != DUAL &&
- dev_drv->cur_screen->screen_id == 1) {
+ if (inf->disp_mode != DUAL && dev_drv->screen1) {
dev_drv->cur_screen->xpos =
(screen_x - screen_x * scale_x / 100) >> 1;
dev_drv->cur_screen->ypos =
struct ion_handle *handle;
ion_phys_addr_t phy_addr;
size_t len;
+ int ret = 0;
if (dev_drv->iommu_enabled)
handle = ion_alloc(rk_fb->ion_client, (size_t) fb_mem_size, 0,
fbi->screen_base = ion_map_kernel(rk_fb->ion_client, handle);
#ifdef CONFIG_ROCKCHIP_IOMMU
if (dev_drv->iommu_enabled)
- ion_map_iommu(dev_drv->dev, rk_fb->ion_client, handle,
- (unsigned long *)&phy_addr,
- (unsigned long *)&len);
+ ret = ion_map_iommu(dev_drv->dev, rk_fb->ion_client, handle,
+ (unsigned long *)&phy_addr,
+ (unsigned long *)&len);
else
- ion_phys(rk_fb->ion_client, handle, &phy_addr, &len);
+ ret = ion_phys(rk_fb->ion_client, handle, &phy_addr, &len);
#else
- ion_phys(rk_fb->ion_client, handle, &phy_addr, &len);
+ ret = ion_phys(rk_fb->ion_client, handle, &phy_addr, &len);
#endif
+ if (ret < 0) {
+ dev_err(fbi->dev, "ion map to get phy addr failed\n");
+ goto err_share_dma_buf;
+ }
fbi->fix.smem_start = phy_addr;
fbi->fix.smem_len = len;
printk(KERN_INFO "alloc_buffer:ion_phy_addr=0x%lx\n", phy_addr);
screen1->screen_id = 1;
screen1->lcdc_id = 1;
dev_drv->screen1 = screen1;
- dev_drv->screen0->sscreen_set = rk_fb_set_screen_scaler;
}
sprintf(dev_drv->name, "lcdc%d", dev_drv->id);
init_lcdc_win(dev_drv, def_win);
init_completion(&dev_drv->frame_done);
spin_lock_init(&dev_drv->cpl_lock);
mutex_init(&dev_drv->fb_win_id_mutex);
- dev_drv->ops->fb_win_remap(dev_drv, FB_DEFAULT_ORDER);
+ dev_drv->ops->fb_win_remap(dev_drv, dev_drv->fb_win_map);
dev_drv->first_frame = 1;
dev_drv->overscan.left = 100;
dev_drv->overscan.top = 100;
if (dev_drv->ops->set_dsp_cabc)
dev_drv->ops->set_dsp_cabc(dev_drv, dev_drv->cabc_mode);
rk_fb_set_prmry_screen(screen);
+ rk_fb_get_prmry_screen(screen);
}
- rk_fb_get_prmry_screen(screen);
dev_drv->trsm_ops = rk_fb_trsm_ops_get(screen->type);
+ if (dev_drv->prop != PRMRY)
+ rk_fb_get_prmry_screen(screen);
+ dev_drv->output_color = screen->color_mode;
return 0;
}
if (dev_drv->prop == PRMRY) {
struct fb_info *main_fbi = rk_fb->fb[0];
main_fbi->fbops->fb_open(main_fbi, 1);
-/*
+
#if defined(CONFIG_ROCKCHIP_IOMMU)
if (dev_drv->iommu_enabled) {
- mmu_dev =
- rk_fb_get_sysmmu_device_by_compatible(dev_drv->mmu_dts_name);
- if (mmu_dev) {
- rk_fb_platform_set_sysmmu(mmu_dev, dev_drv->dev);
+ if (dev_drv->mmu_dev)
rockchip_iovmm_set_fault_handler(dev_drv->dev,
- rk_fb_sysmmu_fault_handler);
- rockchip_iovmm_activate(dev_drv->dev);
- } else
- dev_err(dev_drv->dev,
- "failed to get rockchip iommu device\n");
+ rk_fb_sysmmu_fault_handler);
}
#endif
-*/
+
rk_fb_alloc_buffer(main_fbi, 0); /* only alloc memory for main fb */
if (support_uboot_display()) {
if (dev_drv->iommu_enabled) {
projects / firefly-linux-kernel-4.4.55.git / blobdiff