From f3aed3056ad057ec87abaf8ed6bf5621fe034f61 Mon Sep 17 00:00:00 2001 From: zwl Date: Tue, 27 May 2014 17:03:50 +0800 Subject: [PATCH] rk32 lcdc and hdmi: add report rk system status --- drivers/video/rockchip/hdmi/rk_hdmi_task.c | 4 ++++ drivers/video/rockchip/lcdc/rk3288_lcdc.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/drivers/video/rockchip/hdmi/rk_hdmi_task.c b/drivers/video/rockchip/hdmi/rk_hdmi_task.c index fecf87d25456..7434d56258ca 100755 --- a/drivers/video/rockchip/hdmi/rk_hdmi_task.c +++ b/drivers/video/rockchip/hdmi/rk_hdmi_task.c @@ -1,6 +1,8 @@ #include #include #include +#include +#include #include "rk_hdmi.h" #define HDMI_MAX_TRY_TIMES 1 @@ -90,6 +92,7 @@ void hdmi_sys_remove(struct hdmi *hdmi) if(audio_need) switch_set_state(&(hdmi->switch_hdmi), 0); #endif + rockchip_clear_system_status(SYS_STATUS_HDMI); } static void hdmi_sys_sleep(struct hdmi *hdmi) @@ -233,6 +236,7 @@ void hdmi_work(struct work_struct *work) if(hdmi->edid.base_audio_support == 1 && hdmi->edid.sink_hdmi == 1) switch_set_state(&(hdmi->switch_hdmi), 1); #endif + rockchip_set_system_status(SYS_STATUS_HDMI); } break; case SYSTEM_CONFIG: diff --git a/drivers/video/rockchip/lcdc/rk3288_lcdc.c b/drivers/video/rockchip/lcdc/rk3288_lcdc.c index dd72111ecfc3..7fbd4c72305e 100755 --- a/drivers/video/rockchip/lcdc/rk3288_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk3288_lcdc.c @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include "rk3288_lcdc.h" @@ -1288,9 +1290,12 @@ static int rk3288_lcdc_open(struct rk_lcdc_driver *dev_drv, int win_id, { struct lcdc_device *lcdc_dev = container_of(dev_drv, struct lcdc_device, driver); + int sys_status = (dev_drv->id == 0) ? + SYS_STATUS_LCDC0 : SYS_STATUS_LCDC1; /*enable clk,when first layer open */ if ((open) && (!lcdc_dev->atv_layer_cnt)) { + rockchip_set_system_status(sys_status); rk3288_lcdc_pre_init(dev_drv); rk3288_lcdc_clk_enable(lcdc_dev); rk3288_lcdc_reg_restore(lcdc_dev); @@ -1324,6 +1329,7 @@ static int rk3288_lcdc_open(struct rk_lcdc_driver *dev_drv, int win_id, rk3288_lcdc_disable_irq(lcdc_dev); rk3288_lcdc_reg_update(dev_drv); rk3288_lcdc_clk_disable(lcdc_dev); + rockchip_clear_system_status(sys_status); } return 0; -- 2.34.1