openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

omapdrm: hdmi4: move hdmi4_core_powerdown_disable to hdmi_power_on_core() 

Call hdmi4_core_powerdown_disable() in hdmi_power_on_core() to
power up the HDMI core (needed for CEC). The same call can now be dropped
in hdmi4_configure().

Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Hans Verkuil 2017-08-02 10:54:04 +02:00 committed by Tomi Valkeinen
parent f3096a4ada
commit 1d54ecf230
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/omapdrm/dss/hdmi4.c
View File

@ -132,6 +132,8 @@ static int hdmi_power_on_core(struct omap_dss_device *dssdev)
if (r) if (r)
goto err_runtime_get; goto err_runtime_get;
hdmi4_core_powerdown_disable(&hdmi.core);
/* Make selection of HDMI in DSS */ /* Make selection of HDMI in DSS */
dss_select_hdmi_venc_clk_source(DSS_HDMI_M_PCLK); dss_select_hdmi_venc_clk_source(DSS_HDMI_M_PCLK);

3
drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
View File

@ -335,9 +335,6 @@ void hdmi4_configure(struct hdmi_core_data *core,
*/ */
hdmi_core_swreset_assert(core); hdmi_core_swreset_assert(core);
/* power down off */
hdmi4_core_powerdown_disable(core);
v_core_cfg.pkt_mode = HDMI_PACKETMODE24BITPERPIXEL; v_core_cfg.pkt_mode = HDMI_PACKETMODE24BITPERPIXEL;
v_core_cfg.hdmi_dvi = cfg->hdmi_dvi_mode; v_core_cfg.hdmi_dvi = cfg->hdmi_dvi_mode;