shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 20:32:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

HDMI: calling rk_fb_switch_screen() to close vop related to HDMI

Browse Source 
before calling switch_set_state() when HDMI is removed.
      For android hwcompser need to make sure vop is disabled when
      received hdmi removing event.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
This commit is contained in:
Zheng Yang
2015-04-11 17:14:07 +08:00
parent c04cdecff9
commit 33be0d0365
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/video/rockchip/hdmi/rockchip-hdmi-core.c
View File

@@ -238,6 +238,10 @@ static void hdmi_wq_remove(struct hdmi *hdmi)
DBG("%s", __func__);
if (hdmi->ops->remove)
hdmi->ops->remove(hdmi);
if (hdmi->hotplug == HDMI_HPD_ACTIVED) {
screen.type = SCREEN_HDMI;
rk_fb_switch_screen(&screen, 0, hdmi->lcdc->id);
}
#ifdef CONFIG_SWITCH
switch_set_state(&(hdmi->switchdev), 0);
#endif
@@ -245,9 +249,7 @@ static void hdmi_wq_remove(struct hdmi *hdmi)
list_del(pos);
kfree(pos);
}
kfree(hdmi->edid.audio);
if (hdmi->edid.specs) {
kfree(hdmi->edid.specs->modedb);
kfree(hdmi->edid.specs);
@@ -257,10 +259,6 @@ static void hdmi_wq_remove(struct hdmi *hdmi)
hdmi->mute = HDMI_AV_UNMUTE;
hdmi->mode_3d = HDMI_3D_NONE;
hdmi->uboot = 0;
if (hdmi->hotplug == HDMI_HPD_ACTIVED) {
screen.type = SCREEN_HDMI;
rk_fb_switch_screen(&screen, 0, hdmi->lcdc->id);
}
hdmi->hotplug = HDMI_HPD_REMOVED;
hdmi_send_uevent(hdmi, KOBJ_REMOVE);
}