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

Commit 89e71956 authored by Archit Taneja's avatar Archit Taneja
Browse files

OMAPDSS: VENC: Maintian copy of video output polarity info in private data 



The VENC driver currently relies on the omap_dss_device struct to configure the
video output polarity. This makes the VENC interface driver dependent on the
omap_dss_device struct.

Make the VENC driver data maintain it's own polarity field. A panel driver
is expected to call omapdss_venc_invert_vid_out_polarity() before enabling the
interface.

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

drivers/video/omap2/dss/dss.h

+2 −0
Original line number Diff line number Diff line
@@ -479,6 +479,8 @@ u32 omapdss_venc_get_wss(struct omap_dss_device *dssdev); 
int omapdss_venc_set_wss(struct omap_dss_device *dssdev, u32 wss);

void omapdss_venc_set_type(struct omap_dss_device *dssdev,

		enum omap_dss_venc_type type);

void omapdss_venc_invert_vid_out_polarity(struct omap_dss_device *dssdev,

		bool invert_polarity);

int venc_panel_init(void);

void venc_panel_exit(void);

drivers/video/omap2/dss/venc.c

+12 −1
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ static struct { 


	struct omap_video_timings timings;

	enum omap_dss_venc_type type;

	bool invert_polarity;

} venc;



static inline void venc_write_reg(int idx, u32 val)
@@ -447,7 +448,7 @@ static int venc_power_on(struct omap_dss_device *dssdev) 
	else /* S-Video */

		l |= (1 << 0) | (1 << 2);



	if (dssdev->phy.venc.invert_polarity == false)

	if (venc.invert_polarity == false)

		l |= 1 << 3;



	venc_write_reg(VENC_OUTPUT_CONTROL, l);
@@ -639,6 +640,16 @@ void omapdss_venc_set_type(struct omap_dss_device *dssdev, 
	mutex_unlock(&venc.venc_lock);

}



void omapdss_venc_invert_vid_out_polarity(struct omap_dss_device *dssdev,

		bool invert_polarity)

{

	mutex_lock(&venc.venc_lock);



	venc.invert_polarity = invert_polarity;



	mutex_unlock(&venc.venc_lock);

}



static int __init venc_init_display(struct omap_dss_device *dssdev)

{

	DSSDBG("init_display\n");

drivers/video/omap2/dss/venc_panel.c

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) 


	omapdss_venc_set_timings(dssdev, &dssdev->panel.timings);

	omapdss_venc_set_type(dssdev, dssdev->phy.venc.type);

	omapdss_venc_invert_vid_out_polarity(dssdev,

		dssdev->phy.venc.invert_polarity);



	r = omapdss_venc_display_enable(dssdev);

	if (r)