From 03cce87b5e3a0ed014c7e80c4d2e026c1587bf1c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=99=88=E8=BE=89?= Date: Tue, 24 Jul 2012 16:38:06 +0800 Subject: [PATCH] Revert "rkfb: hdmi and screen share the same buffer in three buffer mode" This reverts commit dd6104654141aff3aa5870344cf9238c8fd13220. --- drivers/video/rockchip/rk_fb.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c index 5ed678bf8c5e..f3b03c20bc72 100644 --- a/drivers/video/rockchip/rk_fb.c +++ b/drivers/video/rockchip/rk_fb.c @@ -227,9 +227,7 @@ static int rk_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) par2->y_offset = par->y_offset; //memcpy(info2->screen_base+par2->y_offset,info->screen_base+par->y_offset, // var->xres*var->yres*var->bits_per_pixel>>3); - #if !defined(CONFIG_THREE_FB_BUFFER) fb_copy_by_ipp(info2,info,par->y_offset); - #endif dev_drv1->pan_display(dev_drv1,layer_id); //queue_delayed_work(inf->workqueue, &inf->delay_work,0); } @@ -756,7 +754,6 @@ static int rk_request_fb_buffer(struct fb_info *fbi,int fb_id) struct resource *res; struct resource *mem; int ret = 0; - struct rk_fb_inf *fb_inf = platform_get_drvdata(g_fb_pdev); switch(fb_id) { case 0: @@ -785,7 +782,6 @@ static int rk_request_fb_buffer(struct fb_info *fbi,int fb_id) #endif break; case 2: - #if !defined(CONFIG_THREE_FB_BUFFER) res = platform_get_resource_byname(g_fb_pdev, IORESOURCE_MEM, "fb2 buf"); if (res == NULL) { @@ -797,11 +793,6 @@ static int rk_request_fb_buffer(struct fb_info *fbi,int fb_id) mem = request_mem_region(res->start, resource_size(res), g_fb_pdev->name); fbi->screen_base = ioremap(res->start, fbi->fix.smem_len); memset(fbi->screen_base, 0, fbi->fix.smem_len); - #else //three buffer no need to copy - fbi->fix.smem_start = fb_inf->fb[0]->fix.smem_start; - fbi->fix.smem_len = fb_inf->fb[0]->fix.smem_len; - fbi->screen_base = fb_inf->fb[0]->screen_base; - #endif printk("fb%d:phy:%lx>>vir:%p>>len:0x%x\n",fb_id, fbi->fix.smem_start,fbi->screen_base,fbi->fix.smem_len); break; -- 2.34.1