rkfb sys: modify show_screen_info as cur_screen

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index bfc6aec5bb9cb8074ce386592051e79cb883162c..eea56c3ddc9d528b7bd3832adbae4a3b40cf12d2 100755 (executable)
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -3325,7 +3325,7 @@ int rk_fb_disp_scale(u8 scale_x, u8 scale_y, u8 lcdc_id)
        screen_x = dev_drv->cur_screen->mode.xres;
        screen_y = dev_drv->cur_screen->mode.yres;
 
-       if (inf->disp_mode != DUAL) {
+       if (inf->disp_mode != DUAL && dev_drv->screen1) {
                dev_drv->cur_screen->xpos =
                    (screen_x - screen_x * scale_x / 100) >> 1;
                dev_drv->cur_screen->ypos =

diff --git a/drivers/video/rockchip/rkfb_sysfs.c b/drivers/video/rockchip/rkfb_sysfs.c
index 9065168330bee470a8f7d12bfc89a3941542b9d1..b69e388027d4f43d3f38423326f92f69e74a7f41 100755 (executable)
--- a/drivers/video/rockchip/rkfb_sysfs.c
+++ b/drivers/video/rockchip/rkfb_sysfs.c
@@ -38,7 +38,7 @@ static ssize_t show_screen_info(struct device *dev,
 {
        struct fb_info *fbi = dev_get_drvdata(dev);
        struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)fbi->par;
-       struct rk_screen *screen = dev_drv->screen0;
+       struct rk_screen *screen = dev_drv->cur_screen;
        int fps;
        u32 x = screen->mode.left_margin + screen->mode.right_margin +
                screen->mode.xres + screen->mode.hsync_len;