Prechádzať zdrojové kódy

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>
Hans Verkuil 8 rokov pred
rodič
commit
1d54ecf230

+ 2 - 0
drivers/gpu/drm/omapdrm/dss/hdmi4.c

@@ -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);
 
 

+ 0 - 3
drivers/gpu/drm/omapdrm/dss/hdmi4_core.c

@@ -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;