From 0054fcd15a405ea72ec1e133b88e1da1183a4908 Mon Sep 17 00:00:00 2001 From: yzq Date: Fri, 28 Mar 2014 09:11:11 +0800 Subject: [PATCH] rk3288 chromium: update config,fix drm hwc lvds --- arch/arm/configs/rockchip_chromium_defconfig | 7 +++++-- drivers/gpu/drm/rockchip/rk3288_drm_fimd.c | 12 ++++++------ drivers/video/rockchip/transmitter/Kconfig | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/arm/configs/rockchip_chromium_defconfig b/arch/arm/configs/rockchip_chromium_defconfig index 7e4484d6bf99..3c1f8a8ce260 100644 --- a/arch/arm/configs/rockchip_chromium_defconfig +++ b/arch/arm/configs/rockchip_chromium_defconfig @@ -297,7 +297,8 @@ CONFIG_INPUT_GPIO=y # CONFIG_SENSOR_DEVICE is not set # CONFIG_SERIO is not set # CONFIG_LEGACY_PTYS is not set -# CONFIG_DEVMEM is not set +CONFIG_DEVMEM=y +CONFIG_DEVKMEM=y CONFIG_SERIAL_ROCKCHIP=y # CONFIG_HW_RANDOM is not set CONFIG_I2C_CHARDEV=y @@ -344,6 +345,9 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_PWM=y +CONFIG_LCD_GENERAL=y +CONFIG_RK_TRSM=y +CONFIG_RK32_LVDS=y CONFIG_ROCKCHIP_RGA2=y CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set @@ -358,7 +362,6 @@ CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_USB_AUDIO=y CONFIG_SND_SOC=y CONFIG_SND_RK_SOC=y -CONFIG_SND_RK_SOC_RT3224=y CONFIG_HID_BATTERY_STRENGTH=y CONFIG_HIDRAW=y CONFIG_UHID=y diff --git a/drivers/gpu/drm/rockchip/rk3288_drm_fimd.c b/drivers/gpu/drm/rockchip/rk3288_drm_fimd.c index 25eb742b891c..2028371aa4ca 100644 --- a/drivers/gpu/drm/rockchip/rk3288_drm_fimd.c +++ b/drivers/gpu/drm/rockchip/rk3288_drm_fimd.c @@ -455,20 +455,20 @@ static int rk3288_win_0_1_reg_update(struct fimd_context *ctx,int win_id) val = v_WIN0_EN(1) | v_WIN0_DATA_FMT(fmt_cfg); lcdc_msk_reg(ctx, WIN0_CTRL0+off, mask,val); - val = v_WIN0_VIR_STRIDE(win_data->line_size/(win_data->bpp>>3)); + val = v_WIN0_VIR_STRIDE(win_data->fb_width); lcdc_writel(ctx, WIN0_VIR+off, val); - val = v_WIN0_ACT_WIDTH(win_data->ovl_width) | - v_WIN0_ACT_HEIGHT(win_data->ovl_height); + val = v_WIN0_ACT_WIDTH(win_data->fb_width) | + v_WIN0_ACT_HEIGHT(win_data->fb_height); lcdc_writel(ctx, WIN0_ACT_INFO+off, val); - val = v_WIN0_DSP_WIDTH(win_data->fb_width) | - v_WIN0_DSP_HEIGHT(win_data->fb_height); + val = v_WIN0_DSP_WIDTH(win_data->ovl_width) | + v_WIN0_DSP_HEIGHT(win_data->ovl_height); lcdc_writel(ctx, WIN0_DSP_INFO+off, val); val = v_WIN0_DSP_XST(xpos) | v_WIN0_DSP_YST(ypos); lcdc_writel(ctx, WIN0_DSP_ST+off, val); - lcdc_writel(ctx, WIN0_YRGB_MST+off, win_data->dma_addr +win_data->buf_offsize ); + lcdc_writel(ctx, WIN0_YRGB_MST+off, win_data->dma_addr ); if(win_id == 1) rk3288_lcdc_alpha_cfg(ctx,win_id); diff --git a/drivers/video/rockchip/transmitter/Kconfig b/drivers/video/rockchip/transmitter/Kconfig index edf8e3c6e5bc..10f6d14422ea 100644 --- a/drivers/video/rockchip/transmitter/Kconfig +++ b/drivers/video/rockchip/transmitter/Kconfig @@ -1,7 +1,7 @@ menuconfig RK_TRSM bool "RockChip display transmitter support" - depends on FB_ROCKCHIP + depends on FB_ROCKCHIP || DRM_ROCKCHIP config RK2928_LVDS bool "RK2928/RK2926 lvds transmitter support" -- 2.34.1