From 20fbcf2a42febf051491775796335e80697e2725 Mon Sep 17 00:00:00 2001 From: hjc Date: Thu, 25 Dec 2014 11:28:56 +0800 Subject: [PATCH] rk3368 lcdc: fbdc test ok use auto test case Signed-off-by: hjc --- drivers/video/rockchip/lcdc/rk3368_lcdc.c | 3 ++- drivers/video/rockchip/lcdc/rk3368_lcdc.h | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/video/rockchip/lcdc/rk3368_lcdc.c b/drivers/video/rockchip/lcdc/rk3368_lcdc.c index 4c48f115c0c9..5fe31f42dd63 100644 --- a/drivers/video/rockchip/lcdc/rk3368_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk3368_lcdc.c @@ -322,7 +322,7 @@ static void lcdc_read_reg_defalut_cfg(struct lcdc_device *lcdc_dev) struct rk_lcdc_win *win0 = lcdc_dev->driver.win[0]; spin_lock(&lcdc_dev->reg_lock); - for (reg = 0; reg < FRC_LOWER11_1; reg += 4) { + for (reg = 0; reg < SCAN_LINE_NUM; reg += 4) { val = lcdc_readl_backup(lcdc_dev, reg); switch (reg) { case WIN0_ACT_INFO: @@ -896,6 +896,7 @@ static int rk3368_init_fbdc_config(struct rk_lcdc_driver *dev_drv, int win_id) break; case VOP_FORMAT_RGB565: mb_w_size = 32; + fbdc_dsp_width_ratio = 1; break; default: dev_err(lcdc_dev->dev, diff --git a/drivers/video/rockchip/lcdc/rk3368_lcdc.h b/drivers/video/rockchip/lcdc/rk3368_lcdc.h index 2a8ab27b8de4..a916e979ae2e 100644 --- a/drivers/video/rockchip/lcdc/rk3368_lcdc.h +++ b/drivers/video/rockchip/lcdc/rk3368_lcdc.h @@ -1881,6 +1881,10 @@ static inline int lcdc_grf_writel(struct regmap *base, #define CUBIC_CATROM 2 #define CUBIC_MITCHELL 3 +#define FBDC_FMT_RGB565 0x5 +#define FBDC_FMT_U8U8U8U8 0xc /*ARGB888*/ +#define FBDC_FMT_U8U8U8 0x3a /*RGBP888*/ + #define CUBIC_MODE_SELETION CUBIC_PRECISE /*************************************************************/ -- 2.34.1