projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rk fb: if lcdc is suspend ignore set par and display
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
video
/
rockchip
/
rk_fb.c
diff --git
a/drivers/video/rockchip/rk_fb.c
b/drivers/video/rockchip/rk_fb.c
index 89916610733a72c1ad9244008040f720b6223b4f..16fcca69cc091f49e9eecc7249a770f429164b24 100755
(executable)
--- a/
drivers/video/rockchip/rk_fb.c
+++ b/
drivers/video/rockchip/rk_fb.c
@@
-1273,6
+1273,8
@@
static int rk_fb_pan_display(struct fb_var_screeninfo *var,
u16 uv_x_off, uv_y_off, uv_y_act;
u8 is_pic_yuv = 0;
u16 uv_x_off, uv_y_off, uv_y_act;
u8 is_pic_yuv = 0;
+ if (dev_drv->suspend_flag)
+ return 0;
win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
if (win_id < 0)
return -ENODEV;
win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
if (win_id < 0)
return -ENODEV;
@@
-2864,6
+2866,8
@@
static int rk_fb_set_par(struct fb_info *info)
u16 uv_x_off, uv_y_off, uv_y_act;
u8 is_pic_yuv = 0;
/*var->pixclock = dev_drv->pixclock;*/
u16 uv_x_off, uv_y_off, uv_y_act;
u8 is_pic_yuv = 0;
/*var->pixclock = dev_drv->pixclock;*/
+ if (dev_drv->suspend_flag)
+ return 0;
win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
if (win_id < 0)
return -ENODEV;
win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
if (win_id < 0)
return -ENODEV;