Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cea87b92 authored by Archit Taneja's avatar Archit Taneja Committed by Tomi Valkeinen
Browse files

OMAPDSS: HDMI: Replace dssdev->manager with dssdev->output->manager references 



With addition of output entities, a device connects to an output, and an output
connects to overlay manager. Replace the dssdev->manager references with
dssdev->output->manager to access the manager correctly.

When enabling the HDMI output, check whether the output entity connected to
display is not NULL.

Signed-off-by: default avatarArchit Taneja <archit@ti.com>
parent 8f1f736c

drivers/video/omap2/dss/hdmi.c

+10 −6
Original line number Original line Diff line number Diff line
@@ -504,6 +504,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev) 
{

{

	int r;

	int r;

	struct omap_video_timings *p;

	struct omap_video_timings *p;

	struct omap_overlay_manager *mgr = dssdev->output->manager;

	unsigned long phy;

	unsigned long phy;





	gpio_set_value(hdmi.ct_cp_hpd_gpio, 1);

	gpio_set_value(hdmi.ct_cp_hpd_gpio, 1);
@@ -520,7 +521,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev) 
	if (r)

	if (r)

		goto err_runtime_get;

		goto err_runtime_get;





	dss_mgr_disable(dssdev->manager);

	dss_mgr_disable(mgr);





	p = &hdmi.ip_data.cfg.timings;

	p = &hdmi.ip_data.cfg.timings;
@@ -562,13 +563,13 @@ static int hdmi_power_on(struct omap_dss_device *dssdev) 
	dispc_enable_gamma_table(0);

	dispc_enable_gamma_table(0);





	/* tv size */

	/* tv size */

	dss_mgr_set_timings(dssdev->manager, p);

	dss_mgr_set_timings(mgr, p);





	r = hdmi.ip_data.ops->video_enable(&hdmi.ip_data);

	r = hdmi.ip_data.ops->video_enable(&hdmi.ip_data);

	if (r)

	if (r)

		goto err_vid_enable;

		goto err_vid_enable;





	r = dss_mgr_enable(dssdev->manager);

	r = dss_mgr_enable(mgr);

	if (r)

	if (r)

		goto err_mgr_enable;

		goto err_mgr_enable;
@@ -592,7 +593,9 @@ err_vdac_enable: 




static void hdmi_power_off(struct omap_dss_device *dssdev)

static void hdmi_power_off(struct omap_dss_device *dssdev)

{

{

	dss_mgr_disable(dssdev->manager);

	struct omap_overlay_manager *mgr = dssdev->output->manager;



	dss_mgr_disable(mgr);





	hdmi.ip_data.ops->video_disable(&hdmi.ip_data);

	hdmi.ip_data.ops->video_disable(&hdmi.ip_data);

	hdmi.ip_data.ops->phy_disable(&hdmi.ip_data);

	hdmi.ip_data.ops->phy_disable(&hdmi.ip_data);
@@ -689,14 +692,15 @@ bool omapdss_hdmi_detect(void) 




int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)

int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)

{

{

	struct omap_dss_output *out = dssdev->output;

	int r = 0;

	int r = 0;





	DSSDBG("ENTER hdmi_display_enable\n");

	DSSDBG("ENTER hdmi_display_enable\n");





	mutex_lock(&hdmi.lock);

	mutex_lock(&hdmi.lock);





	if (dssdev->manager == NULL) {

	if (out == NULL || out->manager == NULL) {

		DSSERR("failed to enable display: no manager\n");

		DSSERR("failed to enable display: no output/manager\n");

		r = -ENODEV;

		r = -ENODEV;

		goto err0;

		goto err0;

	}

	}