shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-12 07:58:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk fb: new framework test ok at rk3188

Browse Source 
this commit depend on the hwc commit:
commit 59966e5cc0530d936435052d187fbe574684f21e
Author: huangds <hds@rock-chips.com>
Date:   Fri Mar 7 11:17:56 2014 +0800

    lcdc ok ,enable hwc
commit 314b22af926f28c3daa048354a4e4185fc46611b
Author: huangds <hds@rock-chips.com>
Date:   Mon Mar 10 18:19:04 2014 +0800

    lcdc abbort ,RK_FBIOSET_CONFIG_DONE remove for a moment
This commit is contained in:
hjc
2014-03-07 11:49:23 +08:00
parent e6c0fa3546
commit 757b445bdd
5 changed files with 1309 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

544
drivers/video/rockchip/lcdc/rk3188_lcdc.c
View File

@@ -189,37 +189,37 @@ static void rk3188_lcdc_read_reg_defalut_cfg(struct lcdc_device
win0->scale_cbcr_y = (value >> 16) & 0xffff;
break;
case WIN0_ACT_INFO:
win0->xact = (((value >> 0) & 0x1fff) + 1);
win0->yact = (((value >> 16) & 0x1fff) + 1);
win0->area[0].xact = (((value >> 0) & 0x1fff) + 1);
win0->area[0].yact = (((value >> 16) & 0x1fff) + 1);
break;
case WIN0_DSP_ST:
win0->dsp_stx = (value >> 0) & 0xfff;
win0->dsp_sty = (value >> 16) & 0xfff;
win0->area[0].dsp_stx = (value >> 0) & 0xfff;
win0->area[0].dsp_sty = (value >> 16) & 0xfff;
break;
case WIN0_DSP_INFO:
win0->xsize = (((value >> 0) & 0x7ff) + 1);
win0->ysize = (((value >> 16) & 0x7ff) + 1);
win0->area[0].xsize = (((value >> 0) & 0x7ff) + 1);
win0->area[0].ysize = (((value >> 16) & 0x7ff) + 1);
break;
case WIN_VIR:
win0->vir_stride = (value >> 0) & 0x1fff;
win1->vir_stride = (value) & 0x1fff0000;
win0->area[0].y_vir_stride = (value >> 0) & 0x1fff;
win1->area[0].y_vir_stride = (value) & 0x1fff0000;
break;
case WIN0_YRGB_MST0:
win0->y_addr = value >> 0;
win0->area[0].y_addr = value >> 0;
break;
case WIN0_CBR_MST0:
win0->uv_addr = value >> 0;
win0->area[0].uv_addr = value >> 0;
break;
case WIN1_DSP_INFO:
win1->xsize = (((value >> 0) & 0x7ff) + 1);
win1->ysize = (((value >> 16) & 0x7ff) + 1);
win1->area[0].xsize = (((value >> 0) & 0x7ff) + 1);
win1->area[0].ysize = (((value >> 16) & 0x7ff) + 1);
break;
case WIN1_DSP_ST:
win1->dsp_stx = (value >> 0) & 0xfff;
win1->dsp_sty = (value >> 16) & 0xfff;
win1->area[0].dsp_stx = (value >> 0) & 0xfff;
win1->area[0].dsp_sty = (value >> 16) & 0xfff;
break;
case WIN1_MST:
win1->y_addr = value >> 0;
win1->area[0].y_addr = value >> 0;
break;
default:
DBG(2, "%s:uncare reg\n", __func__);
@@ -337,7 +337,6 @@ static int rk3188_lcdc_alpha_cfg(struct lcdc_device *lcdc_dev)
u32 *_pv = (u32 *) lcdc_dev->regsbak;
_pv += (DSP_CTRL0 >> 2);
win0_top = ((*_pv) & (m_WIN0_TOP)) >> 8;
if (win0_top && (lcdc_dev->atv_layer_cnt >= 2) && (win0_alpha_en)) {
lcdc_msk_reg(lcdc_dev, ALPHA_CTRL, m_WIN0_ALPHA_EN |
m_WIN1_ALPHA_EN, v_WIN0_ALPHA_EN(1) |
@@ -371,7 +370,6 @@ static int rk3188_lcdc_reg_update(struct rk_lcdc_driver *dev_drv)
struct rk_lcdc_win *win1 = lcdc_dev->driver.win[1];
int timeout;
unsigned long flags;
spin_lock(&lcdc_dev->reg_lock);
if (likely(lcdc_dev->clk_on)) {
lcdc_msk_reg(lcdc_dev, SYS_CTRL, m_LCDC_STANDBY,
@@ -389,30 +387,32 @@ static int rk3188_lcdc_reg_update(struct rk_lcdc_driver *dev_drv)
v_X_SCL_FACTOR(win0->scale_cbcr_x) |
v_Y_SCL_FACTOR(win0->scale_cbcr_y));
lcdc_msk_reg(lcdc_dev, SYS_CTRL, m_WIN0_FORMAT, v_WIN0_FORMAT(win0->fmt_cfg));
lcdc_writel(lcdc_dev, WIN0_ACT_INFO, v_ACT_WIDTH(win0->xact) |
v_ACT_HEIGHT(win0->yact));
lcdc_writel(lcdc_dev, WIN0_DSP_ST, v_DSP_STX(win0->dsp_stx) |
v_DSP_STY(win0->dsp_sty));
lcdc_writel(lcdc_dev, WIN0_DSP_INFO, v_DSP_WIDTH(win0->xsize) |
v_DSP_HEIGHT(win0->ysize));
lcdc_writel(lcdc_dev, WIN0_ACT_INFO, v_ACT_WIDTH(win0->area[0].xact) |
v_ACT_HEIGHT(win0->area[0].yact));
lcdc_writel(lcdc_dev, WIN0_DSP_ST, v_DSP_STX(win0->area[0].dsp_stx) |
v_DSP_STY(win0->area[0].dsp_sty));
lcdc_writel(lcdc_dev, WIN0_DSP_INFO, v_DSP_WIDTH(win0->area[0].xsize) |
v_DSP_HEIGHT(win0->area[0].ysize));
lcdc_msk_reg(lcdc_dev, WIN_VIR, m_WIN0_VIR,
v_WIN0_VIR_VAL(win0->vir_stride));
lcdc_writel(lcdc_dev, WIN0_YRGB_MST0, win0->y_addr);
lcdc_writel(lcdc_dev, WIN0_CBR_MST0, win0->uv_addr);
lcdc_writel(lcdc_dev, WIN1_DSP_INFO, v_DSP_WIDTH(win1->xsize) |
v_DSP_HEIGHT(win1->ysize));
lcdc_writel(lcdc_dev, WIN1_DSP_ST, v_DSP_STX(win1->dsp_stx) |
v_DSP_STY(win1->dsp_sty));
lcdc_msk_reg(lcdc_dev, WIN_VIR, m_WIN1_VIR, win1->vir_stride);
v_WIN0_VIR_VAL(win0->area[0].y_vir_stride));
lcdc_writel(lcdc_dev, WIN0_YRGB_MST0, win0->area[0].y_addr);
lcdc_writel(lcdc_dev, WIN0_CBR_MST0, win0->area[0].uv_addr);
lcdc_writel(lcdc_dev, WIN1_DSP_INFO, v_DSP_WIDTH(win1->area[0].xsize) |
v_DSP_HEIGHT(win1->area[0].ysize));
lcdc_writel(lcdc_dev, WIN1_DSP_ST, v_DSP_STX(win1->area[0].dsp_stx) |
v_DSP_STY(win1->area[0].dsp_sty));
lcdc_msk_reg(lcdc_dev, WIN_VIR, m_WIN1_VIR, ((win1->area[0].y_vir_stride)&0x1fff)<<16);
lcdc_msk_reg(lcdc_dev, SYS_CTRL, m_WIN1_FORMAT,
v_WIN1_FORMAT(win1->fmt_cfg));
lcdc_writel(lcdc_dev, WIN1_MST, win1->y_addr);
lcdc_writel(lcdc_dev, WIN1_MST, win1->area[0].y_addr);
//printk("rk3188_lcdc_reg_update,win_num=%d\n",dev_drv->atv_layer_cnt);
rk3188_lcdc_alpha_cfg(lcdc_dev);
lcdc_cfg_done(lcdc_dev);
}
spin_unlock(&lcdc_dev->reg_lock);
if (dev_drv->wait_fs) {
//if (dev_drv->wait_fs) {
if (0) {
spin_lock_irqsave(&dev_drv->cpl_lock, flags);
init_completion(&dev_drv->frame_done);
spin_unlock_irqrestore(&dev_drv->cpl_lock, flags);
@@ -647,206 +647,20 @@ static int rk3188_lcdc_open(struct rk_lcdc_driver *dev_drv, int win_id,
return 0;
}
static int win0_set_par(struct lcdc_device *lcdc_dev,
struct rk_screen *screen, struct rk_lcdc_win *win)
{
u32 xact, yact, xvir, yvir, xpos, ypos;
u32 ScaleYrgbX = 0x1000;
u32 ScaleYrgbY = 0x1000;
u32 ScaleCbrX = 0x1000;
u32 ScaleCbrY = 0x1000;
u8 fmt_cfg = 0;
char fmt[9] = "NULL";
xact = win->xact;
yact = win->yact;
xvir = win->xvir;
yvir = win->yvir;
xpos = win->xpos + screen->mode.left_margin + screen->mode.hsync_len;
ypos = win->ypos + screen->mode.upper_margin + screen->mode.vsync_len;
ScaleYrgbX = CalScale(xact, win->xsize);
ScaleYrgbY = CalScale(yact, win->ysize);
switch (win->format) {
case ARGB888:
case XBGR888:
case ABGR888:
fmt_cfg = 0;
break;
case RGB888:
fmt_cfg = 1;
break;
case RGB565:
fmt_cfg = 2;
break;
case YUV422:
fmt_cfg = 5;
ScaleCbrX = CalScale((xact / 2), win->xsize);
ScaleCbrY = CalScale(yact, win->ysize);
break;
case YUV420:
fmt_cfg = 4;
ScaleCbrX = CalScale(xact / 2, win->xsize);
ScaleCbrY = CalScale(yact / 2, win->ysize);
break;
case YUV444:
fmt_cfg = 6;
ScaleCbrX = CalScale(xact, win->xsize);
ScaleCbrY = CalScale(yact, win->ysize);
break;
default:
dev_err(lcdc_dev->driver.dev, "%s:un supported format!\n",
__func__);
break;
}
DBG(1, "lcdc%d>>%s\n>>format:%s>>>xact:%d>>yact:%d>>xsize:%d>>ysize:%d\n"
">>xvir:%d>>yvir:%d>>xpos:%d>>ypos:%d>>\n", lcdc_dev->id,
__func__, get_format_string(win->format, fmt), xact,
yact, win->xsize, win->ysize, xvir, yvir, xpos, ypos);
spin_lock(&lcdc_dev->reg_lock);
if (likely(lcdc_dev->clk_on)) {
win->scale_yrgb_x = ScaleYrgbX;
win->scale_yrgb_y = ScaleYrgbY;
win->scale_cbcr_x = ScaleCbrX;
win->scale_cbcr_y = ScaleCbrY;
win->fmt_cfg = fmt_cfg;
win->dsp_stx = xpos;
win->dsp_sty = ypos;
switch (win->format) {
case XBGR888:
case ABGR888:
win->vir_stride = v_ARGB888_VIRWIDTH(xvir);
win->swap_rb = 1;
break;
case ARGB888:
win->vir_stride = v_ARGB888_VIRWIDTH(xvir);
win->swap_rb = 0;
break;
case RGB888:
win->vir_stride = v_RGB888_VIRWIDTH(xvir);
win->swap_rb = 0;
break;
case RGB565:
win->vir_stride = v_RGB565_VIRWIDTH(xvir);
win->swap_rb = 0;
break;
case YUV422:
case YUV420:
case YUV444:
win->vir_stride = v_YUV_VIRWIDTH(xvir);
win->swap_rb = 0;
break;
default:
dev_err(lcdc_dev->driver.dev,
"%s:un supported format!\n", __func__);
break;
}
}
spin_unlock(&lcdc_dev->reg_lock);
return 0;
}
static int win1_set_par(struct lcdc_device *lcdc_dev,
struct rk_screen *screen, struct rk_lcdc_win *win)
{
u32 xact, yact, xvir, yvir, xpos, ypos;
u8 fmt_cfg;
char fmt[9] = "NULL";
xact = win->xact;
yact = win->yact;
xvir = win->xvir;
yvir = win->yvir;
xpos = win->xpos + screen->mode.left_margin + screen->mode.hsync_len;
ypos = win->ypos + screen->mode.upper_margin + screen->mode.vsync_len;
DBG(1, "lcdc%d>>%s>>format:%s>>>xact:%d>>yact:%d>>xsize:%d>>ysize:%d\n"
">>xvir:%d>>yvir:%d>>xpos:%d>>ypos:%d>>\n", lcdc_dev->id,
__func__, get_format_string(win->format, fmt), xact, yact,
win->xsize, win->ysize, xvir, yvir, xpos, ypos);
spin_lock(&lcdc_dev->reg_lock);
if (likely(lcdc_dev->clk_on)) {
win->dsp_stx = xpos;
win->dsp_sty = ypos;
switch (win->format) {
case XBGR888:
case ABGR888:
fmt_cfg = 0;
win->vir_stride = v_WIN1_ARGB888_VIRWIDTH(xvir);
win->swap_rb = 1;
break;
case ARGB888:
fmt_cfg = 0;
win->vir_stride = v_WIN1_ARGB888_VIRWIDTH(xvir);
win->swap_rb = 0;
break;
case RGB888:
fmt_cfg = 1;
win->vir_stride = v_WIN1_RGB888_VIRWIDTH(xvir);
win->swap_rb = 0;
break;
case RGB565:
fmt_cfg = 2;
win->vir_stride = v_WIN1_RGB565_VIRWIDTH(xvir);
win->swap_rb = 0;
break;
default:
dev_err(lcdc_dev->driver.dev,
"%s:un supported format!\n", __func__);
break;
}
win->fmt_cfg = fmt_cfg;
}
spin_unlock(&lcdc_dev->reg_lock);
return 0;
}
static int rk3188_lcdc_set_par(struct rk_lcdc_driver *dev_drv, int win_id)
{
struct lcdc_device *lcdc_dev =
container_of(dev_drv, struct lcdc_device, driver);
struct rk_lcdc_win *win = NULL;
struct rk_screen *screen = dev_drv->cur_screen;
if (!screen) {
dev_err(dev_drv->dev, "screen is null!\n");
return -ENOENT;
}
if (win_id == 0) {
win = dev_drv->win[0];
win0_set_par(lcdc_dev, screen, win);
} else if (win_id == 1) {
win = dev_drv->win[1];
win1_set_par(lcdc_dev, screen, win);
} else {
dev_err(dev_drv->dev, "unsupported win number:%d\n", win_id);
return -EINVAL;
}
return 0;
}
static int win0_display(struct lcdc_device *lcdc_dev,
struct rk_lcdc_win *win)
{
u32 y_addr;
u32 uv_addr;
y_addr = win->smem_start + win->y_offset;
uv_addr = win->cbr_start + win->c_offset;
y_addr = win->area[0].smem_start+win->area[0].y_offset;//win->smem_start + win->y_offset;
uv_addr = win->area[0].cbr_start + win->area[0].c_offset;
DBG(2, "lcdc%d>>%s:y_addr:0x%x>>uv_addr:0x%x\n",
lcdc_dev->id, __func__, y_addr, uv_addr);
//printk("y_offset=0x%x,y_addr=0x%x\n",win->area[0].y_offset,y_addr);
spin_lock(&lcdc_dev->reg_lock);
if (likely(lcdc_dev->clk_on)) {
win->y_addr = y_addr;
win->uv_addr = uv_addr;
win->area[0].y_addr = y_addr;
win->area[0].uv_addr = uv_addr;
}
spin_unlock(&lcdc_dev->reg_lock);
@@ -859,19 +673,55 @@ static int win1_display(struct lcdc_device *lcdc_dev,
{
u32 y_addr;
u32 uv_addr;
y_addr = win->smem_start + win->y_offset;
uv_addr = win->cbr_start + win->c_offset;
y_addr = win->area[0].smem_start + win->area[0].y_offset;
uv_addr = win->area[0].cbr_start + win->area[0].c_offset;
DBG(2, "lcdc%d>>%s>>y_addr:0x%x>>uv_addr:0x%x\n",
lcdc_dev->id, __func__, y_addr, uv_addr);
spin_lock(&lcdc_dev->reg_lock);
if (likely(lcdc_dev->clk_on))
win->y_addr = y_addr;
win->area[0].y_addr = y_addr;
spin_unlock(&lcdc_dev->reg_lock);
return 0;
}
static int rk3188_lcdc_win_display(struct rk_lcdc_driver *dev_drv, struct rk_lcdc_win *win,int win_id)
{
struct lcdc_device *lcdc_dev = container_of(dev_drv,
struct lcdc_device, driver);
struct rk_screen *screen = dev_drv->cur_screen;
u32 mask, val;
lcdc_dev->atv_layer_cnt = dev_drv->atv_layer_cnt;
if (!screen) {
dev_err(dev_drv->dev, "screen is null!\n");
return -ENOENT;
}
if (win_id == 0) {
win0_display(lcdc_dev, win);
} else if (win_id == 1) {
win1_display(lcdc_dev, win);
} else {
dev_err(dev_drv->dev, "invalid win number:%d!\n", win_id);
return -EINVAL;
}
/*this is the first frame of the system ,enable frame start interrupt */
if ((dev_drv->first_frame)) {
dev_drv->first_frame = 0;
mask = m_HS_INT_CLEAR | m_HS_INT_EN | m_FS_INT_CLEAR |
m_FS_INT_EN | m_LF_INT_EN | m_LF_INT_CLEAR |
m_LF_INT_NUM | m_BUS_ERR_INT_CLEAR | m_BUS_ERR_INT_EN;
val = v_FS_INT_CLEAR(1) | v_FS_INT_EN(1) | v_HS_INT_CLEAR(1) |
v_HS_INT_EN(0) | v_LF_INT_CLEAR(1) | v_LF_INT_EN(1) |
v_LF_INT_NUM(screen->mode.vsync_len + screen->mode.upper_margin +
screen->mode.yres -1);
lcdc_msk_reg(lcdc_dev, INT_STATUS, mask, val);
lcdc_cfg_done(lcdc_dev);
}
}
static int rk3188_lcdc_pan_display(struct rk_lcdc_driver *dev_drv, int win_id)
{
struct lcdc_device *lcdc_dev = container_of(dev_drv,
@@ -883,6 +733,7 @@ static int rk3188_lcdc_pan_display(struct rk_lcdc_driver *dev_drv, int win_id)
int timeout;
unsigned long flags;
#endif
lcdc_dev->atv_layer_cnt = dev_drv->atv_layer_cnt;
if (!screen) {
dev_err(dev_drv->dev, "screen is null!\n");
return -ENOENT;
@@ -890,6 +741,11 @@ static int rk3188_lcdc_pan_display(struct rk_lcdc_driver *dev_drv, int win_id)
if (win_id == 0) {
win = dev_drv->win[0];
win0_display(lcdc_dev, win);
if(win->z_order == 0){
dev_drv->ops->ovl_mgr(dev_drv, 0, 1);
}else{
dev_drv->ops->ovl_mgr(dev_drv, 1, 1);
}
} else if (win_id == 1) {
win = dev_drv->win[1];
win1_display(lcdc_dev, win);
@@ -898,6 +754,7 @@ static int rk3188_lcdc_pan_display(struct rk_lcdc_driver *dev_drv, int win_id)
return -EINVAL;
}
/*this is the first frame of the system ,enable frame start interrupt */
if ((dev_drv->first_frame)) {
dev_drv->first_frame = 0;
@@ -924,9 +781,218 @@ static int rk3188_lcdc_pan_display(struct rk_lcdc_driver *dev_drv, int win_id)
return -ETIMEDOUT;
}
#endif
//printk("rk3188_lcdc_pan_display,win_num=%d\n",dev_drv->atv_layer_cnt);
rk3188_lcdc_reg_update(dev_drv);
return 0;
}
static int win0_set_par(struct lcdc_device *lcdc_dev,
struct rk_screen *screen, struct rk_lcdc_win *win)
{
u32 xact, yact, xvir, yvir, xpos, ypos;
u32 ScaleYrgbX = 0x1000;
u32 ScaleYrgbY = 0x1000;
u32 ScaleCbrX = 0x1000;
u32 ScaleCbrY = 0x1000;
u8 fmt_cfg = 0;
char fmt[9] = "NULL";
xact = win->area[0].xact;//win->xact;
yact = win->area[0].yact;
xvir = win->area[0].xvir;
yvir = win->area[0].yvir;
xpos = win->area[0].xpos + screen->mode.left_margin + screen->mode.hsync_len;
ypos = win->area[0].ypos + screen->mode.upper_margin + screen->mode.vsync_len;
ScaleYrgbX = CalScale(xact, win->area[0].xsize);
ScaleYrgbY = CalScale(yact, win->area[0].ysize);
switch (win->format) {
case ARGB888:
case XBGR888:
case ABGR888:
fmt_cfg = 0;
break;
case RGB888:
fmt_cfg = 1;
break;
case RGB565:
fmt_cfg = 2;
break;
case YUV422:
fmt_cfg = 5;
ScaleCbrX = CalScale((xact / 2), win->area[0].xsize);
ScaleCbrY = CalScale(yact, win->area[0].ysize);
break;
case YUV420:
fmt_cfg = 4;
ScaleCbrX = CalScale(xact / 2, win->area[0].xsize);
ScaleCbrY = CalScale(yact / 2, win->area[0].ysize);
break;
case YUV444:
fmt_cfg = 6;
ScaleCbrX = CalScale(xact, win->area[0].xsize);
ScaleCbrY = CalScale(yact, win->area[0].ysize);
break;
default:
dev_err(lcdc_dev->driver.dev, "%s:un supported format!\n",
__func__);
break;
}
DBG(1, "lcdc%d>>%s\n>>format:%s>>>xact:%d>>yact:%d>>xsize:%d>>ysize:%d\n"
">>xvir:%d>>yvir:%d>>xpos:%d>>ypos:%d>>\n", lcdc_dev->id,
__func__, get_format_string(win->format, fmt), xact,
yact, win->area[0].xsize, win->area[0].ysize, xvir, yvir, xpos, ypos);
spin_lock(&lcdc_dev->reg_lock);
if (likely(lcdc_dev->clk_on)) {
win->scale_yrgb_x = ScaleYrgbX;
win->scale_yrgb_y = ScaleYrgbY;
win->scale_cbcr_x = ScaleCbrX;
win->scale_cbcr_y = ScaleCbrY;
win->fmt_cfg = fmt_cfg;
win->area[0].dsp_stx = xpos;
win->area[0].dsp_sty = ypos;
switch (win->format) {
case XBGR888:
case ABGR888:
win->swap_rb = 1;
break;
case ARGB888:
win->swap_rb = 0;
break;
case RGB888:
win->swap_rb = 0;
break;
case RGB565:
win->swap_rb = 0;
break;
case YUV422:
case YUV420:
case YUV444:
win->swap_rb = 0;
break;
default:
dev_err(lcdc_dev->driver.dev,
"%s:un supported format!\n", __func__);
break;
}
}
spin_unlock(&lcdc_dev->reg_lock);
return 0;
}
static int win1_set_par(struct lcdc_device *lcdc_dev,
struct rk_screen *screen, struct rk_lcdc_win *win)
{
u32 xact, yact, xvir, yvir, xpos, ypos;
u8 fmt_cfg;
char fmt[9] = "NULL";
xact = win->area[0].xact;
yact = win->area[0].yact;
xvir = win->area[0].xvir;
yvir = win->area[0].yvir;
xpos = win->area[0].xpos + screen->mode.left_margin + screen->mode.hsync_len;
ypos = win->area[0].ypos + screen->mode.upper_margin + screen->mode.vsync_len;
DBG(1, "lcdc%d>>%s>>format:%s>>>xact:%d>>yact:%d>>xsize:%d>>ysize:%d\n"
">>xvir:%d>>yvir:%d>>xpos:%d>>ypos:%d>>\n", lcdc_dev->id,
__func__, get_format_string(win->format, fmt), xact, yact,
win->area[0].xsize, win->area[0].ysize, xvir, yvir, xpos, ypos);
spin_lock(&lcdc_dev->reg_lock);
if (likely(lcdc_dev->clk_on)) {
win->area[0].dsp_stx = xpos;
win->area[0].dsp_sty = ypos;
switch (win->format) {
case XBGR888:
case ABGR888:
fmt_cfg = 0;
win->swap_rb = 1;
break;
case ARGB888:
fmt_cfg = 0;
win->swap_rb = 0;
break;
case RGB888:
fmt_cfg = 1;
win->swap_rb = 0;
break;
case RGB565:
fmt_cfg = 2;
win->swap_rb = 0;
break;
default:
dev_err(lcdc_dev->driver.dev,
"%s:un supported format!\n", __func__);
break;
}
win->fmt_cfg = fmt_cfg;
}
spin_unlock(&lcdc_dev->reg_lock);
return 0;
}
static int rk3188_set_win_par(struct rk_lcdc_driver *dev_drv,
struct rk_screen *screen, struct rk_lcdc_win *win,int win_id)
{
struct lcdc_device *lcdc_dev =
container_of(dev_drv, struct lcdc_device, driver);
switch(win_id)
{
case 0:
win0_set_par(lcdc_dev, screen, win);
break;
case 1:
win1_set_par(lcdc_dev, screen, win);
break;
default:
dev_err(dev_drv->dev, "unsupported win number:%d\n", win_id);
break;
}
return 0;
}
static int rk3188_lcdc_set_par(struct rk_lcdc_driver *dev_drv,int win_id)
{
int i;
struct lcdc_device *lcdc_dev =
container_of(dev_drv, struct lcdc_device, driver);
struct rk_lcdc_win *win = NULL;
struct rk_screen *screen = dev_drv->cur_screen;
if (!screen) {
dev_err(dev_drv->dev, "screen is null!\n");
return -ENOENT;
}
for(i=0;i<dev_drv->lcdc_win_num;i++){
if(dev_drv->win[i]->state == 1){
win = dev_drv->win[i];
rk3188_set_win_par(dev_drv,screen,win,i);
rk3188_lcdc_win_display(dev_drv,win,i);
}
}
if(dev_drv->win[0]->z_order == 0){
dev_drv->ops->ovl_mgr(dev_drv, 0, 1);
}else{
dev_drv->ops->ovl_mgr(dev_drv, 1, 1);
}
rk3188_lcdc_reg_update(dev_drv);
return 0;
}
static int rk3188_lcdc_blank(struct rk_lcdc_driver *dev_drv,
int win_id, int blank_mode)
{
@@ -998,11 +1064,12 @@ static int rk3188_lcdc_early_suspend(struct rk_lcdc_driver *dev_drv)
struct lcdc_device *lcdc_dev =
container_of(dev_drv, struct lcdc_device, driver);
if (dev_drv->screen0->standby)
dev_drv->screen0->standby(1);
if (dev_drv->screen_ctr_info->io_disable)
dev_drv->screen_ctr_info->io_disable();
dev_drv->suspend_flag = 1;
flush_kthread_worker(&dev_drv->update_regs_worker);
spin_lock(&lcdc_dev->reg_lock);
if (likely(lcdc_dev->clk_on)) {
@@ -1028,6 +1095,7 @@ static int rk3188_lcdc_early_suspend(struct rk_lcdc_driver *dev_drv)
}
gpio_direction_output(gpio_dclk, GPIO_LOW);
#endif
return 0;
}
@@ -1043,8 +1111,10 @@ static int rk3188_lcdc_early_resume(struct rk_lcdc_driver *dev_drv)
gpio_free(gpio_dclk);
iomux_set(LCDC0_DCLK);
#endif
if (dev_drv->screen_ctr_info->io_enable)
dev_drv->screen_ctr_info->io_enable();
dev_drv->suspend_flag = 0;
if (lcdc_dev->atv_layer_cnt) {
rk3188_lcdc_clk_enable(lcdc_dev);
@@ -1410,6 +1480,18 @@ int rk3188_lcdc_poll_vblank(struct rk_lcdc_driver *dev_drv)
return ret;
}
static int rk3188_lcdc_get_dsp_addr(struct rk_lcdc_driver *dev_drv,unsigned int *dsp_addr)
{
struct lcdc_device *lcdc_dev =
container_of(dev_drv, struct lcdc_device, driver);
if(lcdc_dev->clk_on){
dsp_addr[0] = lcdc_readl(lcdc_dev, WIN0_YRGB_MST0);
dsp_addr[1] = lcdc_readl(lcdc_dev, WIN1_MST);
}
return 0;
}
static struct rk_lcdc_win lcdc_win[] = {
[0] = {
@@ -1445,6 +1527,7 @@ static struct rk_lcdc_drv_ops lcdc_drv_ops = {
.dpi_open = rk3188_lcdc_dpi_open,
.dpi_win_sel = rk3188_lcdc_dpi_win_sel,
.dpi_status = rk3188_lcdc_dpi_status,
.get_dsp_addr = rk3188_lcdc_get_dsp_addr,
};
static irqreturn_t rk3188_lcdc_isr(int irq, void *dev_id)
@@ -1458,7 +1541,8 @@ static irqreturn_t rk3188_lcdc_isr(int irq, void *dev_id)
timestamp = ktime_get();
lcdc_msk_reg(lcdc_dev, INT_STATUS, m_FS_INT_CLEAR,
v_FS_INT_CLEAR(1));
if (lcdc_dev->driver.wait_fs) {
//if (lcdc_dev->driver.wait_fs) {
if (0) {
spin_lock(&(lcdc_dev->driver.cpl_lock));
complete(&(lcdc_dev->driver.frame_done));
spin_unlock(&(lcdc_dev->driver.cpl_lock));
@@ -1552,7 +1636,7 @@ static int rk3188_lcdc_probe(struct platform_device *pdev)
dev_drv->prop = prop;
dev_drv->id = lcdc_dev->id;
dev_drv->ops = &lcdc_drv_ops;
dev_drv->num_win = ARRAY_SIZE(lcdc_win);
dev_drv->lcdc_win_num = ARRAY_SIZE(lcdc_win);
spin_lock_init(&lcdc_dev->reg_lock);
lcdc_dev->irq = platform_get_irq(pdev, 0);

844
drivers/video/rockchip/rk_fb.c
View File

File diff suppressed because it is too large Load Diff

82
drivers/video/rockchip/rkfb_sysfs.c Normal file → Executable file
View File

@@ -291,6 +291,85 @@ static ssize_t set_dsp_lut(struct device *dev, struct device_attribute *attr,
return count;
}
static ssize_t show_dsp_cabc(struct device *dev,
struct device_attribute *attr, char *buf)
{
return 0;
}
static ssize_t set_dsp_cabc(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
struct fb_info *fbi = dev_get_drvdata(dev);
struct rk_lcdc_driver *dev_drv =
(struct rk_lcdc_driver *)fbi->par;
int ret,mode=0;
ret = kstrtoint(buf, 0, &mode);
if (ret)
return ret;
ret = dev_drv->ops->set_dsp_cabc(dev_drv, mode);
if(ret < 0)
return ret;
return count;
}
static ssize_t show_hue(struct device *dev,
struct device_attribute *attr, char *buf)
{
return 0;
}
static ssize_t set_hue(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
struct fb_info *fbi = dev_get_drvdata(dev);
struct rk_lcdc_driver *dev_drv =
(struct rk_lcdc_driver *)fbi->par;
int ret,hue;
ret = kstrtoint(buf, 0, &hue);
if (ret)
return ret;
ret = dev_drv->ops->set_dsp_hue(dev_drv, hue);
if(ret < 0)
return ret;
return count;
}
static ssize_t show_dsp_bcs(struct device *dev,
struct device_attribute *attr, char *buf)
{
return 0;
}
static ssize_t set_dsp_bcs(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
struct fb_info *fbi = dev_get_drvdata(dev);
struct rk_lcdc_driver *dev_drv =
(struct rk_lcdc_driver *)fbi->par;
int ret,bri,con,sat;
ret = kstrtoint(buf, 0, &bri);
if (ret)
return ret;
ret = dev_drv->ops->set_dsp_bcsh_bcs(dev_drv, bri,con,sat);
if(ret < 0)
return ret;
return count;
}
static struct device_attribute rkfb_attrs[] = {
__ATTR(phys_addr, S_IRUGO, show_phys, NULL),
@@ -303,6 +382,9 @@ static struct device_attribute rkfb_attrs[] = {
__ATTR(fps, S_IRUGO | S_IWUSR, show_fps, set_fps),
__ATTR(map, S_IRUGO | S_IWUSR, show_fb_win_map, set_fb_win_map),
__ATTR(dsp_lut, S_IRUGO | S_IWUSR, show_dsp_lut, set_dsp_lut),
__ATTR(cabc, S_IRUGO | S_IWUSR, show_dsp_cabc, set_dsp_cabc),
__ATTR(hue, S_IRUGO | S_IWUSR, show_hue, set_hue),
__ATTR(bcs, S_IRUGO | S_IWUSR, show_dsp_bcs, set_dsp_bcs),
};
int rkfb_create_sysfs(struct fb_info *fbi)

199
include/linux/rk_fb.h
View File

@@ -25,10 +25,16 @@
#if defined(CONFIG_OF)
#include <dt-bindings/rkfb/rk_fb.h>
#endif
#include "../../drivers/staging/android/sw_sync.h"
#include <linux/file.h>
#include <linux/kthread.h>
#define RK30_MAX_LCDC_SUPPORT 4
#define RK30_MAX_LAYER_SUPPORT 4
#define RK_MAX_FB_SUPPORT 8
#define RK_MAX_FB_SUPPORT 4
#define RK_WIN_MAX_AREA 4
#define RK_MAX_BUF_NUM 10
#define FB0_IOCTL_STOP_TIMER_FLUSH 0x6001
#define FB0_IOCTL_SET_PANEL 0x6002
@@ -61,6 +67,9 @@
#define RK_FBIOSET_VSYNC_ENABLE 0x4629
#define RK_FBIOPUT_NUM_BUFFERS 0x4625
#define RK_FBIOPUT_COLOR_KEY_CFG 0x4626
#define RK_FBIOGET_DSP_ADDR 0x4630
#define RK_FBIOGET_LIST_STAT 0X4631
/**rk fb events**/
#define RK_LF_STATUS_FC 0xef
@@ -149,6 +158,7 @@ enum {
HAL_PIXEL_FORMAT_YCrCb_NV12 = 0x20, // YUY2
HAL_PIXEL_FORMAT_YCrCb_NV12_VIDEO = 0x21, // YUY2
HAL_PIXEL_FORMAT_YCrCb_444 = 0x22, //yuv444
HAL_PIXEL_FORMAT_H265 = 0x23, //yuv444
};
@@ -173,8 +183,17 @@ enum fb_win_map_order {
FB0_WIN0_FB1_WIN2_FB2_WIN1 = 120,
FB0_WIN0_FB1_WIN1_FB2_WIN2 = 210,
FB0_WIN1_FB1_WIN0_FB2_WIN2 = 201,
FB0_WIN0_FB1_WIN1_FB2_WIN2_FB3_WIN3 = 3210,
};
enum
{
SCALE_NONE = 0x0,
SCALE_UP = 0x1,
SCALE_DOWN = 0x2
};
struct rk_fb_rgb {
struct fb_bitfield red;
struct fb_bitfield green;
@@ -224,11 +243,15 @@ typedef enum _TRSP_MODE {
TRSP_INVAL
} TRSP_MODE;
struct rk_lcdc_win {
char name[5];
int id;
bool state; /*on or off*/
u32 pseudo_pal[16];
struct rk_lcdc_post_cfg{
u32 xpos;
u32 ypos;
u32 xsize;
u32 ysize;
};
struct rk_lcdc_area{
bool state;
u32 y_offset; /*yuv/rgb offset -->LCDC_WINx_YRGB_MSTx*/
u32 c_offset; /*cb cr offset--->LCDC_WINx_CBR_MSTx*/
u32 xpos; /*start point in panel --->LCDC_WINx_DSP_ST*/
@@ -241,28 +264,68 @@ struct rk_lcdc_win {
u16 yvir;
unsigned long smem_start;
unsigned long cbr_start; /*Cbr memory start address*/
enum data_format format;
#if defined(CONFIG_ION_ROCKCHIP)
struct ion_handle *ion_hdl;
int dma_buf_fd;
struct ion_handle *ion_hdl;
int dma_buf_fd;
#endif
bool support_3d;
u32 dsp_stx;
u32 dsp_sty;
u32 y_vir_stride;
u32 uv_vir_stride;
u32 y_addr;
u32 uv_addr;
};
struct rk_lcdc_win {
char name[5];
int id;
bool state; /*on or off*/
u32 pseudo_pal[16];
enum data_format format;
u8 z_order; /*win sel layer*/
u8 fmt_cfg;
u8 fmt_10;;
u8 swap_rb;
u32 reserved;
u32 area_num;
u32 scale_yrgb_x;
u32 scale_yrgb_y;
u32 scale_cbcr_x;
u32 scale_cbcr_y;
u32 dsp_stx;
u32 dsp_sty;
u32 vir_stride;
u32 y_addr;
u32 uv_addr;
u8 fmt_cfg;
u8 swap_rb;
u32 reserved;
bool support_3d;
u8 win_lb_mode;
u8 bic_coe_el;
u8 yrgb_hor_scl_mode;//h 01:scale up ;10:down
u8 yrgb_ver_scl_mode;//v 01:scale up ;10:down
u8 yrgb_hsd_mode;//h scale down mode
u8 yrgb_vsu_mode;//v scale up mode
u8 yrgb_vsd_mode;//v scale down mode
u8 cbr_hor_scl_mode;
u8 cbr_ver_scl_mode;
u8 cbr_hsd_mode;
u8 cbr_vsu_mode;
u8 cbr_vsd_mode;
u8 vsd_yrgb_gt4;
u8 vsd_yrgb_gt2;
u8 vsd_cbr_gt4;
u8 vsd_cbr_gt2;
u8 alpha_en;
u32 alpha_mode;
u32 g_alpha_val;
u32 color_key_val;
struct rk_lcdc_area area[RK_WIN_MAX_AREA];
struct rk_lcdc_post_cfg post_cfg;
};
struct rk_lcdc_driver;
struct rk_lcdc_drv_ops {
int (*open) (struct rk_lcdc_driver * dev_drv, int layer_id, bool open);
int (*init_lcdc) (struct rk_lcdc_driver * dev_drv);
@@ -292,7 +355,90 @@ struct rk_lcdc_drv_ops {
int (*dpi_open) (struct rk_lcdc_driver * dev_drv, bool open);
int (*dpi_win_sel) (struct rk_lcdc_driver * dev_drv, int layer_id);
int (*dpi_status) (struct rk_lcdc_driver * dev_drv);
int (*get_dsp_addr)(struct rk_lcdc_driver * dev_drv,unsigned int *dsp_addr);
int (*set_dsp_cabc) (struct rk_lcdc_driver * dev_drv, int mode);
int (*set_dsp_hue) (struct rk_lcdc_driver *dev_drv,int hue);
int (*set_dsp_bcsh_bcs)(struct rk_lcdc_driver *dev_drv,int bri,int con,int sat);
};
struct rk_fb_area_par {
u16 ion_fd;
unsigned long phy_addr;
u16 acq_fence_fd;
u32 x_offset;
u32 y_offset;
u32 xpos; /*start point in panel --->LCDC_WINx_DSP_ST*/
u32 ypos;
u32 xsize; /* display window width/height -->LCDC_WINx_DSP_INFO*/
u32 ysize;
u32 xact; /*origin display window size -->LCDC_WINx_ACT_INFO*/
u32 yact;
u32 xvir; /*virtual width/height -->LCDC_WINx_VIR*/
u32 yvir;
};
struct rk_fb_win_par {
u8 data_format; /*layer data fmt*/
u8 win_id;
u8 z_order; /*win sel layer*/
struct rk_fb_area_par area_par[RK_WIN_MAX_AREA];
u32 alpha_mode;
u32 g_alpha_val;
};
struct rk_fb_win_cfg_data {
u16 ret_fence_fd;
u16 rel_fence_fd[RK_MAX_BUF_NUM];
struct rk_fb_win_par win_par[RK30_MAX_LAYER_SUPPORT];
struct rk_lcdc_post_cfg post_cfg;
u8 wait_fs;
//u8 fence_begin;
};
struct rk_fb_reg_area_data {
struct sync_fence *acq_fence;
u8 index_buf; /*judge if the buffer is index*/
u32 y_offset; /*yuv/rgb offset -->LCDC_WINx_YRGB_MSTx*/
u32 c_offset; /*cb cr offset--->LCDC_WINx_CBR_MSTx*/
u32 y_vir_stride;
u32 uv_vir_stride;
u32 xpos; /*start point in panel --->LCDC_WINx_DSP_ST*/
u32 ypos;
u16 xsize; /* display window width/height -->LCDC_WINx_DSP_INFO*/
u16 ysize;
u16 xact; /*origin display window size -->LCDC_WINx_ACT_INFO*/
u16 yact;
u16 xvir; /*virtual width/height -->LCDC_WINx_VIR*/
u16 yvir;
unsigned long smem_start;
unsigned long cbr_start; /*Cbr memory start address*/
u32 line_length;
};
struct rk_fb_reg_win_data {
u8 data_format; /*layer data fmt*/
u8 win_id;
u8 z_order; /*win sel layer*/
u32 area_num; /*maybe two region have the same dma buff,*/
u32 area_buf_num; /*so area_num maybe not equal to area_buf_num*/
u8 alpha_en;
u32 alpha_mode;
u32 g_alpha_val;
u32 color_key_val;
struct rk_fb_reg_area_data reg_area_data[RK_WIN_MAX_AREA];
};
struct rk_fb_reg_data {
struct list_head list;
int win_num;
int buf_num;
int acq_num;
struct rk_fb_reg_win_data reg_win_data[RK30_MAX_LAYER_SUPPORT];
struct rk_lcdc_post_cfg post_cfg;
//struct sync_fence *acq_fence[RK_MAX_BUF_NUM];
//int fence_wait_begin;
};
struct rk_lcdc_driver {
@@ -302,8 +448,9 @@ struct rk_lcdc_driver {
struct device *dev;
struct rk_lcdc_win *win[RK_MAX_FB_SUPPORT];
int num_win;
int lcdc_win_num;
int num_buf; //the num_of buffer
int atv_layer_cnt;
int fb_index_base; //the first fb index of the lcdc device
struct rk_screen *screen0; //some platform have only one lcdc,but extend
struct rk_screen *screen1; //two display devices for dual display,such as rk2918,rk2928
@@ -313,6 +460,7 @@ struct rk_lcdc_driver {
char fb0_win_id;
char fb1_win_id;
char fb2_win_id;
char fb3_win_id;
struct mutex fb_win_id_mutex;
struct completion frame_done; //sync for pan_display,whe we set a new frame address to lcdc register,we must make sure the frame begain to display
@@ -320,7 +468,16 @@ struct rk_lcdc_driver {
int first_frame;
struct rk_fb_vsync vsync_info;
int wait_fs; //wait for new frame start in kernel
struct sw_sync_timeline *timeline;
int timeline_max;
int suspend_flag;
struct list_head update_regs_list;
struct mutex update_regs_list_lock;
struct kthread_worker update_regs_worker;
struct task_struct *update_regs_thread;
struct kthread_work update_regs_work;
struct mutex output_lock;
struct rk29fb_info *screen_ctr_info;
struct list_head pwrlist_head;
struct rk_lcdc_drv_ops *ops;
@@ -338,7 +495,7 @@ struct rk_lcdc_driver {
struct rk_fb {
int disp_mode;
struct rk29fb_info *mach_info;
struct fb_info *fb[RK_MAX_FB_SUPPORT];
struct fb_info *fb[RK_MAX_FB_SUPPORT*2];
int num_fb;
struct rk_lcdc_driver *lcdc_dev_drv[RK30_MAX_LCDC_SUPPORT];
@@ -378,6 +535,8 @@ extern int rkfb_create_sysfs(struct fb_info *fbi);
extern char *get_format_string(enum data_format, char *fmt);
extern int support_uboot_display(void);
extern int rk_fb_calc_fps(struct rk_screen * screen, u32 pixclock);
extern void rk_fd_fence_wait(struct rk_lcdc_driver *dev_drv, struct sync_fence *fence);
extern void rk_fb_free_dma_buf(struct rk_fb_reg_win_data *reg_win_data);
#if defined(CONFIG_BACKLIGHT_RK29_BL)
void rk29_backlight_set(bool on);

6
include/linux/rk_screen.h
View File

@@ -61,6 +61,12 @@ struct rk_screen {
u8 lcdc_id;
u8 screen_id;
struct fb_videomode mode;
u32 post_dsp_stx;
u32 post_dsp_sty;
u32 post_xsize;
u32 post_ysize;
u16 x_mirror;
u16 y_mirror;
u16 width;
u16 height;
u8 ft;