From: yxj <yxj@I7-CH.(none)>
Date: Tue, 6 Mar 2012 07:19:56 +0000 (+0800)
Subject: rk30 fb:add comment to some key variable
X-Git-Tag: firefly_0821_release~9595^2~88
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c7594496dadc1fb817523c849df61655ab6c9f5d;p=firefly-linux-kernel-4.4.55.git
rk30 fb:add comment to some key variable
---
diff --git a/drivers/video/rockchip/chips/rk30_lcdc.c b/drivers/video/rockchip/chips/rk30_lcdc.c
index e49d972cba06..7dc160d327f0 100644
--- a/drivers/video/rockchip/chips/rk30_lcdc.c
+++ b/drivers/video/rockchip/chips/rk30_lcdc.c
@@ -280,8 +280,8 @@ static int win0_set_par(struct rk30_lcdc_device *lcdc_dev,rk_screen *screen,
xact = par->xact; /*active (origin) picture window width/height */
yact = par->yact;
- xvir = par->xres_virtual; /* virtual resolution */
- yvir = par->yres_virtual;
+ xvir = par->xvir; /* virtual resolution */
+ yvir = par->yvir;
xpos = par->xpos+screen->left_margin + screen->hsync_len;
ypos = par->ypos+screen->upper_margin + screen->vsync_len;
y_addr = par->smem_start + par->y_offset;
@@ -355,8 +355,8 @@ static int win1_set_par(struct rk30_lcdc_device *lcdc_dev,rk_screen *screen,
u32 y_addr,uv_addr;
xact = par->xact; /* visible resolution */
yact = par->yact;
- xvir = par->xres_virtual; /* virtual resolution */
- yvir = par->yres_virtual;
+ xvir = par->xvir; /* virtual resolution */
+ yvir = par->yvir;
xpos = par->xpos+screen->left_margin + screen->hsync_len;
ypos = par->ypos+screen->upper_margin + screen->vsync_len;
y_addr = par->smem_start + par->y_offset;
diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index ff0aa8b16b69..5ed08e3ba77f 100644
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -273,15 +273,13 @@ static int rk_fb_set_par(struct fb_info *info)
int layer_id = 0;
u32 smem_len=0,map_size = 0;
u32 cblen = 0,crlen = 0;
- u32 xvir = var->xres_virtual; /* virtual resolution */
- u32 yvir = var->yres_virtual;
- u32 xoffset = var->xoffset; /* offset from virtual to visible */
- u32 yoffset = var->yoffset; /* resolution */
-
-
- u16 xpos = (var->nonstd>>8) & 0xfff; //visiable pos in panel
+ u16 xsize =0,ysize = 0; //winx display window height/width --->LCDC_WINx_DSP_INFO
+ u32 xoffset = var->xoffset; // offset from virtual to visible
+ u32 yoffset = var->yoffset; //resolution
+ u16 xpos = (var->nonstd>>8) & 0xfff; //visiable pos in panel
u16 ypos = (var->nonstd>>20) & 0xfff;
- u16 xsize =0,ysize = 0;
+ u32 xvir = var->xres_virtual;
+ u32 yvir = var->yres_virtual;
u8 data_format = var->nonstd&0x0f;
if(!strcmp(fix->id,"fb1")){
@@ -378,10 +376,10 @@ static int rk_fb_set_par(struct fb_info *info)
par->smem_start =fix->smem_start;
par->cbr_start = fix->mmio_start;
- par->xact = var->xres;
+ par->xact = var->xres; //winx active window height,is a part of vir
par->yact = var->yres;
- par->xres_virtual = xvir; // virtuail resolution
- par->yres_virtual = yvir;
+ par->xvir = var->xres_virtual; // virtual resolution stride --->LCDC_WINx_VIR
+ par->yvir = var->yres_virtual;
dev_drv->set_par(dev_drv,layer_id);
return 0;
diff --git a/drivers/video/rockchip/rk_fb.h b/drivers/video/rockchip/rk_fb.h
index 8906b8d87c8e..664cf6b1e478 100644
--- a/drivers/video/rockchip/rk_fb.h
+++ b/drivers/video/rockchip/rk_fb.h
@@ -90,16 +90,16 @@ struct layer_par {
const char *name;
int id;
u32 pseudo_pal[16];
- u32 y_offset; //yuv/rgb offset
- u32 c_offset; //cb cr offset
- u32 xpos; //start point in panel
+ 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
u32 ypos;
- u16 xsize; // display window width
- u16 ysize; //
- u16 xact; //origin display window size
+ 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 xres_virtual;
- u16 yres_virtual;
+ u16 xvir; //virtual width/height -->LCDC_WINx_VIR
+ u16 yvir;
unsigned long smem_start;
unsigned long cbr_start; // Cbr memory start address
enum data_format format;