#include <linux/rk_fb.h>
#include <linux/linux_logo.h>
#include <linux/dma-mapping.h>
+#include <linux/regulator/consumer.h>
#if defined(CONFIG_RK_HDMI)
#include "hdmi/rk_hdmi.h"
#ifdef CONFIG_OF
#include <linux/of.h>
+#include <linux/of_platform.h>
#include <linux/of_gpio.h>
#include <video/of_display_timing.h>
#include <video/display_timing.h>
#if defined(CONFIG_ION_ROCKCHIP)
#include <linux/rockchip_ion.h>
-#include <linux/rockchip/iovmm.h>
-#include <linux/rockchip/sysmmu.h>
+#include <linux/rockchip-iovmm.h>
#include <linux/dma-buf.h>
#include <linux/highmem.h>
#endif
EXPORT_SYMBOL(video_data_to_mirroring);
#endif
-struct rk_fb_reg_win_data g_reg_win_data[4];
-static int g_last_win_num;
-static int g_first_buf = 1;
static struct rk_fb_trsm_ops *trsm_lvds_ops;
static struct rk_fb_trsm_ops *trsm_edp_ops;
static struct rk_fb_trsm_ops *trsm_mipi_ops;
return uboot_logo_on;
}
+int rk_fb_get_display_policy(void)
+{
+ struct rk_fb *rk_fb;
+
+ if (fb_pdev) {
+ rk_fb = platform_get_drvdata(fb_pdev);
+ return rk_fb->disp_policy;
+ } else {
+ return DISPLAY_POLICY_SDK;
+ }
+}
+
int rk_fb_trsm_ops_register(struct rk_fb_trsm_ops *ops, int type)
{
switch (type) {
} else {
pwr_ctr->pwr_ctr.type = REGULATOR;
-
+ pwr_ctr->pwr_ctr.rgl_name = NULL;
+ ret = of_property_read_string(child, "rockchip,regulator_name",
+ &(pwr_ctr->pwr_ctr.rgl_name));
+ if (ret || IS_ERR_OR_NULL(pwr_ctr->pwr_ctr.rgl_name))
+ dev_err(dev_drv->dev, "get regulator name failed!\n");
+ if (!of_property_read_u32(child, "rockchip,regulator_voltage", &val))
+ pwr_ctr->pwr_ctr.volt = val;
+ else
+ pwr_ctr->pwr_ctr.volt = 0;
}
};
- of_property_read_u32(child, "rockchip,delay", &val);
- pwr_ctr->pwr_ctr.delay = val;
+
+ if (!of_property_read_u32(child, "rockchip,delay", &val))
+ pwr_ctr->pwr_ctr.delay = val;
+ else
+ pwr_ctr->pwr_ctr.delay = 0;
list_add_tail(&pwr_ctr->list, &dev_drv->pwrlist_head);
}
struct list_head *pos;
struct rk_disp_pwr_ctr_list *pwr_ctr_list;
struct pwr_ctr *pwr_ctr;
+ struct regulator *regulator_lcd = NULL;
+ int count = 10;
+
if (list_empty(&dev_drv->pwrlist_head))
return 0;
list_for_each(pos, &dev_drv->pwrlist_head) {
if (pwr_ctr->type == GPIO) {
gpio_direction_output(pwr_ctr->gpio, pwr_ctr->atv_val);
mdelay(pwr_ctr->delay);
+ } else if (pwr_ctr->type == REGULATOR) {
+ if (pwr_ctr->rgl_name)
+ regulator_lcd = regulator_get(NULL, pwr_ctr->rgl_name);
+ if (regulator_lcd == NULL) {
+ dev_err(dev_drv->dev,
+ "%s: regulator get failed,regulator name:%s\n",
+ __func__, pwr_ctr->rgl_name);
+ continue;
+ }
+ regulator_set_voltage(regulator_lcd, pwr_ctr->volt, pwr_ctr->volt);
+ while (!regulator_is_enabled(regulator_lcd)) {
+ if (regulator_enable(regulator_lcd) == 0 || count == 0)
+ break;
+ else
+ dev_err(dev_drv->dev,
+ "regulator_enable failed,count=%d\n",
+ count);
+ count--;
+ }
+ regulator_put(regulator_lcd);
+ msleep(pwr_ctr->delay);
}
}
struct list_head *pos;
struct rk_disp_pwr_ctr_list *pwr_ctr_list;
struct pwr_ctr *pwr_ctr;
+ struct regulator *regulator_lcd = NULL;
+ int count = 10;
+
if (list_empty(&dev_drv->pwrlist_head))
return 0;
list_for_each(pos, &dev_drv->pwrlist_head) {
pwr_ctr_list = list_entry(pos, struct rk_disp_pwr_ctr_list,
list);
pwr_ctr = &pwr_ctr_list->pwr_ctr;
- if (pwr_ctr->type == GPIO)
+ if (pwr_ctr->type == GPIO) {
gpio_set_value(pwr_ctr->gpio, !pwr_ctr->atv_val);
+ } else if (pwr_ctr->type == REGULATOR) {
+ if (pwr_ctr->rgl_name)
+ regulator_lcd = regulator_get(NULL, pwr_ctr->rgl_name);
+ if (regulator_lcd == NULL) {
+ dev_err(dev_drv->dev,
+ "%s: regulator get failed,regulator name:%s\n",
+ __func__, pwr_ctr->rgl_name);
+ continue;
+ }
+ while (regulator_is_enabled(regulator_lcd) > 0) {
+ if (regulator_disable(regulator_lcd) == 0 || count == 0)
+ break;
+ else
+ dev_err(dev_drv->dev,
+ "regulator_disable failed,count=%d\n",
+ count);
+ count--;
+ }
+ regulator_put(regulator_lcd);
+ }
}
return 0;
}
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;
strcpy(fmt, "XBGR888");
break;
case ABGR888:
- strcpy(fmt, "XBGR888");
+ strcpy(fmt, "ABGR888");
break;
default:
strcpy(fmt, "invalid");
*/
struct rk_lcdc_driver *rk_get_lcdc_drv(char *name)
{
- struct rk_fb *inf = platform_get_drvdata(fb_pdev);
+ 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 (!strcmp(inf->lcdc_dev_drv[i]->name, name))
+ if (!strcmp(inf->lcdc_dev_drv[i]->name, name)) {
+ dev_drv = inf->lcdc_dev_drv[i];
break;
+ }
}
- return inf->lcdc_dev_drv[i];
+ return dev_drv;
}
static struct rk_lcdc_driver *rk_get_prmry_lcdc_drv(void)
return 0;
}
-#if 0
static struct rk_lcdc_driver *rk_get_extend_lcdc_drv(void)
{
struct rk_fb *inf = NULL;
return dev_drv;
}
-#endif
u32 rk_fb_get_prmry_screen_pixclock(void)
{
return true;
}
+
+/* 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);
+ return NULL;
+ }
+
+ pd = of_find_device_by_node(dn);
+ 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
+void rk_fb_platform_set_sysmmu(struct device *sysmmu, struct device *dev)
+{
+ dev->archdata.iommu = sysmmu;
+}
+#else
+void rk_fb_platform_set_sysmmu(struct device *sysmmu, struct device *dev)
+{
+
+}
+#endif
+
static int rk_fb_open(struct fb_info *info, int user)
{
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
int win_id;
win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
- dev_drv->win[win_id]->logicalstate++;
+ fb_par->state++;
/* if this win aready opened ,no need to reopen */
if (dev_drv->win[win_id]->state)
return 0;
{
int fb_id = 0;
char *id = info->fix.id;
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
if (!strcmp(id, "fb0"))
fb_id = 0;
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_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_lcdc_win *win = NULL;
int win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
if (win_id >= 0) {
- dev_drv->win[win_id]->logicalstate--;
- if (!dev_drv->win[win_id]->logicalstate) {
- win = dev_drv->win[win_id];
- info->fix.smem_start = win->reserved;
+ win = dev_drv->win[win_id];
+ fb_par->state--;
+ if (!fb_par->state) {
+ if (fb_par->fb_phy_base > 0)
+ info->fix.smem_start = fb_par->fb_phy_base;
info->var.xres = dev_drv->screen0->mode.xres;
info->var.yres = dev_drv->screen0->mode.yres;
/*
}
static void fb_copy_by_ipp(struct fb_info *dst_info,
- struct fb_info *src_info, int offset)
+ struct fb_info *src_info)
{
struct rk29_ipp_req ipp_req;
uint32_t rotation = 0;
int dst_w, dst_h, dst_vir_w;
int ipp_fmt;
u8 data_format = (dst_info->var.nonstd) & 0xff;
- struct rk_lcdc_driver *ext_dev_drv =
- (struct rk_lcdc_driver *)dst_info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)dst_info->par;
+ struct rk_lcdc_driver *ext_dev_drv = fb_par->lcdc_drv;
u16 orientation = ext_dev_drv->rotate_mode;
memset(&ipp_req, 0, sizeof(struct rk29_ipp_req));
static void rga_win_check(struct rk_lcdc_win *dst_win,
struct rk_lcdc_win *src_win)
{
- int align32 = 4;
-
- align32 -= 1;
- /*width and height must be aligned by 32 bit */
- if ((src_win->area[0].xact & align32) != 0)
- src_win->area[0].xact =
- (src_win->area[0].xact + align32) & (~align32);
- if ((src_win->area[0].yact & align32) != 0)
- src_win->area[0].yact =
- (src_win->area[0].yact + align32) & (~align32);
+ int format = 0;
+
+ format = get_rga_format(src_win->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].xact % 2) != 0)
+ src_win->area[0].xact += 1;
+ if ((src_win->area[0].yact % 2) != 0)
+ src_win->area[0].yact += 1;
+ }
if (src_win->area[0].xvir < src_win->area[0].xact)
src_win->area[0].xvir = src_win->area[0].xact;
if (src_win->area[0].yvir < src_win->area[0].yact)
src_win->area[0].yvir = src_win->area[0].yact;
- if ((dst_win->area[0].xact & align32) != 0)
- dst_win->area[0].xact =
- (dst_win->area[0].xact + align32) & (~align32);
- if ((dst_win->area[0].yact & align32) != 0)
- dst_win->area[0].yact =
- (dst_win->area[0].yact + align32) & (~align32);
+ format = get_rga_format(dst_win->format);
+ if (format >= RK_FORMAT_YCbCr_422_SP &&
+ format <= RK_FORMAT_YCrCb_420_P) {
+ if ((dst_win->area[0].xact % 2) != 0)
+ dst_win->area[0].xact += 1;
+ if ((dst_win->area[0].yact % 2) != 0)
+ dst_win->area[0].yact += 1;
+ }
if (dst_win->area[0].xvir < dst_win->area[0].xact)
dst_win->area[0].xvir = dst_win->area[0].xact;
if (dst_win->area[0].yvir < dst_win->area[0].yact)
}
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 rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
struct rga_req Rga_Request;
long ret = 0;
/* int fd = 0; */
Rga_Request.cosa = 0;
Rga_Request.dst.act_w = dst_win->area[0].yact;
Rga_Request.dst.act_h = dst_win->area[0].xact;
- Rga_Request.dst.x_offset = dst_win->area[0].xact - 1;
+ Rga_Request.dst.x_offset = 0;
Rga_Request.dst.y_offset = dst_win->area[0].yact - 1;
break;
default:
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;
-
- dst_win->area[0].smem_start =
- rk_fb->fb[rk_fb->num_fb >> 1]->fix.smem_start;
- 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;
src_win->area[0].smem_start + src_win->area[0].y_offset;
Rga_Request.src.v_addr = 0;
- dst_win->area[0].smem_start =
- rk_fb->fb[rk_fb->num_fb >> 1]->fix.smem_start;
Rga_Request.dst.yrgb_addr = 0;
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;
* RGA only support copy RGB to RGB
* RGA2 support copy RGB to RGB and YUV to YUV
*/
-static void fb_copy_by_rga(struct fb_info *dst_info, struct fb_info *src_info,
- int yrgb_offset)
+static void fb_copy_by_rga(struct fb_info *dst_info,
+ struct fb_info *src_info)
{
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)src_info->par;
- struct rk_lcdc_driver *ext_dev_drv =
- (struct rk_lcdc_driver *)dst_info->par;
+ struct rk_fb_par *src_fb_par = (struct rk_fb_par *)src_info->par;
+ struct rk_fb_par *dst_fb_par = (struct rk_fb_par *)dst_info->par;
+ struct rk_lcdc_driver *dev_drv = src_fb_par->lcdc_drv;
+ struct rk_lcdc_driver *ext_dev_drv = dst_fb_par->lcdc_drv;
int win_id = 0, ext_win_id;
struct rk_lcdc_win *src_win, *dst_win;
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_rotate(struct fb_info *dst_info,
- struct fb_info *src_info, int offset)
+ struct fb_info *src_info)
{
+
#if defined(CONFIG_RK29_IPP)
- fb_copy_by_ipp(dst_info, src_info, offset);
+ fb_copy_by_ipp(dst_info, src_info);
#elif defined(CONFIG_ROCKCHIP_RGA) || defined(CONFIG_ROCKCHIP_RGA2)
- fb_copy_by_rga(dst_info, src_info, offset);
+ fb_copy_by_rga(dst_info, src_info);
#else
return -1;
#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
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;
+}
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_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_fb_par *extend_fb_par = NULL;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct fb_fix_screeninfo *fix = &info->fix;
struct fb_info *extend_info = NULL;
struct rk_lcdc_driver *extend_dev_drv = NULL;
if (rk_fb->disp_mode == DUAL) {
fb_id = get_extend_fb_id(info);
extend_info = rk_fb->fb[(rk_fb->num_fb >> 1) + fb_id];
- extend_dev_drv = (struct rk_lcdc_driver *)extend_info->par;
+ extend_fb_par = (struct rk_fb_par *)extend_info->par;
+ extend_dev_drv = extend_fb_par->lcdc_drv;
extend_win_id = dev_drv->ops->fb_get_win_id(extend_dev_drv,
extend_info->fix.id);
extend_win = extend_dev_drv->win[extend_win_id];
win->area[0].cbr_start = fix->mmio_start;
win->area[0].state = 1;
win->area_num = 1;
- win->state = 1;
dev_drv->ops->pan_display(dev_drv, win_id);
+
if (rk_fb->disp_mode == DUAL) {
- if (extend_win->state && (hdmi_switch_complete)) {
- 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 {
- extend_win->area[0].smem_start =
- win->area[0].smem_start;
- extend_win->area[0].cbr_start =
- win->area[0].cbr_start;
- }
+ 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 (err < 0)
printk("error waiting on fence\n");
}
-
+#if 0
static int rk_fb_copy_from_loader(struct fb_info *info)
{
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
void *dst = info->screen_base;
u32 dsp_addr[4];
u32 src;
- u32 i;
- struct rk_lcdc_win *win = dev_drv->win[0];
- u32 size = (win->area[0].xact) * (win->area[0].yact) << 2;
+ u32 i,size;
+ int win_id;
+ struct rk_lcdc_win *win;
+
+ win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
+ win = dev_drv->win[win_id];
+ size = (win->area[0].xact) * (win->area[0].yact) << 2;
dev_drv->ops->get_dsp_addr(dev_drv, dsp_addr);
- src = dsp_addr[0];
+ src = dsp_addr[win_id];
dev_info(info->dev, "copy fb data %d x %d from dst_addr:%08x\n",
win->area[0].xact, win->area[0].yact, src);
for (i = 0; i < size; i += PAGE_SIZE) {
void *to_virt = dst + i;
memcpy(to_virt, from_virt, PAGE_SIZE);
}
+ dev_drv->ops->direct_set_addr(dev_drv, win_id,
+ info->fix.smem_start);
return 0;
}
-
+#endif
#ifdef CONFIG_ROCKCHIP_IOMMU
static int g_last_addr[4];
int g_last_timeout;
char buf[PAGE_SIZE];
int rk_fb_sysmmu_fault_handler(struct device *dev,
- enum rk_sysmmu_inttype itype,
+ enum rk_iommu_inttype itype,
unsigned long pgtable_base,
unsigned long fault_addr, unsigned int status)
{
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];
index_buf = area_data->index_buf;
#if defined(CONFIG_ROCKCHIP_IOMMU)
if (dev_drv->iommu_enabled) {
+ if (rk_fb->disp_policy != DISPLAY_POLICY_BOX)
ion_unmap_iommu(dev_drv->dev, rk_fb->ion_client,
area_data->ion_handle);
freed_addr[freed_index++] = area_data->smem_start;
}
+ 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,
+ area_data->ion_handle);
+ }
#endif
if (area_data->ion_handle != NULL) {
ion_unmap_kernel(rk_fb->ion_client,
memset(reg_win_data, 0, sizeof(struct rk_fb_reg_win_data));
}
-static void rk_fb_update_driver(struct rk_lcdc_win *win,
+/*
+ * 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)
{
int i = 0;
-/*
- struct rk_lcdc_win *win;
- win = dev_drv->win[reg_win_data->win_id];
-*/
+ struct rk_fb *inf = platform_get_drvdata(fb_pdev);
+ struct rk_screen *cur_screen;
+ struct rk_screen primary_screen;
+
+ if (unlikely(!inf) || unlikely(!dev_drv) ||
+ unlikely(!win) || unlikely(!reg_win_data))
+ return;
+
+ cur_screen = dev_drv->cur_screen;
+ 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;
win->area[0].uv_vir_stride =
reg_win_data->reg_area_data[0].uv_vir_stride;
-
-#if !defined(RK_FB_ROTATE) && defined(CONFIG_THREE_FB_BUFFER)
- /* TODO Mofidy if HDMI info is change to hwc */
win->area[0].cbr_start =
reg_win_data->reg_area_data[0].cbr_start;
-#endif
win->area[0].c_offset = reg_win_data->reg_area_data[0].c_offset;
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;
for (i = 0; i < RK_WIN_MAX_AREA; i++) {
if (reg_win_data->reg_area_data[i].smem_start > 0) {
-#if !defined(RK_FB_ROTATE) && defined(CONFIG_THREE_FB_BUFFER)
+ if (inf->disp_policy != DISPLAY_POLICY_BOX)
+ win->area[i].ion_hdl =
+ reg_win_data->reg_area_data[i].ion_handle;
win->area[i].smem_start =
- reg_win_data->reg_area_data[i].smem_start;
-#endif
- win->area[i].xpos =
- reg_win_data->reg_area_data[i].xpos;
- win->area[i].ypos =
- reg_win_data->reg_area_data[i].ypos;
- win->area[i].xsize =
- reg_win_data->reg_area_data[i].xsize;
- win->area[i].ysize =
- reg_win_data->reg_area_data[i].ysize;
+ reg_win_data->reg_area_data[i].smem_start;
+ if (inf->disp_mode == DUAL ||
+ inf->disp_policy == DISPLAY_POLICY_BOX) {
+ win->area[i].xpos =
+ reg_win_data->reg_area_data[i].xpos;
+ win->area[i].ypos =
+ reg_win_data->reg_area_data[i].ypos;
+ win->area[i].xsize =
+ reg_win_data->reg_area_data[i].xsize;
+ win->area[i].ysize =
+ reg_win_data->reg_area_data[i].ysize;
+ } else {
+ win->area[i].xpos =
+ reg_win_data->reg_area_data[i].xpos *
+ cur_screen->mode.xres /
+ primary_screen.mode.xres;
+ win->area[i].ypos =
+ reg_win_data->reg_area_data[i].ypos *
+ cur_screen->mode.yres /
+ primary_screen.mode.yres;
+ win->area[i].xsize =
+ reg_win_data->reg_area_data[i].xsize *
+ cur_screen->mode.xres /
+ primary_screen.mode.xres;
+ win->area[i].ysize =
+ reg_win_data->reg_area_data[i].ysize *
+ cur_screen->mode.yres /
+ primary_screen.mode.yres;
+
+ /* recalc display size if set hdmi scaler when at ONE_DUAL mode */
+ if (inf->disp_mode == ONE_DUAL && hdmi_switch_complete) {
+ if (cur_screen->xsize > 0 &&
+ cur_screen->xsize <= cur_screen->mode.xres) {
+ win->area[i].xpos =
+ ((cur_screen->mode.xres - cur_screen->xsize) >> 1) +
+ cur_screen->xsize * win->area[i].xpos / cur_screen->mode.xres;
+ win->area[i].xsize =
+ win->area[i].xsize * cur_screen->xsize / cur_screen->mode.xres;
+ }
+ if (cur_screen->ysize > 0 && cur_screen->ysize <= cur_screen->mode.yres) {
+ win->area[i].ypos =
+ ((cur_screen->mode.yres - cur_screen->ysize) >> 1) +
+ cur_screen->ysize * win->area[i].ypos / cur_screen->mode.yres;
+ win->area[i].ysize =
+ win->area[i].ysize * cur_screen->ysize / cur_screen->mode.yres;
+ }
+ }
+ }
win->area[i].xact =
reg_win_data->reg_area_data[i].xact;
win->area[i].yact =
win = dev_drv->win[i];
win_data = rk_fb_get_win_data(regs, i);
if (win_data) {
- rk_fb_update_driver(win, win_data);
+ if (rk_fb->disp_policy == DISPLAY_POLICY_BOX &&
+ (win_data->data_format == YUV420 ||
+ win_data->data_format == YUV420_A))
+ continue;
+ mutex_lock(&dev_drv->win_config);
+ rk_fb_update_win(dev_drv, win, win_data);
win->state = 1;
dev_drv->ops->set_par(dev_drv, i);
dev_drv->ops->pan_display(dev_drv, i);
+ mutex_unlock(&dev_drv->win_config);
#if defined(CONFIG_ROCKCHIP_IOMMU)
if (dev_drv->iommu_enabled) {
g_last_addr[i] = win_data->reg_area_data[0].smem_start +
}
}
dev_drv->ops->ovl_mgr(dev_drv, 0, 1);
-
+ if (rk_fb->disp_policy == DISPLAY_POLICY_BOX)
+ dev_drv->ops->cfg_done(dev_drv);
if ((rk_fb->disp_mode == DUAL)
&& (hdmi_get_hotplug() == HDMI_HPD_ACTIVED)
&& hdmi_switch_complete) {
- for (i = 0; i < rk_fb->num_lcdc; i++) {
- if (rk_fb->lcdc_dev_drv[i]->prop == EXTEND) {
- ext_dev_drv = rk_fb->lcdc_dev_drv[i];
- break;
- }
- }
- if (i == rk_fb->num_lcdc) {
- printk(KERN_ERR "hdmi lcdc driver not found!\n");
- goto ext_win_exit;
- }
- /* hdmi just need set win0 only(win0 have only one area)
- * other win is disable
- */
- win = dev_drv->win[0];
- ext_win = ext_dev_drv->win[0];
- for (j = 0; j < regs->win_num; j++) {
- if (0 == regs->reg_win_data[j].win_id)
- break;
- }
- if (j < regs->win_num) {
- rk_fb_update_driver(ext_win, ®s->reg_win_data[j]);
- if (win->area[0].xpos != 0 || win->area[0].ypos != 0) {
- ext_win->area[0].xsize =
- (ext_dev_drv->cur_screen->xsize * win->area[0].xsize) /
- dev_drv->cur_screen->mode.xres;
- ext_win->area[0].ysize =
- (ext_dev_drv->cur_screen->ysize * win->area[0].ysize) /
- dev_drv->cur_screen->mode.yres;
- ext_win->area[0].xpos =
- ((ext_dev_drv->cur_screen->mode.xres - ext_dev_drv->cur_screen->xsize) >> 1) +
- ext_dev_drv->cur_screen->xsize * win->area[0].xpos / dev_drv->cur_screen->mode.xres;
- ext_win->area[0].ypos =
- ((ext_dev_drv->cur_screen->mode.yres - ext_dev_drv->cur_screen->ysize) >> 1) +
- ext_dev_drv->cur_screen->ysize * win->area[0].ypos / dev_drv->cur_screen->mode.yres;
- } else {
- ext_win->area[0].xpos =
- (ext_dev_drv->cur_screen->mode.xres - ext_dev_drv->cur_screen->xsize) >> 1;
- ext_win->area[0].ypos =
- (ext_dev_drv->cur_screen->mode.yres - ext_dev_drv->cur_screen->ysize) >> 1;
- ext_win->area[0].xsize = ext_dev_drv->cur_screen->xsize;
- ext_win->area[0].ysize = ext_dev_drv->cur_screen->ysize;
- }
- /* hdmi only one win so disable alpha */
- ext_win->alpha_en = 0;
- ext_win->state = 1;
- } else {
- ext_win->state = 0;
- }
-
- if (win->area[0].xact < win->area[0].yact) {
- int pixel_width, vir_width_bit, stride;
- 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;
- pixel_width = rk_fb_pixel_width(ext_win->format);
- vir_width_bit = pixel_width * ext_win->area[0].xvir;
- stride = ALIGN_N_TIMES(vir_width_bit, 32) / 8;
- ext_win->area[0].y_vir_stride = stride >> 2;
- }
- if (ext_dev_drv->rotate_mode > X_Y_MIRROR)
- rk_fb_win_rotate(ext_win, win, ext_dev_drv->rotate_mode);
+ 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->set_par(ext_dev_drv, 0);
- ext_dev_drv->ops->pan_display(ext_dev_drv, 0);
ext_dev_drv->ops->cfg_done(ext_dev_drv);
}
ext_win_exit:
timeout = wait_event_interruptible_timeout(dev_drv->vsync_info.wait,
ktime_compare(dev_drv->vsync_info.timestamp, timestamp) > 0,
msecs_to_jiffies(25));
+ if ((rk_fb->disp_mode == DUAL) &&
+ (hdmi_get_hotplug() == HDMI_HPD_ACTIVED) &&
+ hdmi_switch_complete) {
+ /*
+ * If dual output, we need make sure the extend display
+ * cfg take effect before release fence.
+ */
+ ext_dev_drv = rk_get_extend_lcdc_drv();
+ timeout = wait_event_interruptible_timeout(ext_dev_drv->vsync_info.wait,
+ ktime_compare(ext_dev_drv->vsync_info.timestamp, timestamp) > 0,
+ msecs_to_jiffies(25));
+ }
+
dev_drv->ops->get_dsp_addr(dev_drv, dsp_addr);
wait_for_vsync = false;
for (i = 0; i < dev_drv->lcdc_win_num; i++) {
if (dev_drv->win[i]->state == 1) {
- u32 new_start =
- dev_drv->win[i]->area[0].smem_start +
- dev_drv->win[i]->area[0].y_offset;
- u32 reg_start = dsp_addr[i];
-
- if (unlikely(new_start != reg_start)) {
- wait_for_vsync = true;
- dev_info(dev_drv->dev,
- "win%d:new_addr:0x%08x cur_addr:0x%08x--%d\n",
- i, new_start, reg_start, 101 - count);
- break;
+ if (rk_fb->disp_policy == DISPLAY_POLICY_BOX &&
+ (dev_drv->win[i]->format == YUV420 ||
+ dev_drv->win[i]->format == YUV420_A ||
+ !strcmp(dev_drv->win[i]->name, "hwc"))) {
+ continue;
+ } else {
+ u32 new_start =
+ dev_drv->win[i]->area[0].smem_start +
+ dev_drv->win[i]->area[0].y_offset;
+ u32 reg_start = dsp_addr[i];
+
+ if ((rk_fb->disp_policy ==
+ DISPLAY_POLICY_BOX) &&
+ (new_start == 0x0 ||
+ dev_drv->suspend_flag))
+ continue;
+ if (unlikely(new_start != reg_start)) {
+ wait_for_vsync = true;
+ dev_info(dev_drv->dev,
+ "win%d:new_addr:0x%08x cur_addr:0x%08x--%d\n",
+ i, new_start, reg_start, 101 - count);
+ break;
+ }
}
}
}
#ifdef H_USE_FENCE
sw_sync_timeline_inc(dev_drv->timeline, 1);
#endif
- if (!g_first_buf) {
+ if (dev_drv->front_regs) {
#if defined(CONFIG_ROCKCHIP_IOMMU)
if (dev_drv->iommu_enabled) {
+ if (dev_drv->ops->mmu_en)
+ dev_drv->ops->mmu_en(dev_drv);
freed_index = 0;
g_last_timeout = timeout;
}
#endif
- for (i = 0; i < g_last_win_num; i++)
- rk_fb_free_dma_buf(dev_drv, &g_reg_win_data[i]);
+
+ mutex_lock(&dev_drv->front_lock);
+
+ for (i = 0; i < dev_drv->front_regs->win_num; i++) {
+ win_data = &dev_drv->front_regs->reg_win_data[i];
+ rk_fb_free_dma_buf(dev_drv, win_data);
+ }
+ kfree(dev_drv->front_regs);
+
+ mutex_unlock(&dev_drv->front_lock);
#if defined(CONFIG_ROCKCHIP_IOMMU)
if (dev_drv->iommu_enabled)
freed_addr[freed_index] = 0xfefefefe;
#endif
}
- for (i = 0; i < regs->win_num; i++) {
- memcpy(&g_reg_win_data[i], &(regs->reg_win_data[i]),
- sizeof(struct rk_fb_reg_win_data));
- }
- g_last_win_num = regs->win_num;
- g_first_buf = 0;
+
+ mutex_lock(&dev_drv->front_lock);
+
+ dev_drv->front_regs = regs;
+
+ mutex_unlock(&dev_drv->front_lock);
}
static void rk_fb_update_regs_handler(struct kthread_work *work)
list_for_each_entry_safe(data, next, &saved_list, list) {
rk_fb_update_reg(dev_drv, data);
list_del(&data->list);
- kfree(data);
}
if (dev_drv->wait_fs && list_empty(&dev_drv->update_regs_list))
{
struct rk_fb *rk_fb = dev_get_drvdata(info->device);
struct fb_fix_screeninfo *fix = &info->fix;
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_screen *screen = dev_drv->cur_screen;
+ struct rk_screen primary_screen;
struct fb_info *fbi = rk_fb->fb[0];
int i, ion_fd, acq_fence_fd;
u32 xvir, yvir;
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;
reg_win_data->z_order = -1;
reg_win_data->win_id = -1;
}
+
+ rk_fb_get_prmry_screen(&primary_screen);
for (i = 0; i < reg_win_data->area_num; i++) {
- rk_fb_check_config_var(&win_par->area_par[i], screen);
+ if (rk_fb->disp_policy == DISPLAY_POLICY_BOX)
+ rk_fb_check_config_var(&win_par->area_par[i], screen);
+ else
+ rk_fb_check_config_var(&win_par->area_par[i], &primary_screen);
/* visiable pos in panel */
reg_win_data->reg_area_data[i].xpos = win_par->area_par[i].xpos;
reg_win_data->reg_area_data[i].ypos = win_par->area_par[i].ypos;
}
}
}
+
+ /* record buffer information for rk_fb_disp_scale to prevent fence timeout
+ * because rk_fb_disp_scale will call function info->fbops->fb_set_par(info);
+ */
+ info->var.yoffset = yoffset;
+ info->var.xoffset = xoffset;
return 0;
}
static int rk_fb_set_win_config(struct fb_info *info,
struct rk_fb_win_cfg_data *win_data)
{
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_fb_reg_data *regs;
#ifdef H_USE_FENCE
struct sync_fence *release_fence[RK_MAX_BUF_NUM];
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 +=
mutex_lock(&dev_drv->output_lock);
if (!(dev_drv->suspend_flag == 0)) {
rk_fb_update_reg(dev_drv, regs);
- kfree(regs);
printk(KERN_INFO "suspend_flag = 1\n");
goto err;
}
} else if (ret == 0) {
rk_fb_update_reg(dev_drv, regs);
}
- kfree(regs);
}
err:
EXPORT_SYMBOL(rk_get_real_fps);
#endif
-
+#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)
{
struct rk_fb *rk_fb = dev_get_drvdata(info->device);
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_fb_par *extend_fb_par = NULL;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct fb_fix_screeninfo *fix = &info->fix;
int fb_id = 0, extend_win_id = 0;
struct fb_info *extend_info = NULL;
if (rk_fb->disp_mode == DUAL) {
fb_id = get_extend_fb_id(info);
extend_info = rk_fb->fb[(rk_fb->num_fb >> 1) + fb_id];
- extend_dev_drv = (struct rk_lcdc_driver *)extend_info->par;
+ extend_fb_par = (struct rk_fb_par *)extend_info->par;
+ extend_dev_drv = extend_fb_par->lcdc_drv;
extend_win_id = dev_drv->ops->fb_get_win_id(extend_dev_drv,
extend_info->fix.id);
extend_win = extend_dev_drv->win[extend_win_id];
}
switch (cmd) {
+ case RK_FBIOSET_HWC_ADDR:
+ {
+ u32 hwc_phy[1];
+ if (copy_from_user(hwc_phy, argp, 4))
+ return -EFAULT;
+#ifdef CONFIG_ROCKCHIP_IOMMU
+ if (!dev_drv->iommu_enabled) {
+#endif
+ fix->smem_start = hwc_phy[0];
+#ifdef CONFIG_ROCKCHIP_IOMMU
+ } else {
+ int usr_fd;
+ struct ion_handle *hdl;
+ 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;
+ }
+#endif
+ break;
+ }
case RK_FBIOSET_YUV_ADDR:
{
u32 yuv_phy[2];
if (copy_from_user(yuv_phy, argp, 8))
return -EFAULT;
+ #ifdef CONFIG_ROCKCHIP_IOMMU
if (!dev_drv->iommu_enabled || !strcmp(info->fix.id, "fb0")) {
+ #endif
fix->smem_start = yuv_phy[0];
fix->mmio_start = yuv_phy[1];
+ #ifdef CONFIG_ROCKCHIP_IOMMU
} else {
int usr_fd, offset, tmp;
struct ion_handle *hdl;
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;
}
+ #endif
break;
}
case RK_FBIOSET_ENABLE:
if (copy_from_user(&enable, argp, sizeof(enable)))
return -EFAULT;
+ if (enable)
+ fb_par->state++;
+ else
+ fb_par->state--;
dev_drv->ops->open(dev_drv, win_id, enable);
break;
case RK_FBIOGET_ENABLE:
}
case RK_FBIOGET_DMABUF_FD:
{
- int fd =
- ion_share_dma_buf_fd(rk_fb->ion_client,
- win->area[0].ion_hdl);
+ int fd = -1;
+
+ if (IS_ERR_OR_NULL(fb_par->ion_hdl)) {
+ dev_err(info->dev,
+ "get dma_buf fd failed,ion handle is err\n");
+ return PTR_ERR(fb_par->ion_hdl);
+ }
+ fd = ion_share_dma_buf_fd(rk_fb->ion_client,
+ fb_par->ion_hdl);
if (fd < 0) {
dev_err(info->dev,
"ion_share_dma_buf_fd failed\n");
}
#endif
case RK_FBIOSET_CLEAR_FB:
- memset(info->screen_base, 0, get_fb_size());
+ memset(fb_par->fb_virt_base, 0, fb_par->fb_size);
break;
case RK_FBIOSET_CONFIG_DONE:
{
static int rk_fb_blank(int blank_mode, struct fb_info *info)
{
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct fb_fix_screeninfo *fix = &info->fix;
int win_id;
#if defined(CONFIG_RK_HDMI)
u8 __iomem *src;
int c, cnt = 0, err = 0;
unsigned long total_size;
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_lcdc_win *win = NULL;
int win_id = 0;
u8 __iomem *dst;
int c, cnt = 0, err = 0;
unsigned long total_size;
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_lcdc_win *win = NULL;
int win_id = 0;
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_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_fb_par *extend_fb_par = NULL;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_fb *rk_fb = dev_get_drvdata(info->device);
int fb_id, extend_win_id = 0;
struct fb_info *extend_info = NULL;
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 */
return -ENODEV;
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_dev_drv = (struct rk_lcdc_driver *)extend_info->par;
+ extend_fb_par = (struct rk_fb_par *)extend_info->par;
+ extend_dev_drv = extend_fb_par->lcdc_drv;
extend_win_id = dev_drv->ops->fb_get_win_id(extend_dev_drv,
- extend_info->fix.
- id);
+ extend_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;
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 ,whic have one lcdc but two display outputs*/
-/*save winameter 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->format == ABGR888)) ? 1 : 0;
win->g_alpha_val = 0;
+ if (rk_fb->disp_policy == DISPLAY_POLICY_BOX &&
+ (win->format == YUV420 || win->format == YUV420_A))
+ win->state = 1;
if (rk_fb->disp_mode == DUAL) {
- if (extend_win->state && (hdmi_switch_complete)) {
+ if (extend_win->state && hdmi_switch_complete) {
if (info != extend_info) {
- if (win->area[0].xact < win->area[0].yact) {
- extend_win->area[0].xact =
- win->area[0].yact;
- extend_win->area[0].yact =
- win->area[0].xact;
- extend_win->area[0].xvir =
- win->area[0].yact;
- extend_info->var.xres = var->yres;
- extend_info->var.yres = var->xres;
- extend_info->var.xres_virtual =
- var->yres;
- } else {
- extend_win->area[0].xact =
- win->area[0].xact;
- extend_win->area[0].yact =
- win->area[0].yact;
- extend_win->area[0].xvir =
- win->area[0].xvir;
- extend_info->var.xres = var->xres;
- extend_info->var.yres = var->yres;
- extend_info->var.xres_virtual =
- var->xres_virtual;
- }
- extend_win->area[0].y_vir_stride =
- win->area[0].y_vir_stride;
- extend_win->area[0].uv_vir_stride =
- win->area[0].uv_vir_stride;
- if (win->area[0].xpos != 0 ||
- win->area[0].ypos != 0) {
- extend_win->area[0].xsize =
- (extend_dev_drv->cur_screen->xsize * win->area[0].xsize) / screen->mode.xres;
- extend_win->area[0].ysize =
- (extend_dev_drv->cur_screen->ysize * win->area[0].ysize) / screen->mode.yres;
- extend_win->area[0].xpos =
- ((extend_dev_drv->cur_screen->mode.xres - extend_dev_drv->cur_screen->xsize) >> 1) +
- extend_dev_drv->cur_screen->xsize * win->area[0].xpos / screen->mode.xres;
- extend_win->area[0].ypos =
- ((extend_dev_drv->cur_screen->mode.yres - extend_dev_drv->cur_screen->ysize) >> 1) +
- extend_dev_drv->cur_screen->ysize * win->area[0].ypos / screen->mode.yres;
- } else { /* the display image of the primary screen is full screen size */
- extend_win->area[0].xpos =
- (extend_dev_drv->cur_screen->mode.xres - extend_dev_drv->cur_screen->xsize) >> 1;
- extend_win->area[0].ypos =
- (extend_dev_drv->cur_screen->mode.yres - extend_dev_drv->cur_screen->ysize) >> 1;
- extend_win->area[0].xsize =
- extend_dev_drv->cur_screen->xsize;
- extend_win->area[0].ysize =
- extend_dev_drv->cur_screen->ysize;
- }
-
- extend_win->area[0].state = 1;
- extend_win->area_num = 1;
- extend_win->alpha_en = 0;
- extend_win->format = win->format;
- extend_info->var.nonstd &= 0xffffff00;
- extend_info->var.nonstd |= data_format;
+ 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);
}
static int rk_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
{
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
- int win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
- struct rk_lcdc_win *win;
- win = dev_drv->win[win_id];
+ struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct ion_handle *handle = fb_par->ion_hdl;
+ struct dma_buf *dma_buf = NULL;
+
+ if (IS_ERR_OR_NULL(handle)) {
+ dev_err(info->dev, "failed to get ion handle:%ld\n",
+ PTR_ERR(handle));
+ return -ENOMEM;
+ }
+ dma_buf = ion_share_dma_buf(rk_fb->ion_client, handle);
+ if (IS_ERR_OR_NULL(dma_buf)) {
+ printk("get ion share dma buf failed\n");
+ return -ENOMEM;
+ }
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
- return dma_buf_mmap(win->area[0].dma_buf, vma, 0);
+ return dma_buf_mmap(dma_buf, vma, 0);
}
static struct fb_ops fb_ops = {
struct device_attribute *attr, char *buf)
{
struct fb_info *fbi = dev_get_drvdata(dev);
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)fbi->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
return scnprintf(buf, PAGE_SIZE, "%llu\n",
ktime_to_ns(dev_drv->vsync_info.timestamp));
}
rk_fb_pan_display(&fbi->var, fbi);
}
EXPORT_SYMBOL(rk_direct_fb_show);
-#if 0
-static int set_xact_yact_for_hdmi(struct fb_var_screeninfo *pmy_var,
- struct fb_var_screeninfo *hdmi_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;
- } else {
- hdmi_var->xres = pmy_var->xres;
- hdmi_var->yres = pmy_var->yres;
- hdmi_var->xres_virtual = pmy_var->xres_virtual;
- }
- return 0;
-}
-#endif
int rk_fb_dpi_open(bool open)
{
struct rk_lcdc_driver *dev_drv = NULL;
return ret;
}
-#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_fb_par *fb_par = NULL;
+ struct rk_fb_par *pmy_fb_par = NULL;
struct rk_lcdc_driver *dev_drv = NULL;
- char name[6];
+ char name[6] = {0};
int i, win_id, load_screen = 0;
- if (screen == NULL)
+ if (unlikely(!rk_fb) || unlikely(!screen))
return -ENODEV;
+ hdmi_switch_complete = 0;
+ /* 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 ||
+ screen->type == SCREEN_TVOUT_TEST )
+ printk("cvbs %s lcdc%d\n", enable ? "connect to" : "remove from",
+ dev_drv->id);
if (enable == 2 /*&& dev_drv->enable*/)
return 0;
+ if (rk_fb->disp_mode == ONE_DUAL) {
+ if (dev_drv->ops->dsp_black)
+ dev_drv->ops->dsp_black(dev_drv, 1);
+ if (dev_drv->ops->set_screen_scaler)
+ dev_drv->ops->set_screen_scaler(dev_drv, dev_drv->screen0, 0);
+ }
+
if (!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);
- }
- return 0;
- } else {
- memcpy(dev_drv->cur_screen, screen, sizeof(struct rk_screen));
- }
- 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
- 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));
- }
- #endif
- if (dev_drv->win[win_id]->logicalstate) {
- 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);
- }
- }
- }
- 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 */
- int i;
- 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];
- } else {
- for (i = 0; i < rk_fb->num_lcdc; i++) {
- if (rk_fb->lcdc_dev_drv[i]->prop == EXTEND) {
- dev_drv = rk_fb->lcdc_dev_drv[i];
- break;
- }
- }
-
- if (i == rk_fb->num_lcdc) {
- printk(KERN_ERR "%s driver not found!", name);
- return -ENODEV;
- }
- }
- printk("hdmi %s lcdc%d\n", enable ? "connect to" : "remove from",
- dev_drv->id);
-
- if (rk_fb->num_lcdc == 1)
- info = rk_fb->fb[0];
- else if (rk_fb->num_lcdc == 2)
- info = rk_fb->fb[dev_drv->lcdc_win_num]; /* the main fb of lcdc1 */
+ /* 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->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);
+ /* force modify dsp size */
+ info = rk_fb->fb[dev_drv->fb_index_base];
+ info->var.grayscale &= 0xff;
+ info->var.grayscale |=
+ (dev_drv->cur_screen->mode.xres << 8) +
+ (dev_drv->cur_screen->mode.yres << 20);
+ mutex_lock(&dev_drv->win_config);
+ info->fbops->fb_set_par(info);
+ info->fbops->fb_pan_display(&info->var, info);
+ mutex_unlock(&dev_drv->win_config);
+
+ if (dev_drv->ops->dsp_black)
+ dev_drv->ops->dsp_black(dev_drv, 0);
+ } else if (rk_fb->num_lcdc > 1) {
+ /* If there is more than one lcdc device, we disable
+ the layer which attached to this device */
+ 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);
}
-
- } 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;
- 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;
+ } 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->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;
}
-
- 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__);
+ if (!dev_drv->uboot_logo) {
+ for (i = 0; i < dev_drv->lcdc_win_num; i++) {
+ info = rk_fb->fb[dev_drv->fb_index_base + i];
+ fb_par = (struct rk_fb_par *)info->par;
+ win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
+ if (dev_drv->win[win_id]) {
+ if (rk_fb->disp_mode == DUAL) {
+ pmy_info = rk_fb->fb[i];
+ if (pmy_info != info) {
+ pmy_fb_par =
+ (struct rk_fb_par *)pmy_info->par;
+ fb_par->state = pmy_fb_par->state;
+ }
+ }
+ if (fb_par->state) {
+ if (!dev_drv->win[win_id]->state)
+ dev_drv->ops->open(dev_drv, win_id, 1);
+ if (!load_screen) {
+ dev_drv->ops->load_screen(dev_drv, 1);
+ load_screen = 1;
+ }
+ info->var.activate |= FB_ACTIVATE_FORCE;
+ if (rk_fb->disp_mode == DUAL) {
+ rk_fb_update_ext_info(info, pmy_info, 1);
+ } else if (rk_fb->disp_mode == ONE_DUAL) {
+ info->var.grayscale &= 0xff;
+ info->var.grayscale |=
+ (dev_drv->cur_screen->xsize << 8) +
+ (dev_drv->cur_screen->ysize << 20);
+ }
+
+ mutex_lock(&dev_drv->win_config);
+ info->fbops->fb_set_par(info);
+ info->fbops->fb_pan_display(&info->var, info);
+ mutex_unlock(&dev_drv->win_config);
+ }
+ }
}
+ }else {
+ dev_drv->uboot_logo = 0;
}
- 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);
-
- /* info->fbops->fb_ioctl(info, RK_FBIOSET_CONFIG_DONE, 0); */
- 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);
- }
+ hdmi_switch_complete = 1;
+ if (rk_fb->disp_mode == ONE_DUAL) {
+ if (dev_drv->ops->set_screen_scaler)
+ dev_drv->ops->set_screen_scaler(dev_drv, dev_drv->screen0, 1);
+ if (dev_drv->ops->dsp_black)
+ dev_drv->ops->dsp_black(dev_drv, 0);
}
- /*
- if (rk_fb->disp_mode != DUAL)
- rk29_backlight_set(1);
- */
return 0;
}
-#endif
+
/*
* function:this function current only called by hdmi for
* scale the display
{
struct rk_fb *inf = platform_get_drvdata(fb_pdev);
struct fb_info *info = NULL;
+ struct fb_info *pmy_info = NULL;
struct fb_var_screeninfo *var = NULL;
struct rk_lcdc_driver *dev_drv = NULL;
u16 screen_x, screen_y;
u16 xpos, ypos;
char name[6];
- int i = 0;
+ 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);
-#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)
- dev_drv = inf->lcdc_dev_drv[0];
-#else
- for (i = 0; i < inf->num_lcdc; i++) {
- if (inf->lcdc_dev_drv[i]->prop == EXTEND) {
- dev_drv = inf->lcdc_dev_drv[i];
- break;
+
+ if (inf->disp_mode == DUAL) {
+ dev_drv = rk_get_lcdc_drv(name);
+ if (dev_drv == NULL) {
+ printk(KERN_ERR "%s driver not found!", name);
+ return -ENODEV;
}
+ } else {
+ dev_drv = inf->lcdc_dev_drv[0];
}
- if (i == inf->num_lcdc) {
- printk(KERN_ERR "%s driver not found!", name);
- return -ENODEV;
- }
-#endif
- if (inf->num_lcdc == 1)
+ if (inf->num_lcdc == 1) {
info = inf->fb[0];
- else if (inf->num_lcdc == 2)
+ } else if (inf->num_lcdc == 2) {
info = inf->fb[dev_drv->lcdc_win_num];
+ pmy_info = inf->fb[0];
+ }
var = &info->var;
screen_x = dev_drv->cur_screen->mode.xres;
screen_y = dev_drv->cur_screen->mode.yres;
-#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF) || defined(CONFIG_NO_DUAL_DISP)
- if (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 =
(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;
- } else
-#endif
- {
+ } else {
xpos = (screen_x - screen_x * scale_x / 100) >> 1;
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;
- var->nonstd &= 0xff;
- var->nonstd |= (xpos << 8) + (ypos << 20);
- var->grayscale &= 0xff;
- var->grayscale |=
- (dev_drv->cur_screen->xsize << 8) + (dev_drv->cur_screen->ysize << 20);
+ if (inf->disp_mode == DUAL) {
+ rk_fb_update_ext_info(info, pmy_info, 0);
+ } else {
+ var->nonstd &= 0xff;
+ var->nonstd |= (xpos << 8) + (ypos << 20);
+ var->grayscale &= 0xff;
+ 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_ioctl(info, RK_FBIOSET_CONFIG_DONE, 0); */
dev_drv->ops->cfg_done(dev_drv);
+ mutex_unlock(&dev_drv->win_config);
+
return 0;
}
unsigned long fb_mem_size)
{
struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)fbi->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct ion_handle *handle;
ion_phys_addr_t phy_addr;
size_t len;
+ int ret = 0;
if (dev_drv->iommu_enabled)
handle = ion_alloc(rk_fb->ion_client, (size_t) fb_mem_size, 0,
PTR_ERR(handle));
return -ENOMEM;
}
+
+ fb_par->ion_hdl = handle;
win->area[0].dma_buf = ion_share_dma_buf(rk_fb->ion_client, handle);
if (IS_ERR_OR_NULL(win->area[0].dma_buf)) {
printk("ion_share_dma_buf() failed\n");
goto err_share_dma_buf;
}
win->area[0].ion_hdl = handle;
- fbi->screen_base = ion_map_kernel(rk_fb->ion_client, handle);
+ if (dev_drv->prop == PRMRY)
+ fbi->screen_base = ion_map_kernel(rk_fb->ion_client, handle);
#ifdef CONFIG_ROCKCHIP_IOMMU
- if (dev_drv->iommu_enabled)
- ion_map_iommu(dev_drv->dev, rk_fb->ion_client, handle,
- (unsigned long *)&phy_addr,
- (unsigned long *)&len);
+ if (dev_drv->iommu_enabled && dev_drv->mmu_dev)
+ ret = ion_map_iommu(dev_drv->dev, rk_fb->ion_client, handle,
+ (unsigned long *)&phy_addr,
+ (unsigned long *)&len);
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);
static int rk_fb_alloc_buffer(struct fb_info *fbi, int fb_id)
{
struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
- struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)fbi->par;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)fbi->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
struct rk_lcdc_win *win = NULL;
int win_id;
int ret = 0;
fbi->fix.smem_len);
} else {
if (dev_drv->rotate_mode > X_Y_MIRROR) {
- fb_mem_size = get_fb_size();
+ 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;
}
fbi->screen_size = fbi->fix.smem_len;
- win_id = dev_drv->ops->fb_get_win_id(dev_drv, fbi->fix.id);
- if (win_id >= 0) {
- win = dev_drv->win[win_id];
- win->reserved = fbi->fix.smem_start;
- }
+ fb_par->fb_phy_base = fbi->fix.smem_start;
+ fb_par->fb_virt_base = fbi->screen_base;
+ fb_par->fb_size = fbi->fix.smem_len;
return ret;
}
devm_kzalloc(dev_drv->dev,
sizeof(struct rk_screen),
GFP_KERNEL);
- if (screen1) {
+ if (!screen1) {
dev_err(dev_drv->dev, "malloc screen1 for lcdc%d fail!",
dev_drv->id);
return -ENOMEM;
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);
+ 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;
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;
}
{
struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
struct fb_info *fbi;
+ struct rk_fb_par *fb_par = NULL;
int i = 0, ret = 0, index = 0;
-/*
-#if defined(CONFIG_ROCKCHIP_IOMMU)
- struct device *mmu_dev = NULL;
-#endif
-*/
+
if (rk_fb->num_lcdc == RK30_MAX_LCDC_SUPPORT)
return -ENXIO;
dev_err(&fb_pdev->dev, "fb framebuffer_alloc fail!");
ret = -ENOMEM;
}
- fbi->par = dev_drv;
+ fb_par = devm_kzalloc(&fb_pdev->dev, sizeof(struct rk_fb_par),
+ GFP_KERNEL);
+ if (!fb_par) {
+ dev_err(&fb_pdev->dev, "malloc fb_par for fb%d fail!",
+ rk_fb->num_fb);
+ return -ENOMEM;
+ }
+ fb_par->id = rk_fb->num_fb;
+ fb_par->lcdc_drv = dev_drv;
+ fbi->par = (void *)fb_par;
fbi->var = def_var;
fbi->fix = def_fix;
sprintf(fbi->fix.id, "fb%d", rk_fb->num_fb);
}
/* show logo for primary display device */
-#if !defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_LOGO)
+#if !defined(CONFIG_FRAMEBUFFER_CONSOLE)
if (dev_drv->prop == PRMRY) {
struct fb_info *main_fbi = rk_fb->fb[0];
main_fbi->fbops->fb_open(main_fbi, 1);
-/*
+
#if defined(CONFIG_ROCKCHIP_IOMMU)
if (dev_drv->iommu_enabled) {
- mmu_dev =
- rockchip_get_sysmmu_device_by_compatible(dev_drv->mmu_dts_name);
- if (mmu_dev) {
- platform_set_sysmmu(mmu_dev, dev_drv->dev);
- rockchip_sysmmu_set_fault_handler(dev_drv->dev,
- rk_fb_sysmmu_fault_handler);
- iovmm_activate(dev_drv->dev);
- } else
- dev_err(dev_drv->dev,
- "failed to get rockchip iommu device\n");
+ if (dev_drv->mmu_dev)
+ rockchip_iovmm_set_fault_handler(dev_drv->dev,
+ rk_fb_sysmmu_fault_handler);
}
#endif
-*/
+
rk_fb_alloc_buffer(main_fbi, 0); /* only alloc memory for main fb */
+ dev_drv->uboot_logo = support_uboot_display();
+#if !defined(CONFIG_LOGO)
if (support_uboot_display()) {
- if (dev_drv->iommu_enabled) {
+ /*
+ if (dev_drv->iommu_enabled)
rk_fb_copy_from_loader(main_fbi);
- dev_drv->ops->direct_set_addr(dev_drv, 0,
- main_fbi->fix.smem_start);
- }
+ */
return 0;
}
+#else
main_fbi->fbops->fb_set_par(main_fbi);
#if defined(CONFIG_LOGO_LINUX_BMP)
if (fb_prewine_bmp_logo(main_fbi, FB_ROTATE_UR)) {
}
#endif
main_fbi->fbops->fb_pan_display(&main_fbi->var, main_fbi);
+#endif
} else {
-#if !defined(CONFIG_ROCKCHIP_IOMMU)
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);
-#endif
}
#endif
return 0;
dev_err(&pdev->dev, "no disp-mode node found!");
return -ENODEV;
}
+
+ if (!of_property_read_u32(np, "rockchip,disp-policy", &mode)) {
+ rk_fb->disp_policy = mode;
+ pr_info("fb disp policy is %s\n", rk_fb->disp_policy ? "box":"sdk");
+ }
if (!of_property_read_u32(np, "rockchip,uboot-logo-on", &uboot_logo_on))
printk(KERN_DEBUG "uboot-logo-on:%d\n", uboot_logo_on);
projects / firefly-linux-kernel-4.4.55.git / blobdiff