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

Commit 47024565 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAP: DSS2: HDMI: implement read_edid() 



Implement read_edid() for HDMI by implementing necessary functions to
hdmi.c and to hdmi_omap4_panel.c.

Cc: Mythri P K <mythripk@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent fa70dc5f

drivers/video/omap2/dss/dss.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -494,6 +494,7 @@ void omapdss_hdmi_display_disable(struct omap_dss_device *dssdev); 
void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev);

void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev);

int omapdss_hdmi_display_check_timing(struct omap_dss_device *dssdev,

int omapdss_hdmi_display_check_timing(struct omap_dss_device *dssdev,

					struct omap_video_timings *timings);

					struct omap_video_timings *timings);

int omapdss_hdmi_read_edid(u8 *buf, int len);

int hdmi_panel_init(void);

int hdmi_panel_init(void);

void hdmi_panel_exit(void);

void hdmi_panel_exit(void);

drivers/video/omap2/dss/hdmi.c

+18 −1
Original line number Original line Diff line number Diff line
@@ -372,7 +372,7 @@ static void hdmi_read_edid(struct omap_video_timings *dp) 
	if (!hdmi.edid_set)

	if (!hdmi.edid_set)

		ret = hdmi.ip_data.ops->read_edid(&hdmi.ip_data, hdmi.edid,

		ret = hdmi.ip_data.ops->read_edid(&hdmi.ip_data, hdmi.edid,

						HDMI_EDID_MAX_LENGTH);

						HDMI_EDID_MAX_LENGTH);

	if (!ret) {

	if (ret > 0) {

		if (!memcmp(hdmi.edid, edid_header, sizeof(edid_header))) {

		if (!memcmp(hdmi.edid, edid_header, sizeof(edid_header))) {

			/* search for timings of default resolution */

			/* search for timings of default resolution */

			get_edid_timing_data(hdmi.edid);

			get_edid_timing_data(hdmi.edid);
@@ -587,6 +587,23 @@ void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev) 
	}

	}

}

}





int omapdss_hdmi_read_edid(u8 *buf, int len)

{

	int r;



	mutex_lock(&hdmi.lock);



	r = hdmi_runtime_get();

	BUG_ON(r);



	r = hdmi.ip_data.ops->read_edid(&hdmi.ip_data, buf, len);



	hdmi_runtime_put();

	mutex_unlock(&hdmi.lock);



	return r;

}



int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)

int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)

{

{

	int r = 0;

	int r = 0;

drivers/video/omap2/dss/hdmi_panel.c

+24 −0
Original line number Original line Diff line number Diff line
@@ -185,6 +185,29 @@ static int hdmi_check_timings(struct omap_dss_device *dssdev, 
	return r;

	return r;

}

}





static int hdmi_read_edid(struct omap_dss_device *dssdev, u8 *buf, int len)

{

	int r;



	mutex_lock(&hdmi.hdmi_lock);



	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {

		r = omapdss_hdmi_display_enable(dssdev);

		if (r)

			goto err;

	}



	r = omapdss_hdmi_read_edid(buf, len);



	if (dssdev->state == OMAP_DSS_DISPLAY_DISABLED ||

			dssdev->state == OMAP_DSS_DISPLAY_SUSPENDED)

		omapdss_hdmi_display_disable(dssdev);

err:

	mutex_unlock(&hdmi.hdmi_lock);



	return r;

}



static struct omap_dss_driver hdmi_driver = {

static struct omap_dss_driver hdmi_driver = {

	.probe		= hdmi_panel_probe,

	.probe		= hdmi_panel_probe,

	.remove		= hdmi_panel_remove,

	.remove		= hdmi_panel_remove,
@@ -195,6 +218,7 @@ static struct omap_dss_driver hdmi_driver = { 
	.get_timings	= hdmi_get_timings,

	.get_timings	= hdmi_get_timings,

	.set_timings	= hdmi_set_timings,

	.set_timings	= hdmi_set_timings,

	.check_timings	= hdmi_check_timings,

	.check_timings	= hdmi_check_timings,

	.read_edid	= hdmi_read_edid,

	.driver			= {

	.driver			= {

		.name   = "hdmi_panel",

		.name   = "hdmi_panel",

		.owner  = THIS_MODULE,

		.owner  = THIS_MODULE,

drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c

+20 −17
Original line number Original line Diff line number Diff line
@@ -370,11 +370,13 @@ int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data, 
{

{

	int r = 0, n = 0, i = 0;

	int r = 0, n = 0, i = 0;

	int max_ext_blocks = (max_length / 128) - 1;

	int max_ext_blocks = (max_length / 128) - 1;

	int len;





	r = hdmi_core_ddc_edid(ip_data, pedid, 0);

	r = hdmi_core_ddc_edid(ip_data, pedid, 0);

	if (r) {

	if (r)

		return r;

		return r;

	} else {



	len = 128;

	n = pedid[0x7e];

	n = pedid[0x7e];





	/*

	/*
@@ -390,9 +392,10 @@ int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data, 
		r = hdmi_core_ddc_edid(ip_data, pedid, i);

		r = hdmi_core_ddc_edid(ip_data, pedid, i);

		if (r)

		if (r)

			return r;

			return r;

		len += 128;

	}

	}

	}



	return 0;

	return len;

}

}





static void hdmi_core_init(struct hdmi_core_video_config *video_cfg,

static void hdmi_core_init(struct hdmi_core_video_config *video_cfg,