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

Commit 759593ff authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAP: DSS2: HDMI: implement detect() 



Implement detect() by checking the hot plug detect status.

The implementation is not very good, as it always turns on the HDMI
output to get the detection working. HDMI driver needs improvements so
that we could enable only core parts of it.

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

drivers/video/omap2/dss/dss.h

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

					struct omap_video_timings *timings);

int omapdss_hdmi_read_edid(u8 *buf, int len);

bool omapdss_hdmi_detect(void);

int hdmi_panel_init(void);

void hdmi_panel_exit(void);

drivers/video/omap2/dss/dss_features.c

+1 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ static const struct ti_hdmi_ip_ops omap4_hdmi_functions = { 
	.phy_enable		=	ti_hdmi_4xxx_phy_enable,

	.phy_disable		=	ti_hdmi_4xxx_phy_disable,

	.read_edid		=	ti_hdmi_4xxx_read_edid,

	.detect			=	ti_hdmi_4xxx_detect,

	.pll_enable		=	ti_hdmi_4xxx_pll_enable,

	.pll_disable		=	ti_hdmi_4xxx_pll_disable,

	.video_enable		=	ti_hdmi_4xxx_wp_video_start,

drivers/video/omap2/dss/hdmi.c

+17 −0
Original line number Diff line number Diff line
@@ -449,6 +449,23 @@ int omapdss_hdmi_read_edid(u8 *buf, int len) 
	return r;

}



bool omapdss_hdmi_detect(void)

{

	int r;



	mutex_lock(&hdmi.lock);



	r = hdmi_runtime_get();

	BUG_ON(r);



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



	hdmi_runtime_put();

	mutex_unlock(&hdmi.lock);



	return r == 1;

}



int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)

{

	int r = 0;

drivers/video/omap2/dss/hdmi_panel.c

+25 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/mutex.h>

#include <linux/module.h>

#include <video/omapdss.h>

#include <linux/slab.h>



#include "dss.h"
@@ -198,6 +199,29 @@ static int hdmi_read_edid(struct omap_dss_device *dssdev, u8 *buf, int len) 
	return r;

}



static bool hdmi_detect(struct omap_dss_device *dssdev)

{

	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_detect();



	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 = {

	.probe		= hdmi_panel_probe,

	.remove		= hdmi_panel_remove,
@@ -209,6 +233,7 @@ static struct omap_dss_driver hdmi_driver = { 
	.set_timings	= hdmi_set_timings,

	.check_timings	= hdmi_check_timings,

	.read_edid	= hdmi_read_edid,

	.detect		= hdmi_detect,

	.driver			= {

		.name   = "hdmi_panel",

		.owner  = THIS_MODULE,

drivers/video/omap2/dss/ti_hdmi.h

+3 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ struct ti_hdmi_ip_ops { 


	int (*read_edid)(struct hdmi_ip_data *ip_data, u8 *edid, int len);



	bool (*detect)(struct hdmi_ip_data *ip_data);



	int (*pll_enable)(struct hdmi_ip_data *ip_data);



	void (*pll_disable)(struct hdmi_ip_data *ip_data);
@@ -114,6 +116,7 @@ struct hdmi_ip_data { 
int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data);

void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data);

int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data, u8 *edid, int len);

bool ti_hdmi_4xxx_detect(struct hdmi_ip_data *ip_data);

void ti_hdmi_4xxx_wp_video_start(struct hdmi_ip_data *ip_data, bool start);

int ti_hdmi_4xxx_pll_enable(struct hdmi_ip_data *ip_data);

void ti_hdmi_4xxx_pll_disable(struct hdmi_ip_data *ip_data);