From bdee11ddee9f8c6a3f5b18cb684ce32819b22b89 Mon Sep 17 00:00:00 2001 From: yxj Date: Sat, 1 Dec 2012 15:12:43 +0800 Subject: [PATCH] Revert "only plug in hdmi use screen scale" This reverts commit f99dcc839ea2f34b2c038441d8ae6dab319e5026. --- drivers/video/rockchip/hdmi/rk_hdmi_sysfs.c | 3 --- drivers/video/rockchip/rk_fb.c | 14 +++++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/video/rockchip/hdmi/rk_hdmi_sysfs.c b/drivers/video/rockchip/hdmi/rk_hdmi_sysfs.c index ca0a1cb290cb..ed0d2e09762c 100755 --- a/drivers/video/rockchip/hdmi/rk_hdmi_sysfs.c +++ b/drivers/video/rockchip/hdmi/rk_hdmi_sysfs.c @@ -110,9 +110,6 @@ static int hdmi_set_scale(struct rk_display_device *device, int direction, int v if(!hdmi || value < 0 || value > 100) return -1; - - if(!hdmi->hotplug) - return 0; if(direction == DISPLAY_SCALE_X) hdmi->xscale = value; diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c index ddf628113c0b..3014df056770 100644 --- a/drivers/video/rockchip/rk_fb.c +++ b/drivers/video/rockchip/rk_fb.c @@ -875,14 +875,26 @@ int rk_fb_disp_scale(u8 scale_x, u8 scale_y,u8 lcdc_id) screen_x = dev_drv->cur_screen->x_res; screen_y = dev_drv->cur_screen->y_res; +#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)||defined(CONFIG_NO_DUAL_DISP) if(dev_drv->cur_screen->screen_id == 1){ dev_drv->cur_screen->xpos = (screen_x-screen_x*scale_x/100)>>1; dev_drv->cur_screen->ypos = (screen_y-screen_y*scale_y/100)>>1; dev_drv->cur_screen->xsize = screen_x*scale_x/100; dev_drv->cur_screen->ysize = screen_y*scale_y/100; - info->fbops->fb_set_par(info); + }else +#endif + { + xpos = (screen_x-screen_x*scale_x/100)>>1; + ypos = (screen_y-screen_y*scale_y/100)>>1; + xsize = screen_x*scale_x/100; + ysize = screen_y*scale_y/100; + var->nonstd &= 0xff; + var->nonstd |= (xpos<<8) + (ypos<<20); + var->grayscale &= 0xff; + var->grayscale |= (xsize<<8) + (ysize<<20); } + info->fbops->fb_set_par(info); return 0; -- 2.34.1