#include <linux/linux_logo.h>
#include <linux/dma-mapping.h>
#include <linux/regulator/consumer.h>
+#include <linux/of_address.h>
+#include <linux/memblock.h>
#include "bmp_helper.h"
trsm_mipi_ops = ops;
break;
default:
- pr_warning("%s:un supported transmitter:%d!\n",
- __func__, type);
+ pr_warn("%s: unsupported transmitter: %d!\n",
+ __func__, type);
break;
}
return 0;
break;
default:
ops = NULL;
- pr_warning("%s:un supported transmitter:%d!\n",
- __func__, type);
+ pr_warn("%s: unsupported transmitter: %d!\n",
+ __func__, type);
break;
}
return ops;
switch (data_format) {
case XBGR888:
+ case XRGB888:
case ABGR888:
case ARGB888:
case FBDC_ARGB_888:
pixel_width = 4 * 8;
break;
case RGB888:
+ case BGR888:
pixel_width = 3 * 8;
break;
case RGB565:
+ case BGR565:
case FBDC_RGB_565:
pixel_width = 2 * 8;
break;
case YUV444_A:
pixel_width = 8;
break;
+ case YUYV422:
+ case UYVY422:
+ case YUYV420:
+ case UYVY420:
+ pixel_width = 16;
+ break;
default:
- pr_warning("%s:un supported format:0x%x\n",
- __func__, data_format);
+ pr_warn("%s: unsupported format: 0x%x\n",
+ __func__, data_format);
return -EINVAL;
}
return pixel_width;
static int rk_fb_data_fmt(int data_format, int bits_per_pixel)
{
- int fb_data_fmt;
+ int fb_data_fmt = 0;
if (data_format) {
switch (data_format) {
case HAL_PIXEL_FORMAT_RGBX_8888:
fb_data_fmt = XBGR888;
break;
+ case HAL_PIXEL_FORMAT_BGRX_8888:
+ fb_data_fmt = XRGB888;
+ break;
case HAL_PIXEL_FORMAT_RGBA_8888:
fb_data_fmt = ABGR888;
break;
case HAL_PIXEL_FORMAT_RGB_888:
fb_data_fmt = RGB888;
break;
+ case HAL_PIXEL_FORMAT_BGR_888:
+ fb_data_fmt = BGR888;
+ break;
case HAL_PIXEL_FORMAT_RGB_565:
fb_data_fmt = RGB565;
break;
+ case HAL_PIXEL_FORMAT_BGR_565:
+ fb_data_fmt = BGR565;
+ break;
case HAL_PIXEL_FORMAT_YCbCr_422_SP: /* yuv422 */
fb_data_fmt = YUV422;
break;
case HAL_PIXEL_FORMAT_FBDC_U8U8U8: /* fbdc rgb888 */
fb_data_fmt = FBDC_RGBX_888;
break;
+ case HAL_PIXEL_FORMAT_YUYV422: /* yuyv422 */
+ fb_data_fmt = YUYV422;
+ break;
+ case HAL_PIXEL_FORMAT_YUYV420: /* yuyv420 */
+ fb_data_fmt = YUYV420;
+ break;
+ case HAL_PIXEL_FORMAT_UYVY422: /* uyvy422 */
+ fb_data_fmt = UYVY422;
+ break;
+ case HAL_PIXEL_FORMAT_UYVY420: /* uyvy420 */
+ fb_data_fmt = UYVY420;
+ break;
default:
- pr_warning("%s:un supported format:0x%x\n",
- __func__, data_format);
+ pr_warn("%s: unsupported format: 0x%x\n",
+ __func__, data_format);
return -EINVAL;
}
} else {
fb_data_fmt = RGB565;
break;
default:
- pr_warning("%s:un supported bits_per_pixel:%d\n",
- __func__, bits_per_pixel);
+ pr_warn("%s: unsupported bits_per_pixel: %d\n",
+ __func__, bits_per_pixel);
break;
}
}
screen->lvds_format = dt->lvds_format;
screen->face = dt->face;
screen->color_mode = dt->color_mode;
+ screen->width = dt->screen_widt;
+ screen->height = dt->screen_hight;
screen->dsp_lut = dt->dsp_lut;
screen->cabc_lut = dt->cabc_lut;
screen->cabc_gamma_base = dt->cabc_gamma_base;
case RGB888:
strcpy(fmt, "RGB888");
break;
+ case BGR888:
+ strcpy(fmt, "BGR888");
+ break;
case RGB565:
strcpy(fmt, "RGB565");
break;
+ case BGR565:
+ strcpy(fmt, "BGR565");
+ break;
case YUV420:
case YUV420_NV21:
strcpy(fmt, "YUV420");
case FBDC_RGBX_888:
strcpy(fmt, "FBDC_RGBX_888");
break;
+ case YUYV422:
+ strcpy(fmt, "YUYV422");
+ break;
+ case YUYV420:
+ strcpy(fmt, "YUYV420");
+ break;
+ case UYVY422:
+ strcpy(fmt, "UYVY422");
+ break;
+ case UYVY420:
+ strcpy(fmt, "UYVY420");
+ break;
default:
strcpy(fmt, "invalid");
break;
switch (fmt) {
case HAL_PIXEL_FORMAT_RGBX_8888:
+ case HAL_PIXEL_FORMAT_BGRX_8888:
case HAL_PIXEL_FORMAT_RGBA_8888:
case HAL_PIXEL_FORMAT_BGRA_8888:
case HAL_PIXEL_FORMAT_RGB_888:
+ case HAL_PIXEL_FORMAT_BGR_888:
ipp_fmt = IPP_XRGB_8888;
break;
case HAL_PIXEL_FORMAT_RGB_565:
+ case HAL_PIXEL_FORMAT_BGR_565:
ipp_fmt = IPP_RGB_565;
break;
case HAL_PIXEL_FORMAT_YCbCr_422_SP:
}
static void fb_copy_by_ipp(struct fb_info *dst_info,
- struct fb_info *src_info)
+ struct fb_info *src_info)
{
struct rk29_ipp_req ipp_req;
uint32_t rotation = 0;
struct rk_lcdc_win *src_win,
u16 orientation, int iommu_en)
{
- struct rga_req Rga_Request;
+ struct rga_req rga_request;
long ret = 0;
/* int fd = 0; */
- memset(&Rga_Request, 0, sizeof(Rga_Request));
+ memset(&rga_request, 0, sizeof(rga_request));
rga_win_check(dst_win, src_win);
switch (orientation) {
case ROTATE_90:
- Rga_Request.rotate_mode = 1;
- Rga_Request.sina = 65536;
- 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.y_offset = 0;
+ rga_request.rotate_mode = 1;
+ rga_request.sina = 65536;
+ 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.y_offset = 0;
break;
case ROTATE_180:
- Rga_Request.rotate_mode = 1;
- Rga_Request.sina = 0;
- Rga_Request.cosa = -65536;
- Rga_Request.dst.act_w = dst_win->area[0].xact;
- Rga_Request.dst.act_h = dst_win->area[0].yact;
- Rga_Request.dst.x_offset = dst_win->area[0].xact - 1;
- Rga_Request.dst.y_offset = dst_win->area[0].yact - 1;
+ rga_request.rotate_mode = 1;
+ rga_request.sina = 0;
+ rga_request.cosa = -65536;
+ rga_request.dst.act_w = dst_win->area[0].xact;
+ rga_request.dst.act_h = dst_win->area[0].yact;
+ rga_request.dst.x_offset = dst_win->area[0].xact - 1;
+ rga_request.dst.y_offset = dst_win->area[0].yact - 1;
break;
case ROTATE_270:
- Rga_Request.rotate_mode = 1;
- Rga_Request.sina = -65536;
- 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 = 0;
- Rga_Request.dst.y_offset = dst_win->area[0].yact - 1;
+ rga_request.rotate_mode = 1;
+ rga_request.sina = -65536;
+ 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 = 0;
+ rga_request.dst.y_offset = dst_win->area[0].yact - 1;
break;
default:
- Rga_Request.rotate_mode = 0;
- Rga_Request.dst.act_w = dst_win->area[0].xact;
- Rga_Request.dst.act_h = dst_win->area[0].yact;
- Rga_Request.dst.x_offset = dst_win->area[0].xact - 1;
- Rga_Request.dst.y_offset = dst_win->area[0].yact - 1;
+ rga_request.rotate_mode = 0;
+ rga_request.dst.act_w = dst_win->area[0].xact;
+ rga_request.dst.act_h = dst_win->area[0].yact;
+ rga_request.dst.x_offset = dst_win->area[0].xact - 1;
+ rga_request.dst.y_offset = dst_win->area[0].yact - 1;
break;
}
/*
* fd =
* ion_share_dma_buf_fd(rk_fb->ion_client, src_win->area[0].ion_hdl);
- * Rga_Request.src.yrgb_addr = fd;
+ * rga_request.src.yrgb_addr = fd;
* fd =
* ion_share_dma_buf_fd(rk_fb->ion_client, dst_win->area[0].ion_hdl);
- * Rga_Request.dst.yrgb_addr = fd;
+ * rga_request.dst.yrgb_addr = fd;
*/
- Rga_Request.src.yrgb_addr = 0;
- Rga_Request.src.uv_addr =
+ rga_request.src.yrgb_addr = 0;
+ rga_request.src.uv_addr =
src_win->area[0].smem_start + src_win->area[0].y_offset;
- Rga_Request.src.v_addr = 0;
+ rga_request.src.v_addr = 0;
- Rga_Request.dst.yrgb_addr = 0;
- Rga_Request.dst.uv_addr =
+ 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;
-
- 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->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.src.y_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->area[0].format);
-
- Rga_Request.clip.xmin = 0;
- Rga_Request.clip.xmax = dst_win->area[0].xact - 1;
- Rga_Request.clip.ymin = 0;
- Rga_Request.clip.ymax = dst_win->area[0].yact - 1;
- Rga_Request.scale_mode = 0;
-#if defined(CONFIG_RK_IOMMU)
+ rga_request.dst.v_addr = 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->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.src.y_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->area[0].format);
+
+ rga_request.clip.xmin = 0;
+ rga_request.clip.xmax = dst_win->area[0].xact - 1;
+ rga_request.clip.ymin = 0;
+ rga_request.clip.ymax = dst_win->area[0].yact - 1;
+ rga_request.scale_mode = 0;
+
if (iommu_en) {
- Rga_Request.mmu_info.mmu_en = 1;
- Rga_Request.mmu_info.mmu_flag = 1;
+ 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;
+ 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;
-#endif
- ret = rga_ioctl_kernel(&Rga_Request);
+ ret = rga_ioctl_kernel(&rga_request);
}
/*
* 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)
+ struct fb_info *src_info)
{
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;
#endif
static int rk_fb_rotate(struct fb_info *dst_info,
- struct fb_info *src_info)
+ struct fb_info *src_info)
{
#if defined(CONFIG_RK29_IPP)
fb_copy_by_ipp(dst_info, src_info);
}
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)
+ 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);
if (video_data_to_mirroring)
video_data_to_mirroring(info, NULL);
#endif
- /*if not want the config effect,set reserved[3] bit[0] 1*/
+ /* if not want the config effect,set reserved[3] bit[0] 1 */
if (likely((var->reserved[3] & 0x1) == 0))
dev_drv->ops->cfg_done(dev_drv);
if (dev_drv->hdmi_switch)
void *page = phys_to_page(i + src);
void *from_virt = kmap(page);
void *to_virt = dst + i;
+
memcpy(to_virt, from_virt, PAGE_SIZE);
}
dev_drv->ops->direct_set_addr(dev_drv, win_id,
return 0;
}
#endif
-#ifdef CONFIG_RK_IOMMU
static int g_last_addr[5][4];
static int g_now_config_addr[5][4];
static int g_last_state[5][4];
struct rk_lcdc_driver *dev_drv = rk_get_prmry_lcdc_drv();
int i = 0, j = 0;
static int page_fault_cnt;
+
if ((page_fault_cnt++) >= 10)
return 0;
pr_err
for (i = 0; i < PAGE_SIZE; i += DUMP_CHUNK) {
if ((PAGE_SIZE - i) > DUMP_CHUNK) {
char c = buf[i + DUMP_CHUNK];
+
buf[i + DUMP_CHUNK] = 0;
pr_cont("%s", buf + i);
buf[i + DUMP_CHUNK] = c;
return 0;
}
-#endif
+
+void rk_fb_free_wb_buf(struct rk_lcdc_driver *dev_drv,
+ struct rk_fb_reg_wb_data *wb_data)
+{
+ struct rk_fb *rk_fb = platform_get_drvdata(fb_pdev);
+
+ if (dev_drv->iommu_enabled && wb_data->ion_handle)
+ ion_unmap_iommu(dev_drv->dev, rk_fb->ion_client,
+ wb_data->ion_handle);
+ if (wb_data->ion_handle)
+ ion_free(rk_fb->ion_client, wb_data->ion_handle);
+}
void rk_fb_free_dma_buf(struct rk_lcdc_driver *dev_drv,
struct rk_fb_reg_win_data *reg_win_data)
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_RK_IOMMU)
if (dev_drv->iommu_enabled) {
if (area_data->ion_handle != NULL &&
!IS_YUV_FMT(area_data->data_format))
area_data->ion_handle);
freed_addr[freed_index++] = area_data->smem_start;
}
-#endif
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));
}
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)
+ struct rk_lcdc_win *win,
+ struct rk_fb_reg_win_data *reg_win_data)
{
int i = 0;
struct rk_fb *inf = platform_get_drvdata(fb_pdev);
win->area[i].smem_start =
reg_win_data->reg_area_data[i].smem_start;
if (inf->disp_mode == DUAL ||
+ inf->disp_mode == DUAL_LCD ||
inf->disp_mode == NO_DUAL) {
win->area[i].xpos =
reg_win_data->reg_area_data[i].xpos;
win->area[i].y_vir_stride =
reg_win_data->reg_area_data[i].y_vir_stride;
win->area[i].state = 1;
-#if defined(CONFIG_RK_IOMMU)
if (dev_drv->iommu_enabled) {
g_now_config_addr[win->id][i] =
win->area[i].smem_start +
win->area[i].y_offset;
g_now_config_state[win->id][i] = 1;
}
-#endif
} else {
win->area[i].state = 0;
-#if defined(CONFIG_RK_IOMMU)
+ win->area[i].fbdc_en = 0;
if (dev_drv->iommu_enabled) {
g_now_config_addr[win->id][i] = 0;
g_now_config_state[win->id][i] = 0;
}
-#endif
}
}
}
}
static int rk_fb_reg_effect(struct rk_lcdc_driver *dev_drv,
- struct rk_fb_reg_data *regs,
- int count)
+ struct rk_fb_reg_data *regs,
+ int count)
{
int i, j, wait_for_vsync = false;
unsigned int dsp_addr[5][4];
dev_drv->win[i]->area[j].smem_start +
dev_drv->win[i]->area[j].y_offset;
u32 reg_start = dsp_addr[i][j];
+
if (unlikely(new_start != reg_start)) {
wait_for_vsync = true;
dev_info(dev_drv->dev,
int count = 100;
long timeout;
int pagefault = 0;
+
+ if (dev_drv->suspend_flag == 1) {
+#ifdef H_USE_FENCE
+ sw_sync_timeline_inc(dev_drv->timeline, 1);
+#endif
+ for (i = 0; i < regs->win_num; i++) {
+ win_data = ®s->reg_win_data[i];
+ rk_fb_free_dma_buf(dev_drv, win_data);
+ }
+ if (dev_drv->property.feature & SUPPORT_WRITE_BACK)
+ rk_fb_free_wb_buf(dev_drv, ®s->reg_wb_data);
+ kfree(regs);
+ return;
+ }
/* acq_fence wait */
for (i = 0; i < regs->win_num; i++) {
win_data = ®s->reg_win_data[i];
for (j = 0; j < RK_WIN_MAX_AREA; j++) {
- if (win_data->reg_area_data[j].acq_fence) {
+ if (win_data->reg_area_data[j].acq_fence)
rk_fd_fence_wait(dev_drv, win_data->reg_area_data[j].acq_fence);
- }
}
}
} else {
win->z_order = -1;
win->state = 0;
- for (j = 0; j < 4; j++)
+ for (j = 0; j < 4; j++) {
win->area[j].state = 0;
-#if defined(CONFIG_RK_IOMMU)
+ win->area[j].fbdc_en = 0;
+ }
if (dev_drv->iommu_enabled) {
for (j = 0; j < 4; j++) {
g_now_config_addr[i][j] = 0;
g_now_config_state[i][j] = 0;
}
}
-#endif
}
}
dev_drv->ops->ovl_mgr(dev_drv, 0, 1);
+ if (dev_drv->property.feature & SUPPORT_WRITE_BACK) {
+ memcpy(&dev_drv->wb_data, ®s->reg_wb_data,
+ sizeof(struct rk_fb_reg_wb_data));
+ if (dev_drv->ops->set_wb)
+ dev_drv->ops->set_wb(dev_drv);
+ }
+
if (rk_fb_iommu_debug > 0)
pagefault = rk_fb_iommu_page_fault_dump(dev_drv);
#endif
if (dev_drv->front_regs) {
-#if defined(CONFIG_RK_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
mutex_lock(&dev_drv->front_lock);
win_data = &dev_drv->front_regs->reg_win_data[i];
rk_fb_free_dma_buf(dev_drv, win_data);
}
+ if (dev_drv->property.feature & SUPPORT_WRITE_BACK)
+ rk_fb_free_wb_buf(dev_drv,
+ &dev_drv->front_regs->reg_wb_data);
kfree(dev_drv->front_regs);
mutex_unlock(&dev_drv->front_lock);
-#if defined(CONFIG_RK_IOMMU)
if (dev_drv->iommu_enabled)
freed_addr[freed_index] = 0xfefefefe;
-#endif
}
mutex_lock(&dev_drv->front_lock);
mutex_unlock(&dev_drv->update_regs_list_lock);
list_for_each_entry_safe(data, next, &dev_drv->saved_list, list) {
- rk_fb_update_reg(dev_drv, data);
list_del(&data->list);
+ rk_fb_update_reg(dev_drv, data);
}
if (dev_drv->wait_fs && list_empty(&dev_drv->update_regs_list))
(area_par->ypos >= screen->mode.yres) ||
((area_par->xsize <= 0) || (area_par->ysize <= 0))) {
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,
- area_par->ypos, area_par->ysize, screen->mode.yres);
+ "xpos=%d,xsize=%d,xres=%d\n"
+ "ypos=%d,ysize=%d,yres=%d\n",
+ area_par->xpos, area_par->xsize, screen->mode.xres,
+ area_par->ypos, area_par->ysize, screen->mode.yres);
return -EINVAL;
}
return 0;
return 0;
}
static int rk_fb_config_backup(struct rk_lcdc_driver *dev_drv,
- struct rk_fb_win_cfg_data *win_cfg,
- struct rk_fb_reg_data *regs)
+ struct rk_fb_win_cfg_data *win_cfg,
+ struct rk_fb_reg_data *regs)
{
int i;
return 0;
}
+
+static int rk_fb_set_wb_buffer(struct fb_info *info,
+ struct rk_fb_wb_cfg *wb_cfg,
+ struct rk_fb_reg_wb_data *wb_data)
+{
+ int ret = 0;
+ ion_phys_addr_t phy_addr;
+ size_t len;
+ u8 fb_data_fmt;
+ struct rk_fb_par *fb_par = (struct rk_fb_par *)info->par;
+ struct rk_lcdc_driver *dev_drv = fb_par->lcdc_drv;
+ struct rk_fb *rk_fb = dev_get_drvdata(info->device);
+
+ if ((wb_cfg->phy_addr == 0) && (wb_cfg->ion_fd == 0)) {
+ wb_data->state = 0;
+ return 0;
+ }
+ if (wb_cfg->phy_addr == 0) {
+ wb_data->ion_handle =
+ ion_import_dma_buf(rk_fb->ion_client,
+ wb_cfg->ion_fd);
+ if (IS_ERR(wb_data->ion_handle)) {
+ pr_info("Could not import handle: %ld\n",
+ (long)wb_data->ion_handle);
+ return -EINVAL;
+ }
+ if (dev_drv->iommu_enabled)
+ ret = ion_map_iommu(dev_drv->dev,
+ rk_fb->ion_client,
+ wb_data->ion_handle,
+ (unsigned long *)&phy_addr,
+ (unsigned long *)&len);
+ else
+ ret = ion_phys(rk_fb->ion_client, wb_data->ion_handle,
+ &phy_addr, &len);
+ if (ret < 0) {
+ pr_err("ion map to get phy addr failed\n");
+ ion_free(rk_fb->ion_client, wb_data->ion_handle);
+ return -ENOMEM;
+ }
+ wb_data->smem_start = phy_addr;
+ } else {
+ wb_data->smem_start = wb_cfg->phy_addr;
+ }
+
+ fb_data_fmt = rk_fb_data_fmt(wb_cfg->data_format, 0);
+ if (IS_YUV_FMT(fb_data_fmt))
+ wb_data->cbr_start = wb_data->smem_start +
+ wb_cfg->xsize * wb_cfg->ysize;
+ wb_data->xsize = wb_cfg->xsize;
+ wb_data->ysize = wb_cfg->ysize;
+ wb_data->data_format = fb_data_fmt;
+ wb_data->state = 1;
+
+ return 0;
+}
+
static int rk_fb_set_win_buffer(struct fb_info *info,
struct rk_fb_win_par *win_par,
struct rk_fb_reg_win_data *reg_win_data)
struct rk_screen *screen = dev_drv->cur_screen;/*screen0;*/
struct fb_info *fbi;
int i, ion_fd, acq_fence_fd;
- u32 xvir, yvir;
- u32 xoffset, yoffset;
+ u32 xvir = 0, yvir = 0;
+ u32 xoffset = 0, yoffset = 0;
struct ion_handle *hdl;
size_t len;
- int index_buf;
- u8 fb_data_fmt;
- u8 pixel_width;
- u32 vir_width_bit;
- u32 stride, uv_stride;
- u32 stride_32bit_1;
- u32 stride_32bit_2;
- u16 uv_x_off, uv_y_off, uv_y_act;
+ int index_buf = 0;
+ u8 fb_data_fmt = 0;
+ u8 pixel_width = 0;
+ u32 vir_width_bit = 0;
+ u32 stride = 0, uv_stride = 0;
+ u32 stride_32bit_1 = 0;
+ u32 stride_32bit_2 = 0;
+ u16 uv_x_off = 0, uv_y_off = 0, uv_y_act = 0;
u8 is_pic_yuv = 0;
u8 ppixel_a = 0, global_a = 0;
ion_phys_addr_t phy_addr;
int ret = 0;
- int buff_len;
+ int buff_len = 0;
reg_win_data->reg_area_data[0].smem_start = -1;
reg_win_data->area_num = 0;
ion_import_dma_buf(rk_fb->ion_client,
ion_fd);
if (IS_ERR(hdl)) {
- pr_info("%s: Could not import handle:"
- " %ld\n", __func__, (long)hdl);
+ pr_info("%s: win[%d]area[%d] can't import handle\n",
+ __func__, win_par->win_id, i);
+ pr_info("fd: %d, hdl: 0x%p, ion_client: 0x%p\n",
+ ion_fd, hdl, rk_fb->ion_client);
return -EINVAL;
break;
}
reg_win_data->reg_area_data[i].ion_handle = hdl;
-#ifndef CONFIG_RK_IOMMU
- ret = ion_phys(rk_fb->ion_client, hdl, &phy_addr,
- &len);
-#else
if (dev_drv->iommu_enabled)
ret = ion_map_iommu(dev_drv->dev,
rk_fb->ion_client,
else
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);
reg_win_data->reg_area_data[0].xoff*
pixel_width / 16;
if ((buff_len > reg_win_data->reg_area_data[0].buff_len) &&
- dev_drv->iommu_enabled)
+ dev_drv->iommu_enabled)
pr_err("\n!!!!!!error: fmt=%d,xvir[%d]*"
"yact[%d]*bpp[%d]"
"=buff_len[0x%x]>>mmu len=0x%x\n",
} else {
pr_info("error:win_id bigger than lcdc_win_num\n");
pr_info("i=%d,win_id=%d\n", i,
- win_data->win_par[i].win_id);
+ win_data->win_par[i].win_id);
}
}
-
+ if (dev_drv->property.feature & SUPPORT_WRITE_BACK)
+ rk_fb_set_wb_buffer(info, &win_data->wb_cfg,
+ ®s->reg_wb_data);
if (regs->win_num <= 0)
goto err_null_frame;
win_data->rel_fence_fd[i] = get_unused_fd_flags(0);
if (win_data->rel_fence_fd[i] < 0) {
pr_info("rel_fence_fd=%d\n",
- win_data->rel_fence_fd[i]);
+ win_data->rel_fence_fd[i]);
ret = -EFAULT;
goto err2;
}
win_data->ret_fence_fd = -1;
pr_info("win num = %d,null frame\n", regs->win_num);
err2:
+ rk_fb_config_debug(dev_drv, win_data, regs, 0);
kfree(regs);
mutex_unlock(&dev_drv->output_lock);
EXPORT_SYMBOL(rk_get_real_fps);
#endif
-#ifdef CONFIG_RK_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)
{
if (copy_from_user(hwc_phy, argp, 4))
return -EFAULT;
-#ifdef CONFIG_RK_IOMMU
if (!dev_drv->iommu_enabled) {
-#endif
fix->smem_start = hwc_phy[0];
-#ifdef CONFIG_RK_IOMMU
} else {
int usr_fd;
struct ion_handle *hdl;
}
ret = ion_map_iommu(dev_drv->dev, rk_fb->ion_client, hdl,
- (unsigned long *)&phy_addr,
- (unsigned long *)&len);
+ (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);
fix->smem_start = phy_addr;
ion_hwc[0] = hdl;
}
-#endif
break;
}
case RK_FBIOSET_YUV_ADDR:
if (copy_from_user(yuv_phy, argp, 8))
return -EFAULT;
- #ifdef CONFIG_RK_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_RK_IOMMU
} else {
int usr_fd, offset, tmp;
struct ion_handle *hdl;
ion_hanle[tmp] = ion_hanle[tmp - 1];
ion_hanle[0] = 0;
}
- #endif
break;
}
case RK_FBIOSET_ENABLE:
struct ion_handle *hdl;
ion_phys_addr_t phy_addr;
size_t len;
+
if (copy_from_user(&usr_fd, argp, sizeof(usr_fd)))
return -EFAULT;
u32 xvir = var->xres_virtual;
u8 data_format = var->nonstd & 0xff;
u8 fb_data_fmt;
- u8 pixel_width;
+ u8 pixel_width = 0;
u32 vir_width_bit;
- u32 stride, uv_stride;
+ u32 stride, uv_stride = 0;
u32 stride_32bit_1;
u32 stride_32bit_2;
u16 uv_x_off, uv_y_off, uv_y_act;
/* true-colour, use pseudo-palette */
if (regno < 16) {
u32 *pal = info->pseudo_palette;
+
val = chan_to_field(red, &info->var.red);
val |= chan_to_field(green, &info->var.green);
val |= chan_to_field(blue, &info->var.blue);
}
}
- envp[0] = "switch screen";
+ envp[0] = "switch vop screen";
memset(envplcdc, 0, sizeof(envplcdc));
memset(envpfbdev, 0, sizeof(envpfbdev));
- sprintf(envplcdc, "SCREEN=%d,ENABLE=%d", screen->type, enable);
+ sprintf(envplcdc, "SCREEN=%d,ENABLE=%d,VOPID=%d", screen->type, enable, dev_drv->id);
sprintf(envpfbdev, "FBDEV=%d", dev_drv->fb_index_base);
envp[1] = envplcdc;
envp[2] = envpfbdev;
/* If there is more than one lcdc device, we disable
* the layer which attached to this device
*/
- dev_drv->suspend_flag = 1;
flush_kthread_worker(&dev_drv->update_regs_worker);
for (i = 0; i < dev_drv->lcdc_win_num; i++) {
if (dev_drv->win[i] && dev_drv->win[i]->state)
mutex_unlock(&dev_drv->switch_screen);
return 0;
} else {
+ if (load_screen || (rk_fb->disp_policy != DISPLAY_POLICY_BOX)) {
+ for (i = 0; i < dev_drv->lcdc_win_num; i++) {
+ if (dev_drv->win[i] && dev_drv->win[i]->state &&
+ dev_drv->ops->win_direct_en)
+ dev_drv->ops->win_direct_en(dev_drv, i, 0);
+ }
+ }
if (dev_drv->uboot_logo) {
if (dev_drv->cur_screen->mode.xres !=
screen->mode.xres ||
dev_drv->cur_screen->x_mirror = dev_drv->rotate_mode & X_MIRROR;
dev_drv->cur_screen->y_mirror = dev_drv->rotate_mode & Y_MIRROR;
}
+
if (!dev_drv->uboot_logo || load_screen ||
(rk_fb->disp_policy != DISPLAY_POLICY_BOX)) {
for (i = 0; i < dev_drv->lcdc_win_num; i++) {
dev_drv->ops->cfg_done(dev_drv);
} else if (!dev_drv->win[win_id]->state) {
dev_drv->ops->open(dev_drv, win_id, 1);
- dev_drv->suspend_flag = 0;
- mutex_lock(&dev_drv->win_config);
- info->var.xoffset = 0;
- info->var.yoffset = 0;
- info->fbops->fb_set_par(info);
- info->fbops->fb_pan_display(&info->var,
- info);
- mutex_unlock(&dev_drv->win_config);
+ /* dev_drv->suspend_flag = 0; */
+ /* mutex_lock(&dev_drv->win_config);
+ * info->var.xoffset = 0;
+ * info->var.yoffset = 0;
+ * info->fbops->fb_set_par(info);
+ * info->fbops->fb_pan_display(&info->var,
+ * info);
+ * mutex_unlock(&dev_drv->win_config);
+ */
}
}
}
else
handle = ion_alloc(rk_fb->ion_client, (size_t)fb_mem_size, 0,
ION_HEAP_TYPE_DMA_MASK, 0);
+
if (IS_ERR(handle)) {
dev_err(fbi->device, "failed to ion_alloc:%ld\n",
PTR_ERR(handle));
win->area[0].ion_hdl = handle;
if (dev_drv->prop == PRMRY)
fbi->screen_base = ion_map_kernel(rk_fb->ion_client, handle);
-#ifdef CONFIG_RK_IOMMU
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
ret = ion_phys(rk_fb->ion_client, handle, &phy_addr, &len);
-#else
- 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;
fb_par->ion_hdl);
dev_drv->win[win_id]->area[0].ion_hdl =
fb_par->ion_hdl;
-#ifdef CONFIG_RK_IOMMU
- if (dev_drv->mmu_dev)
+ if (dev_drv->iommu_enabled && dev_drv->mmu_dev)
ret = ion_map_iommu(dev_drv->dev,
rk_fb->ion_client,
fb_par->ion_hdl,
ret = ion_phys(rk_fb->ion_client,
fb_par->ion_hdl,
&phy_addr, &len);
-#endif
if (ret < 0) {
dev_err(fbi->dev, "ion map to get phy addr failed\n");
return -ENOMEM;
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);
+ fbi->fix.smem_start, fbi->screen_base,
+ fbi->fix.smem_len);
return ret;
}
strcpy(win->name, def_win[i].name);
win->id = def_win[i].id;
win->support_3d = def_win[i].support_3d;
+ win->property.feature = def_win[i].property.feature;
+ win->property.max_input_x = def_win[i].property.max_input_x;
+ win->property.max_input_y = def_win[i].property.max_input_y;
dev_drv->win[i] = win;
}
unsigned char *src = bmp_logo->data;
unsigned char *dst = info->screen_base;
int i;
- unsigned int Needwidth = (*(src - 24) << 8) | (*(src - 23));
- unsigned int Needheight = (*(src - 22) << 8) | (*(src - 21));
+ unsigned int needwidth = (*(src - 24) << 8) | (*(src - 23));
+ unsigned int needheight = (*(src - 22) << 8) | (*(src - 21));
- for (i = 0; i < Needheight; i++)
+ for (i = 0; i < needheight; i++)
memcpy(dst + info->var.xres * i * 4,
- src + bmp_logo->width * i * 4, Needwidth * 4);
+ src + bmp_logo->width * i * 4, needwidth * 4);
}
#endif
return false;
}
-__weak phys_addr_t uboot_logo_base;
-__weak phys_addr_t uboot_logo_size;
-__weak phys_addr_t uboot_logo_offset;
+phys_addr_t uboot_logo_base;
+phys_addr_t uboot_logo_size;
+phys_addr_t uboot_logo_offset;
+
+static int __init rockchip_uboot_mem_late_init(void)
+{
+ int err;
+
+ if (uboot_logo_size) {
+ void *start = phys_to_virt(uboot_logo_base);
+ void *end = phys_to_virt(uboot_logo_base + uboot_logo_size);
+
+ err = memblock_free(uboot_logo_base, uboot_logo_size);
+ if (err < 0)
+ pr_err("%s: freeing memblock failed: %d\n",
+ __func__, err);
+ free_reserved_area(start, end, -1, "logo");
+ }
+ return 0;
+}
+
+late_initcall(rockchip_uboot_mem_late_init);
int rk_fb_register(struct rk_lcdc_driver *dev_drv,
struct rk_lcdc_win *win, int id)
struct rk_fb_par *fb_par = NULL;
int i = 0, ret = 0, index = 0;
unsigned long flags;
+ char time_line_name[16];
if (rk_fb->num_lcdc == RK30_MAX_LCDC_SUPPORT)
return -ENXIO;
fbi->fix = def_fix;
sprintf(fbi->fix.id, "fb%d", rk_fb->num_fb);
fb_videomode_to_var(&fbi->var, &dev_drv->cur_screen->mode);
+ fbi->var.width = dev_drv->cur_screen->width;
+ fbi->var.height = dev_drv->cur_screen->height;
fbi->var.grayscale |=
(fbi->var.xres << 8) + (fbi->var.yres << 20);
#if defined(CONFIG_LOGO_LINUX_BMP)
mutex_init(&dev_drv->output_lock);
INIT_LIST_HEAD(&dev_drv->update_regs_list);
+ INIT_LIST_HEAD(&dev_drv->saved_list);
mutex_init(&dev_drv->update_regs_list_lock);
init_kthread_worker(&dev_drv->update_regs_worker);
init_kthread_work(&dev_drv->update_regs_work,
rk_fb_update_regs_handler);
+ snprintf(time_line_name, sizeof(time_line_name),
+ "vop%d-timeline", id);
dev_drv->timeline =
- sw_sync_timeline_create("fb-timeline");
+ sw_sync_timeline_create(time_line_name);
dev_drv->timeline_max = 1;
}
}
main_fbi->fbops->fb_open(main_fbi, 1);
main_fbi->var.pixclock = dev_drv->pixclock;
-#if defined(CONFIG_RK_IOMMU)
if (dev_drv->iommu_enabled) {
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); /* only alloc memory for main fb */
dev_drv->uboot_logo = support_uboot_display();
if (dev_drv->uboot_logo &&
uboot_logo_offset && uboot_logo_base) {
- int width, height, bits;
+ int width, height, bits, xvir;
phys_addr_t start = uboot_logo_base + uboot_logo_offset;
unsigned int size = uboot_logo_size - uboot_logo_offset;
unsigned int nr_pages;
start += PAGE_SIZE;
i++;
}
- vaddr = vmap(pages, nr_pages, VM_MAP,
- pgprot_writecombine(PAGE_KERNEL));
+ vaddr = vmap(pages, nr_pages, VM_MAP, PAGE_KERNEL);
if (!vaddr) {
pr_err("failed to vmap phy addr 0x%lx\n",
(long)(uboot_logo_base +
xact, yact, width, height);
return 0;
}
+ xvir = ALIGN(width * bits, 1 << 5) >> 5;
ymirror = 0;
local_irq_save(flags);
if (dev_drv->ops->wait_frame_start)
dev_drv->ops->post_dspbuf(dev_drv,
main_fbi->fix.smem_start,
rk_fb_data_fmt(0, bits),
- width, height, width * bits >> 5,
+ width, height, xvir,
ymirror);
}
if (dev_drv->iommu_enabled) {
return 0;
} else if (dev_drv->uboot_logo && uboot_logo_base) {
u32 start = uboot_logo_base;
- int logo_len, i=0;
+ int logo_len, i = 0;
int y_mirror = 0;
unsigned int nr_pages;
struct page **pages;
char *vaddr;
- int align = 0;
+ int align = 0, xvir;
dev_drv->ops->get_dspbuf_info(dev_drv, &xact,
- &yact, &format,
+ &yact, &format,
&start,
&y_mirror);
logo_len = rk_fb_pixel_width(format) * xact * yact >> 3;
start += PAGE_SIZE;
i++;
}
- vaddr = vmap(pages, nr_pages, VM_MAP,
- pgprot_writecombine(PAGE_KERNEL));
+ vaddr = vmap(pages, nr_pages, VM_MAP, PAGE_KERNEL);
if (!vaddr) {
pr_err("failed to vmap phy addr 0x%x\n",
start);
kfree(pages);
vunmap(vaddr);
+ xvir = ALIGN(xact * rk_fb_pixel_width(format),
+ 1 << 5) >> 5;
local_irq_save(flags);
if (dev_drv->ops->wait_frame_start)
dev_drv->ops->wait_frame_start(dev_drv, 0);
main_fbi->fix.smem_start +
(y_mirror ? logo_len : 0),
format, xact, yact,
- xact * rk_fb_pixel_width(format) >> 5,
+ xvir,
y_mirror);
if (dev_drv->iommu_enabled) {
rk_fb_poll_wait_frame_complete();
main_fbi->fbops->fb_pan_display(&main_fbi->var, main_fbi);
#endif
} else {
- struct fb_info *extend_fbi = rk_fb->fb[rk_fb->num_fb >> 1];
+ struct fb_info *extend_fbi = rk_fb->fb[dev_drv->fb_index_base];
extend_fbi->var.pixclock = rk_fb->fb[0]->var.pixclock;
- extend_fbi->fbops->fb_open(extend_fbi, 1);
-#if defined(CONFIG_RK_IOMMU)
- if (dev_drv->iommu_enabled) {
- if (dev_drv->mmu_dev)
- rockchip_iovmm_set_fault_handler(dev_drv->dev,
- rk_fb_sysmmu_fault_handler);
+ if (rk_fb->disp_mode == DUAL_LCD) {
+ extend_fbi->fbops->fb_open(extend_fbi, 1);
+ if (dev_drv->iommu_enabled) {
+ if (dev_drv->mmu_dev)
+ rockchip_iovmm_set_fault_handler(dev_drv->dev,
+ rk_fb_sysmmu_fault_handler);
+ }
+ rk_fb_alloc_buffer(extend_fbi);
}
-#endif
- rk_fb_alloc_buffer(extend_fbi);
}
#endif
return 0;
{
struct rk_fb *rk_fb = NULL;
struct device_node *np = pdev->dev.of_node;
- u32 mode;
+ u32 mode, ret;
+ struct device_node *node;
if (!np) {
dev_err(&pdev->dev, "Missing device tree node.\n");
}
#endif
+ node = of_parse_phandle(np, "memory-region", 0);
+ if (node) {
+ struct resource r;
+
+ ret = of_address_to_resource(node, 0, &r);
+ if (ret)
+ return ret;
+
+ if (uboot_logo_on) {
+ uboot_logo_base = r.start;
+ uboot_logo_size = resource_size(&r);
+
+ if (uboot_logo_size > SZ_16M)
+ uboot_logo_offset = SZ_16M;
+ else
+ uboot_logo_offset = 0;
+ }
+ pr_info("logo: base=0x%llx, size=0x%llx, offset=0x%llx\n",
+ uboot_logo_base, uboot_logo_size, uboot_logo_offset);
+ }
+
fb_pdev = pdev;
dev_info(&pdev->dev, "rockchip framebuffer driver probe\n");
return 0;
static int rk_fb_remove(struct platform_device *pdev)
{
- struct rk_fb *rk_fb = platform_get_drvdata(pdev);
-
- kfree(rk_fb);
platform_set_drvdata(pdev, NULL);
return 0;
}
projects / firefly-linux-kernel-4.4.55.git / blobdiff