#include <linux/kthread.h>
#include <linux/fb.h>
#include <linux/init.h>
+#include <linux/vmalloc.h>
#include <asm/div64.h>
#include <linux/uaccess.h>
#include <linux/rk_fb.h>
#include <linux/linux_logo.h>
#include <linux/dma-mapping.h>
+#include <linux/regulator/consumer.h>
+
+#include "bmp_helper.h"
#if defined(CONFIG_RK_HDMI)
-#include "hdmi/rk_hdmi.h"
+#include "hdmi/rockchip-hdmi.h"
#endif
#if defined(CONFIG_ROCKCHIP_RGA) || defined(CONFIG_ROCKCHIP_RGA2)
#endif
#define H_USE_FENCE 1
+/* #define FB_ROATE_BY_KERNEL 1 */
+
static int hdmi_switch_complete;
static struct platform_device *fb_pdev;
-struct list_head saved_list;
#if defined(CONFIG_FB_MIRRORING)
int (*video_data_to_mirroring) (struct fb_info *info, u32 yuv_phy[2]);
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;
+extern phys_addr_t uboot_logo_base;
+extern phys_addr_t uboot_logo_size;
+extern phys_addr_t uboot_logo_offset;
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) {
case 32:
fb_data_fmt = ARGB888;
break;
+ case 24:
+ fb_data_fmt = RGB888;
+ break;
case 16:
fb_data_fmt = RGB565;
break;
} 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;
}
return dev_drv;
}
+static __maybe_unused struct rk_lcdc_driver *rk_get_extend_lcdc_drv(void)
+{
+ struct rk_fb *inf = NULL;
+ struct rk_lcdc_driver *dev_drv = NULL;
+ int i = 0;
+
+ if (likely(fb_pdev))
+ inf = platform_get_drvdata(fb_pdev);
+ else
+ return NULL;
+
+ for (i = 0; i < inf->num_lcdc; i++) {
+ if (inf->lcdc_dev_drv[i]->prop == EXTEND) {
+ dev_drv = inf->lcdc_dev_drv[i];
+ break;
+ }
+ }
+
+ return dev_drv;
+}
+
/*
* get one frame time of the prmry screen, unit: us
*/
return 0;
}
-static struct rk_lcdc_driver *rk_get_extend_lcdc_drv(void)
-{
- struct rk_fb *inf = NULL;
- struct rk_lcdc_driver *dev_drv = NULL;
- int i = 0;
-
- if (likely(fb_pdev))
- inf = platform_get_drvdata(fb_pdev);
- else
- return NULL;
-
- for (i = 0; i < inf->num_lcdc; i++) {
- if (inf->lcdc_dev_drv[i]->prop == EXTEND) {
- dev_drv = inf->lcdc_dev_drv[i];
- break;
- }
- }
-
- return dev_drv;
-}
-
u32 rk_fb_get_prmry_screen_pixclock(void)
{
struct rk_lcdc_driver *dev_drv = rk_get_prmry_lcdc_drv();
return 0;
}
-static int get_extend_fb_id(struct fb_info *info)
-{
- int fb_id = 0;
- char *id = info->fix.id;
- 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;
- else if (!strcmp(id, "fb1"))
- fb_id = 1;
- else if (!strcmp(id, "fb2") && (dev_drv->lcdc_win_num > 2))
- fb_id = 2;
- else if (!strcmp(id, "fb3") && (dev_drv->lcdc_win_num > 3))
- fb_id = 3;
- return fb_id;
-}
-
static int rk_fb_close(struct fb_info *info, int user)
{
struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
return 0;
}
+#if defined(FB_ROATE_BY_KERNEL)
#if defined(CONFIG_RK29_IPP)
static int get_ipp_format(int fmt)
{
int format = 0;
- format = get_rga_format(src_win->format);
+ format = get_rga_format(src_win->area[0].format);
/* width and height must be even number */
if (format >= RK_FORMAT_YCbCr_422_SP &&
format <= RK_FORMAT_YCrCb_420_P) {
if (src_win->area[0].yvir < src_win->area[0].yact)
src_win->area[0].yvir = src_win->area[0].yact;
- format = get_rga_format(dst_win->format);
+ format = get_rga_format(dst_win->area[0].format);
if (format >= RK_FORMAT_YCbCr_422_SP &&
format <= RK_FORMAT_YCrCb_420_P) {
if ((dst_win->area[0].xact % 2) != 0)
Rga_Request.src.vir_w = src_win->area[0].xvir;
Rga_Request.src.vir_h = src_win->area[0].yvir;
- Rga_Request.src.format = get_rga_format(src_win->format);
+ Rga_Request.src.format = get_rga_format(src_win->area[0].format);
Rga_Request.src.act_w = src_win->area[0].xact;
Rga_Request.src.act_h = src_win->area[0].yact;
Rga_Request.src.x_offset = 0;
Rga_Request.dst.vir_w = dst_win->area[0].xvir;
Rga_Request.dst.vir_h = dst_win->area[0].yvir;
- Rga_Request.dst.format = get_rga_format(dst_win->format);
+ Rga_Request.dst.format = get_rga_format(dst_win->area[0].format);
Rga_Request.clip.xmin = 0;
Rga_Request.clip.xmax = dst_win->area[0].xact - 1;
win_copy_by_rga(dst_win, src_win, ext_dev_drv->rotate_mode,
ext_dev_drv->iommu_enabled);
}
-
#endif
static int rk_fb_rotate(struct fb_info *dst_info,
return 0;
}
-static int rk_fb_win_rotate(struct rk_lcdc_win *dst_win,
- struct rk_lcdc_win *src_win,
- u16 rotate, int iommu_en)
+static int __maybe_unused rk_fb_win_rotate(struct rk_lcdc_win *dst_win,
+ 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, iommu_en);
return 0;
}
-static int rk_fb_set_ext_win_buffer(struct rk_lcdc_win *ext_win,
- struct rk_lcdc_win *win,
- u16 rotate, int iommu_en)
-{
- 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;
- ion_phys_addr_t phy_addr;
- size_t len = 0;
- int ret = 0;
- bool is_yuv = false;
-
- if (unlikely(!ext_win) || unlikely(!win))
- return -1;
-
- if (rk_fb->disp_mode != DUAL || ext_info == NULL)
- return 0;
-
- switch (ext_win->format) {
- case YUV422:
- case YUV420:
- case YUV444:
- case YUV422_A:
- case YUV420_A:
- case YUV444_A:
- is_yuv = true;
- break;
- default:
- is_yuv = false;
- break;
- }
-
- /* no rotate mode */
- if (rotate <= X_Y_MIRROR) {
- if (iommu_en) {
- 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;
- ext_win->area[0].y_offset = win->area[0].y_offset;
- if (is_yuv) {
- ext_win->area[0].cbr_start = win->area[0].cbr_start;
- ext_win->area[0].c_offset = win->area[0].c_offset;
- } else {
- ext_win->area[0].cbr_start = 0;
- ext_win->area[0].c_offset = 0;
- }
- } else {
- ext_win->area[0].smem_start = win->area[0].smem_start;
- ext_win->area[0].y_offset = win->area[0].y_offset;
- if (is_yuv) {
- ext_win->area[0].cbr_start = win->area[0].cbr_start;
- ext_win->area[0].c_offset = win->area[0].c_offset;
- } else {
- ext_win->area[0].cbr_start = 0;
- ext_win->area[0].c_offset = 0;
- }
- }
-
- return 0;
- }
-
- /* rotate mode */
- if (!iommu_en) {
- if (ext_win->id == 0) {
- 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;
- } else {
- ext_win->area[0].y_offset = 0;
- last_win = ext_dev_drv->win[ext_win->id - 1];
- if (last_win->area[0].cbr_start)
- ext_win->area[0].smem_start =
- last_win->area[0].cbr_start +
- last_win->area[0].c_offset +
- last_win->area[0].xvir * last_win->area[0].yvir;
- else
- ext_win->area[0].smem_start =
- last_win->area[0].smem_start +
- last_win->area[0].y_offset +
- last_win->area[0].xvir * last_win->area[0].yvir;
- }
-
- if (is_yuv) {
- 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;
- ext_win->area[0].c_offset = win->area[0].c_offset;
- } else {
- ext_win->area[0].cbr_start = 0;
- ext_win->area[0].c_offset = 0;
- }
- }
-
- return 0;
-}
+#endif
static int rk_fb_pan_display(struct fb_var_screeninfo *var,
struct fb_info *info)
{
- struct rk_fb *rk_fb = dev_get_drvdata(info->device);
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;
- int win_id = 0, extend_win_id = 0;
- struct rk_lcdc_win *extend_win = NULL;
+ int win_id = 0;
struct rk_lcdc_win *win = NULL;
struct rk_screen *screen = dev_drv->cur_screen;
- int fb_id = 0;
-
u32 xoffset = var->xoffset;
u32 yoffset = var->yoffset;
u32 xvir = var->xres_virtual;
- /* u32 yvir = var->yres_virtual; */
- /* u8 data_format = var->nonstd&0xff; */
-
u8 pixel_width;
u32 vir_width_bit;
u32 stride, uv_stride;
else
win = dev_drv->win[win_id];
- 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_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];
- }
-
- pixel_width = rk_fb_pixel_width(win->format);
+ pixel_width = rk_fb_pixel_width(win->area[0].format);
vir_width_bit = pixel_width * xvir;
- /* pixel_width = byte_num * 8 */
stride_32bit_1 = ALIGN_N_TIMES(vir_width_bit, 32) / 8;
stride_32bit_2 = ALIGN_N_TIMES(vir_width_bit * 2, 32) / 8;
- switch (win->format) {
+ switch (win->area[0].format) {
case YUV422:
case YUV422_A:
is_pic_yuv = 1;
dev_drv->ops->pan_display(dev_drv, win_id);
- if (rk_fb->disp_mode == DUAL) {
- 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 (extend_dev_drv->rotate_mode > X_Y_MIRROR)
- rk_fb_rotate(extend_info, info);
-
- extend_dev_drv->ops->pan_display(extend_dev_drv,
- extend_win_id);
- extend_dev_drv->ops->cfg_done(extend_dev_drv);
- }
- }
#ifdef CONFIG_FB_MIRRORING
if (video_data_to_mirroring)
video_data_to_mirroring(info, NULL);
#endif
dev_drv->ops->cfg_done(dev_drv);
+
return 0;
}
int i, j;
i = list_empty(&dev_drv->update_regs_list);
- j = list_empty(&saved_list);
+ j = list_empty(&dev_drv->saved_list);
return i == j ? 0 : 1;
}
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];
#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;
- }
- if (rk_fb->disp_mode == DUAL && hdmi_switch_complete) {
- if (ext_dev_drv->iommu_enabled)
- ion_unmap_iommu(ext_dev_drv->dev,
- rk_fb->ion_client,
+ ion_unmap_iommu(dev_drv->dev, rk_fb->ion_client,
area_data->ion_handle);
+ freed_addr[freed_index++] = area_data->smem_start;
}
#endif
- if (area_data->ion_handle != NULL) {
- ion_unmap_kernel(rk_fb->ion_client,
- area_data->ion_handle);
+ if (area_data->ion_handle != NULL)
ion_free(rk_fb->ion_client, area_data->ion_handle);
- }
+
if (area_data->acq_fence)
sync_fence_put(area_data->acq_fence);
}
memset(reg_win_data, 0, sizeof(struct rk_fb_reg_win_data));
}
-/*
- * function: update extend win info acorrding to primary win info,
- the function is only used for dual display mode
- * @ext_dev_drv: the extend lcdc driver
- * @dev_drv: the primary lcdc driver
- * @ext_win: the lcdc win info of extend screen
- * @win: the lcdc win info of primary screen
- */
-static int rk_fb_update_ext_win(struct rk_lcdc_driver *ext_dev_drv,
- struct rk_lcdc_driver *dev_drv,
- struct rk_lcdc_win *ext_win,
- struct rk_lcdc_win *win)
-{
- struct rk_screen *screen = dev_drv->cur_screen;
- struct rk_screen *ext_screen = ext_dev_drv->cur_screen;
- int hdmi_xsize = ext_screen->xsize;
- int hdmi_ysize = ext_screen->ysize;
- int pixel_width, vir_width_bit, y_stride;
- bool is_yuv = false;
- int rotate_mode = 0;
-
- if (unlikely(!dev_drv) || unlikely(!ext_dev_drv) ||
- unlikely(!ext_win) || unlikely(!win))
- return -1;
-
- rotate_mode = ext_dev_drv->rotate_mode;
-
- if (ext_win->state == 0) {
- dev_info(ext_dev_drv->dev, "extend lcdc win is closed\n");
- return 0;
- }
-
- ext_win->area[0].state = win->area[0].state;
- ext_win->area_num = win->area_num;
- ext_win->format = win->format;
- ext_win->fmt_10 = win->fmt_10;
- ext_win->z_order = win->z_order;
- ext_win->alpha_en = win->alpha_en;
- ext_win->alpha_mode = win->alpha_mode;
- ext_win->g_alpha_val = win->g_alpha_val;
-
- switch (ext_win->format) {
- case YUV422:
- case YUV420:
- case YUV444:
- case YUV422_A:
- case YUV420_A:
- case YUV444_A:
- is_yuv = true;
- break;
- default:
- is_yuv = false;
- break;
- }
-
- if (rotate_mode == ROTATE_90 || rotate_mode == ROTATE_270) {
- ext_win->area[0].xact = win->area[0].yact;
- ext_win->area[0].yact = win->area[0].xact;
- ext_win->area[0].xvir = win->area[0].yact;
- ext_win->area[0].yvir = win->area[0].xact;
-
- pixel_width = rk_fb_pixel_width(ext_win->format);
- vir_width_bit = pixel_width * ext_win->area[0].xvir;
- y_stride = ALIGN_N_TIMES(vir_width_bit, 32) / 8;
- ext_win->area[0].y_vir_stride = y_stride >> 2;
- if (is_yuv)
- ext_win->area[0].uv_vir_stride = ext_win->area[0].y_vir_stride;
- else
- ext_win->area[0].uv_vir_stride = 0;
- } else {
- ext_win->area[0].xact = win->area[0].xact;
- ext_win->area[0].yact = win->area[0].yact;
- 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;
- else
- ext_win->area[0].uv_vir_stride = 0;
- }
-
- if (win->area[0].xpos != 0 || win->area[0].ypos != 0) {
- if (rotate_mode == ROTATE_270) {
- int xbom_pos = 0, ybom_pos = 0;
- int xtop_pos = 0, ytop_pos = 0;
-
- ext_win->area[0].xsize =
- hdmi_xsize * win->area[0].ysize / screen->mode.yres;
- ext_win->area[0].ysize =
- hdmi_ysize * win->area[0].xsize / screen->mode.xres;
- xbom_pos =
- hdmi_xsize * win->area[0].ypos / screen->mode.yres;
- ybom_pos = hdmi_ysize * win->area[0].xpos / screen->mode.xres;
- xtop_pos = hdmi_xsize - ext_win->area[0].xsize - xbom_pos;
- ytop_pos = hdmi_ysize - ext_win->area[0].ysize - ybom_pos;
- ext_win->area[0].xpos =
- ((ext_screen->mode.xres - hdmi_xsize) >> 1) + xtop_pos;
- ext_win->area[0].ypos =
- ((ext_screen->mode.yres - hdmi_ysize) >> 1) + ytop_pos;
- } else if (rotate_mode == ROTATE_90) {
- ext_win->area[0].xsize =
- hdmi_xsize * win->area[0].ysize / screen->mode.yres;
- ext_win->area[0].ysize =
- hdmi_ysize * win->area[0].xsize / screen->mode.xres;
- ext_win->area[0].xpos =
- ((ext_screen->mode.xres - hdmi_xsize) >> 1) +
- hdmi_xsize * win->area[0].ypos / screen->mode.yres;
- ext_win->area[0].ypos =
- ((ext_screen->mode.yres - hdmi_ysize) >> 1) +
- hdmi_ysize * win->area[0].xpos / screen->mode.xres;
- } else {
- ext_win->area[0].xsize =
- hdmi_xsize * win->area[0].xsize / screen->mode.xres;
- ext_win->area[0].ysize =
- hdmi_ysize * win->area[0].ysize / screen->mode.yres;
- ext_win->area[0].xpos =
- ((ext_screen->mode.xres - hdmi_xsize) >> 1) +
- hdmi_xsize * win->area[0].xpos / screen->mode.xres;
- ext_win->area[0].ypos =
- ((ext_screen->mode.yres - hdmi_ysize) >> 1) +
- hdmi_ysize * win->area[0].ypos / screen->mode.yres;
- }
- } else {
- ext_win->area[0].xsize = hdmi_xsize;
- ext_win->area[0].ysize = hdmi_ysize;
- ext_win->area[0].xpos =
- (ext_screen->mode.xres - hdmi_xsize) >> 1;
- ext_win->area[0].ypos =
- (ext_screen->mode.yres - hdmi_ysize) >> 1;
- }
-
- return 0;
-}
-
static void rk_fb_update_win(struct rk_lcdc_driver *dev_drv,
struct rk_lcdc_win *win,
struct rk_fb_reg_win_data *reg_win_data)
rk_fb_get_prmry_screen(&primary_screen);
win->area_num = reg_win_data->area_num;
- win->format = reg_win_data->data_format;
win->id = reg_win_data->win_id;
win->z_order = reg_win_data->z_order;
if (reg_win_data->reg_area_data[0].smem_start > 0) {
win->state = 1;
win->area_num = reg_win_data->area_num;
- win->format = reg_win_data->data_format;
win->id = reg_win_data->win_id;
win->z_order = reg_win_data->z_order;
win->area[0].uv_vir_stride =
win->alpha_en = reg_win_data->alpha_en;
win->alpha_mode = reg_win_data->alpha_mode;
win->g_alpha_val = reg_win_data->g_alpha_val;
+ win->mirror_en = reg_win_data->mirror_en;
+ win->area[0].fbdc_en =
+ reg_win_data->reg_area_data[0].fbdc_en;
+ win->area[0].fbdc_cor_en =
+ reg_win_data->reg_area_data[0].fbdc_cor_en;
+ win->area[0].fbdc_data_format =
+ reg_win_data->reg_area_data[0].fbdc_data_format;
for (i = 0; i < RK_WIN_MAX_AREA; i++) {
if (reg_win_data->reg_area_data[i].smem_start > 0) {
+ win->area[i].format =
+ reg_win_data->reg_area_data[i].data_format;
if (inf->disp_policy != DISPLAY_POLICY_BOX)
win->area[i].ion_hdl =
reg_win_data->reg_area_data[i].ion_handle;
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;
reg_win_data->reg_area_data[i].xvir;
win->area[i].yvir =
reg_win_data->reg_area_data[i].yvir;
+ win->area[i].xoff =
+ reg_win_data->reg_area_data[i].xoff;
+ win->area[i].yoff =
+ reg_win_data->reg_area_data[i].yoff;
win->area[i].y_offset =
reg_win_data->reg_area_data[i].y_offset;
win->area[i].y_vir_stride =
struct rk_lcdc_win *win;
ktime_t timestamp = dev_drv->vsync_info.timestamp;
struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
- struct rk_lcdc_driver *ext_dev_drv;
- struct rk_lcdc_win *ext_win;
struct rk_fb_reg_win_data *win_data;
bool wait_for_vsync;
int count = 100;
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->reg_area_data[0].data_format == YUV420 ||
+ win_data->reg_area_data[0].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) {
- ext_dev_drv = rk_get_extend_lcdc_drv();
- if (!ext_dev_drv) {
- printk(KERN_ERR "hdmi lcdc driver not found!\n");
- goto ext_win_exit;
- }
-
- /*
- * For RK3288: win0 and win1 have only one area and support scale
- * but win2 and win3 don't support scale
- * so hdmi only use win0 or win1
- */
- for (i = 0; i < 2; i++) {
- win = dev_drv->win[i];
- ext_win = ext_dev_drv->win[i];
- ext_win->state = win->state;
- ext_win->id = win->id;
- if (!ext_win->state)
- continue;
- 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 (ext_dev_drv->rotate_mode > X_Y_MIRROR)
- rk_fb_win_rotate(ext_win, win,
- 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);
- }
-
- ext_dev_drv->ops->cfg_done(ext_dev_drv);
- }
-ext_win_exit:
dev_drv->ops->cfg_done(dev_drv);
do {
timeout = wait_event_interruptible_timeout(dev_drv->vsync_info.wait,
ktime_compare(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) {
if (rk_fb->disp_policy == DISPLAY_POLICY_BOX &&
- (dev_drv->win[i]->format == YUV420 ||
- !strcmp(dev_drv->win[i]->name, "hwc"))) {
+ (!strcmp(dev_drv->win[i]->name, "hwc"))) {
continue;
} else {
u32 new_start =
if ((rk_fb->disp_policy ==
DISPLAY_POLICY_BOX) &&
- (new_start == 0x0 ||
- dev_drv->suspend_flag))
+ (dev_drv->suspend_flag))
continue;
if (unlikely(new_start != reg_start)) {
wait_for_vsync = true;
#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)
struct rk_lcdc_driver *dev_drv =
container_of(work, struct rk_lcdc_driver, update_regs_work);
struct rk_fb_reg_data *data, *next;
- /* struct list_head saved_list; */
mutex_lock(&dev_drv->update_regs_list_lock);
- saved_list = dev_drv->update_regs_list;
- list_replace_init(&dev_drv->update_regs_list, &saved_list);
+ dev_drv->saved_list = dev_drv->update_regs_list;
+ list_replace_init(&dev_drv->update_regs_list, &dev_drv->saved_list);
mutex_unlock(&dev_drv->update_regs_list_lock);
- list_for_each_entry_safe(data, next, &saved_list, list) {
+ list_for_each_entry_safe(data, next, &dev_drv->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))
if ((area_par->xpos + area_par->xsize > screen->mode.xres) ||
(area_par->ypos + area_par->ysize > screen->mode.yres) ||
(area_par->xsize <= 0) || (area_par->ysize <= 0)) {
- pr_err("check config var fail 1:\n"
+ pr_warn("check config var fail 1:\n"
"xpos=%d,xsize=%d,xres=%d\n"
"ypos=%d,ysize=%d,yres=%d\n",
area_par->xpos, area_par->xsize, screen->mode.xres,
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];
+ struct fb_info *fbi;
int i, ion_fd, acq_fence_fd;
u32 xvir, yvir;
u32 xoffset, yoffset;
ion_import_dma_buf(rk_fb->ion_client,
ion_fd);
if (IS_ERR(hdl)) {
- pr_info
- ("%s: Could not import handle: %d\n",
- __func__, (int)hdl);
+ pr_info("%s: Could not import handle:"
+ " %ld\n", __func__, (long)hdl);
/*return -EINVAL; */
break;
}
- fbi->screen_base =
- ion_map_kernel(rk_fb->ion_client, hdl);
reg_win_data->area_num++;
reg_win_data->reg_area_data[i].ion_handle = hdl;
#ifndef CONFIG_ROCKCHIP_IOMMU
sync_fence_fdget(win_par->area_par[i].acq_fence_fd);
}
}
- fb_data_fmt = rk_fb_data_fmt(win_par->data_format, 0);
- reg_win_data->data_format = fb_data_fmt;
- pixel_width = rk_fb_pixel_width(fb_data_fmt);
-
- ppixel_a = ((fb_data_fmt == ARGB888) ||
- (fb_data_fmt == ABGR888)) ? 1 : 0;
- global_a = (win_par->g_alpha_val == 0) ? 0 : 1;
- reg_win_data->alpha_en = ppixel_a | global_a;
- reg_win_data->g_alpha_val = win_par->g_alpha_val;
- reg_win_data->alpha_mode = win_par->alpha_mode;
if (reg_win_data->reg_area_data[0].smem_start > 0) {
reg_win_data->z_order = win_par->z_order;
reg_win_data->win_id = win_par->win_id;
reg_win_data->win_id = -1;
}
- rk_fb_get_prmry_screen(&primary_screen);
+ reg_win_data->mirror_en = win_par->mirror_en;
+ reg_win_data->reg_area_data[0].fbdc_en = win_par->area_par[0].fbdc_en;
+ reg_win_data->reg_area_data[0].fbdc_cor_en =
+ win_par->area_par[0].fbdc_cor_en;
+ reg_win_data->reg_area_data[0].fbdc_data_format =
+ win_par->area_par[0].fbdc_data_format;
for (i = 0; i < reg_win_data->area_num; i++) {
- 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);
+ rk_fb_check_config_var(&win_par->area_par[i], screen);
+
+ fb_data_fmt = rk_fb_data_fmt(win_par->area_par[i].data_format, 0);
+ reg_win_data->reg_area_data[i].data_format = fb_data_fmt;
+ pixel_width = rk_fb_pixel_width(fb_data_fmt);
+
+ ppixel_a |= ((fb_data_fmt == ARGB888) ||
+ (fb_data_fmt == ABGR888)) ? 1 : 0;
/* 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;
xoffset = win_par->area_par[i].x_offset; /* buf offset */
yoffset = win_par->area_par[i].y_offset;
+ reg_win_data->reg_area_data[i].xoff = xoffset;
+ reg_win_data->reg_area_data[i].yoff = yoffset;
+
xvir = win_par->area_par[i].xvir;
reg_win_data->reg_area_data[i].xvir = xvir;
yvir = win_par->area_par[i].yvir;
* reg_win_data->reg_area_data[i].y_offset =
* yoffset*stride+xoffset*pixel_width/8;
*/
- if (screen->y_mirror == 1) {
+ if ((screen->y_mirror == 1) || (reg_win_data->mirror_en)) {
if (screen->interlace == 1) {
reg_win_data->reg_area_data[i].y_offset =
yoffset * stride * 2 +
}
}
}
+
+ global_a = (win_par->g_alpha_val == 0) ? 0 : 1;
+ reg_win_data->alpha_en = ppixel_a | global_a;
+ reg_win_data->g_alpha_val = win_par->g_alpha_val;
+ reg_win_data->alpha_mode = win_par->alpha_mode;
+
switch (fb_data_fmt) {
case YUV422:
case YUV422_A:
reg_win_data->reg_area_data[0].cbr_start =
reg_win_data->reg_area_data[0].smem_start + xvir * yvir;
reg_win_data->reg_area_data[0].uv_vir_stride = uv_stride >> 2;
- if (screen->y_mirror == 1) {
+ if ((screen->y_mirror == 1) || (reg_win_data->mirror_en)) {
if (screen->interlace == 1) {
reg_win_data->reg_area_data[0].c_offset =
uv_y_off * uv_stride * 2 +
}
}
}
+
+ /* 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;
}
int ret = 0, i, j = 0;
int list_is_empty = 0;
+ if (dev_drv->suspend_flag) {
+ dev_drv->timeline_max++;
+ sw_sync_timeline_inc(dev_drv->timeline, 1);
+ return 0;
+ }
+
regs = kzalloc(sizeof(struct rk_fb_reg_data), GFP_KERNEL);
if (!regs) {
printk(KERN_INFO "could not allocate rk_fb_reg_data\n");
}
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;
- }
dev_drv->timeline_max++;
#ifdef H_USE_FENCE
win_data->ret_fence_fd = get_unused_fd();
if (win_data->ret_fence_fd < 0) {
printk("ret_fence_fd=%d\n", win_data->ret_fence_fd);
+ win_data->ret_fence_fd = -1;
ret = -EFAULT;
goto err;
}
} else {
mutex_lock(&dev_drv->update_regs_list_lock);
list_is_empty = list_empty(&dev_drv->update_regs_list) &&
- list_empty(&saved_list);
+ list_empty(&dev_drv->saved_list);
mutex_unlock(&dev_drv->update_regs_list_lock);
if (!list_is_empty) {
ret = wait_event_timeout(dev_drv->update_regs_wait,
- list_empty(&dev_drv->update_regs_list) && list_empty(&saved_list),
+ list_empty(&dev_drv->update_regs_list) && list_empty(&dev_drv->saved_list),
msecs_to_jiffies(60));
if (ret > 0)
rk_fb_update_reg(dev_drv, regs);
} else if (ret == 0) {
rk_fb_update_reg(dev_drv, regs);
}
- kfree(regs);
}
err:
{
struct rk_fb *rk_fb = dev_get_drvdata(info->device);
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;
- struct rk_lcdc_driver *extend_dev_drv = NULL;
- struct rk_lcdc_win *extend_win = NULL;
struct rk_lcdc_win *win;
int enable; /* enable fb:1 enable;0 disable */
int ovl; /* overlay:0 win1 on the top of win0;1,win0 on the top of win1 */
void __user *argp = (void __user *)arg;
win = dev_drv->win[win_id];
- 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_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];
- }
switch (cmd) {
case RK_FBIOSET_HWC_ADDR:
if (!usr_fd) {
fix->smem_start = 0;
fix->mmio_start = 0;
+ dev_drv->ops->open(dev_drv, win_id, 0);
break;
}
usr_fd = yuv_phy[0];
offset = yuv_phy[1] - yuv_phy[0];
-
if (!usr_fd) {
fix->smem_start = 0;
fix->mmio_start = 0;
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:
win = dev_drv->win[win_id];
/* only read the current frame buffer */
- if (win->format == RGB565) {
+ if (win->area[0].format == RGB565) {
total_size = win->area[0].y_vir_stride * win->area[0].yact << 1;
- } else if (win->format == YUV420) {
+ } else if (win->area[0].format == YUV420) {
total_size =
(win->area[0].y_vir_stride * win->area[0].yact * 6);
} else {
win = dev_drv->win[win_id];
/* write the current frame buffer */
- if (win->format == RGB565)
+ if (win->area[0].format == RGB565)
total_size = win->area[0].xact * win->area[0].yact << 1;
else
total_size = win->area[0].xact * win->area[0].yact << 2;
return (cnt) ? cnt : err;
}
-/*
- * 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, 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;
- struct rk_lcdc_win *ext_win = NULL;
- int win_id = 0, ext_win_id = 0;
-
- if (rk_fb->disp_mode != DUAL || info == ext_info)
- return 0;
- if (unlikely(!info) || unlikely(!ext_info))
- return -1;
-
- 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;
-
- win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
- win = dev_drv->win[win_id];
- ext_win_id = ext_dev_drv->ops->fb_get_win_id(ext_dev_drv,
- ext_info->fix.id);
- ext_win = ext_dev_drv->win[ext_win_id];
-
- rk_fb_update_ext_win(ext_dev_drv, dev_drv, ext_win, win);
- 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 = 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);
- }
-
- /* update extend info */
- ext_info->var.xres = ext_win->area[0].xact;
- ext_info->var.yres = ext_win->area[0].yact;
- ext_info->var.xres_virtual = ext_win->area[0].xvir;
- ext_info->var.yres_virtual = ext_win->area[0].yvir;
-
- /* config same data format */
- ext_info->var.nonstd &= 0xffffff00;
- ext_info->var.nonstd |= (info->var.nonstd & 0xff);
-
- ext_info->var.nonstd &= 0xff;
- ext_info->var.nonstd |=
- (ext_win->area[0].xpos << 8) + (ext_win->area[0].ypos << 20);
-
- ext_info->var.grayscale &= 0xff;
- ext_info->var.grayscale |=
- (ext_win->area[0].xsize << 8) + (ext_win->area[0].ysize << 20);
-
- return 0;
-}
-
static int rk_fb_set_par(struct fb_info *info)
{
struct fb_var_screeninfo *var = &info->var;
struct fb_fix_screeninfo *fix = &info->fix;
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;
- struct rk_lcdc_driver *extend_dev_drv = NULL;
- struct rk_lcdc_win *extend_win = NULL;
struct rk_lcdc_win *win = NULL;
struct rk_screen *screen = dev_drv->cur_screen;
int win_id = 0;
else
win = dev_drv->win[win_id];
- 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_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];
- }
-
/* if the application has specific the horizontal and vertical display size */
if (var->grayscale >> 8) {
xsize = (var->grayscale >> 8) & 0xfff;
}
}
- win->format = fb_data_fmt;
+ win->area[0].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;
win->area[0].yact = var->yres;
win->area[0].xvir = var->xres_virtual; /* virtual resolution stride --->LCDC_WINx_VIR */
win->area[0].yvir = var->yres_virtual;
+ win->area[0].xoff = xoffset;
+ win->area[0].yoff = yoffset;
win->area_num = 1;
win->alpha_mode = 4; /* AB_SRC_OVER; */
- win->alpha_en = ((win->format == ARGB888) ||
- (win->format == ABGR888)) ? 1 : 0;
+ win->alpha_en = ((win->area[0].format == ARGB888) ||
+ (win->area[0].format == ABGR888)) ? 1 : 0;
win->g_alpha_val = 0;
- if (rk_fb->disp_mode == DUAL) {
- if (extend_win->state && hdmi_switch_complete) {
- if (info != extend_info) {
- rk_fb_update_ext_win(extend_dev_drv, dev_drv,
- extend_win, win);
- extend_dev_drv->ops->set_par(extend_dev_drv,
- extend_win_id);
- }
- }
- }
+ if (rk_fb->disp_policy == DISPLAY_POLICY_BOX &&
+ (win->area[0].format == YUV420 || win->area[0].format == YUV420_A))
+ win->state = 1;
+
dev_drv->ops->set_par(dev_drv, win_id);
return 0;
{
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;
char name[6] = {0};
int i, win_id, load_screen = 0;
if (dev_drv->ops->set_screen_scaler)
dev_drv->ops->set_screen_scaler(dev_drv, dev_drv->screen0, 0);
}
-
+ if (dev_drv->uboot_logo && (screen->type != dev_drv->cur_screen->type))
+ dev_drv->uboot_logo = 0;
if (!enable) {
/* if screen type is different, we do not disable lcdc. */
if (dev_drv->cur_screen->type != screen->type)
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->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)
dev_drv->ops->open(dev_drv, i, 0);
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) {
+ if ((!dev_drv->uboot_logo) ||
+ (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);
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 (fb_par->state) {
- if (!dev_drv->win[win_id]->state)
+ if (!dev_drv->win[win_id]->state) {
dev_drv->ops->open(dev_drv, win_id, 1);
+ dev_drv->suspend_flag = 0;
+ }
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) {
+ 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);
}
}
}
ypos = (screen_y - screen_y * scale_y / 100) >> 1;
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, 0);
- } else {
+ if (inf->disp_mode == ONE_DUAL) {
var->nonstd &= 0xff;
var->nonstd |= (xpos << 8) + (ypos << 20);
var->grayscale &= 0xff;
}
}
+ 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;
}
}
#endif
-static int rk_fb_alloc_buffer(struct fb_info *fbi, int fb_id)
+static int rk_fb_alloc_buffer(struct fb_info *fbi)
{
struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
fbi->screen_base = fb_mem_virt;
#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_start, fbi->screen_base,
- fbi->fix.smem_len);
} else {
- if (dev_drv->rotate_mode > X_Y_MIRROR) {
- fb_mem_size = get_rotate_fb_size();
-#if defined(CONFIG_ION_ROCKCHIP)
- if (rk_fb_alloc_buffer_by_ion(fbi, win, fb_mem_size) < 0)
- return -ENOMEM;
-#else
- fb_mem_virt =
- dma_alloc_writecombine(fbi->dev,
- fb_mem_size,
- &fb_mem_phys,
- GFP_KERNEL);
- if (!fb_mem_virt) {
- pr_err("%s: Failed to allocate framebuffer\n",
- __func__);
- return -ENOMEM;
- }
- fbi->fix.smem_len = fb_mem_size;
- fbi->fix.smem_start = fb_mem_phys;
- fbi->screen_base = fb_mem_virt;
-#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;
- }
-
- printk(KERN_INFO "fb%d:phy:%lx>>vir:%p>>len:0x%x\n", fb_id,
- fbi->fix.smem_start, fbi->screen_base,
- fbi->fix.smem_len);
+ 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;
}
fbi->screen_size = fbi->fix.smem_len;
fb_par->fb_virt_base = fbi->screen_base;
fb_par->fb_size = fbi->fix.smem_len;
+ pr_info("%s:phy:%lx>>vir:%p>>len:0x%x\n", fbi->fix.id,
+ fbi->fix.smem_start, fbi->screen_base,
+ 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;
}
/* show logo for primary display device */
-#if !defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_LOGO)
+#if !defined(CONFIG_FRAMEBUFFER_CONSOLE)
if (dev_drv->prop == PRMRY) {
+ u16 xact, yact;
+ int format;
+ u32 dsp_addr;
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 */
+ rk_fb_alloc_buffer(main_fbi); /* only alloc memory for main fb */
dev_drv->uboot_logo = support_uboot_display();
- if (support_uboot_display()) {
- /*
- if (dev_drv->iommu_enabled)
- rk_fb_copy_from_loader(main_fbi);
- */
+
+ if (dev_drv->uboot_logo &&
+ uboot_logo_offset && uboot_logo_base) {
+ int width, height, bits;
+ phys_addr_t start = uboot_logo_base + uboot_logo_offset;
+ unsigned int size = uboot_logo_size - uboot_logo_offset;
+ unsigned int nr_pages;
+ struct page **pages;
+ char *vaddr;
+ int i = 0;
+
+ if (dev_drv->ops->get_dspbuf_info)
+ dev_drv->ops->get_dspbuf_info(dev_drv, &xact,
+ &yact, &format, &dsp_addr);
+ nr_pages = size >> PAGE_SHIFT;
+ pages = kzalloc(sizeof(struct page) * nr_pages,
+ GFP_KERNEL);
+ 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));
+ if (!vaddr) {
+ pr_err("failed to vmap phy addr %x\n",
+ uboot_logo_base + uboot_logo_offset);
+ return -1;
+ }
+
+ if(bmpdecoder(vaddr, main_fbi->screen_base, &width,
+ &height, &bits)) {
+ kfree(pages);
+ vunmap(vaddr);
+ return 0;
+ }
+ kfree(pages);
+ vunmap(vaddr);
+ if (dev_drv->uboot_logo &&
+ (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;
+ }
+
+ if (dev_drv->ops->post_dspbuf) {
+ dev_drv->ops->post_dspbuf(dev_drv,
+ main_fbi->fix.smem_start,
+ rk_fb_data_fmt(0, bits),
+ width, height, width * bits >> 5);
+ }
+ if (dev_drv->iommu_enabled) {
+ rk_fb_poll_wait_frame_complete();
+ if (dev_drv->ops->mmu_en)
+ dev_drv->ops->mmu_en(dev_drv);
+ freed_index = 0;
+ }
+
+ return 0;
+ } else if (dev_drv->uboot_logo && uboot_logo_base) {
+ phys_addr_t start = uboot_logo_base;
+ int logo_len, i=0;
+ unsigned int nr_pages;
+ struct page **pages;
+ char *vaddr;
+
+ dev_drv->ops->get_dspbuf_info(dev_drv, &xact,
+ &yact, &format,
+ &start);
+ logo_len = rk_fb_pixel_width(format) * xact * yact >> 3;
+ if (logo_len > uboot_logo_size ||
+ logo_len > main_fbi->fix.smem_len) {
+ pr_err("logo size > uboot reserve buffer size\n");
+ return -1;
+ }
+
+ nr_pages = uboot_logo_size >> PAGE_SHIFT;
+ pages = kzalloc(sizeof(struct page) * nr_pages,
+ GFP_KERNEL);
+ 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));
+ if (!vaddr) {
+ pr_err("failed to vmap phy addr %x\n",
+ uboot_logo_base);
+ return -1;
+ }
+
+ memcpy(main_fbi->screen_base, vaddr, logo_len);
+
+ kfree(pages);
+ vunmap(vaddr);
+
+ dev_drv->ops->post_dspbuf(dev_drv,
+ main_fbi->fix.smem_start,
+ format, xact, yact,
+ xact * rk_fb_pixel_width(format) >> 5);
+ if (dev_drv->iommu_enabled) {
+ rk_fb_poll_wait_frame_complete();
+ if (dev_drv->ops->mmu_en)
+ dev_drv->ops->mmu_en(dev_drv);
+ freed_index = 0;
+ }
return 0;
}
+#if defined(CONFIG_LOGO)
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);
- rk_fb_alloc_buffer(extend_fbi, extend_fb_id);
+ rk_fb_alloc_buffer(extend_fbi);
}
#endif
return 0;
projects / firefly-linux-kernel-4.4.55.git / blobdiff