projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b731a9a
)
rk_fb: one lcdc dual screen mode,if plug hdmi,not blank lcdc.
author
yzq
<yzq@rock-chips.com>
Wed, 17 Oct 2012 08:59:45 +0000
(16:59 +0800)
committer
yzq
<yzq@rock-chips.com>
Wed, 17 Oct 2012 08:59:45 +0000
(16:59 +0800)
drivers/video/rockchip/rk_fb.c
patch
|
blob
|
history
diff --git
a/drivers/video/rockchip/rk_fb.c
b/drivers/video/rockchip/rk_fb.c
index 5bfe1540011c17155defc8787da1dc8f124832da..0a2507c2f61833c8e6adc24ba8c6813a727d10d8 100644
(file)
--- a/
drivers/video/rockchip/rk_fb.c
+++ b/
drivers/video/rockchip/rk_fb.c
@@
-304,10
+304,17
@@
static int rk_fb_blank(int blank_mode, struct fb_info *info)
{
return -ENODEV;
}
-
- dev_drv->blank(dev_drv,layer_id,blank_mode);
-
- return 0;
+#if defined(CONFIG_RK_HDMI)
+#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)
+ if(hdmi_get_hotplug() == HDMI_HPD_ACTIVED){
+ printk("hdmi is connect , not blank lcdc\n");
+ }else
+#endif
+#endif
+ {
+ dev_drv->blank(dev_drv,layer_id,blank_mode);
+ }
+ return 0;
}
static int rk_fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)