diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-05-16 10:44:13 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-06-17 14:00:55 +0300 |
| commit | 5391e87d1259e45fbb153aad97fe21a41403b534 (patch) | |
| tree | 0b0a144fade93e13d90bda00964b44dce48fc20f /drivers/video/omap2/dss/venc.c | |
| parent | 94954fcb8030cd5545dcfc5b8c94fa224e20985d (diff) | |
| download | linux-5391e87d1259e45fbb153aad97fe21a41403b534.tar.gz linux-5391e87d1259e45fbb153aad97fe21a41403b534.tar.bz2 linux-5391e87d1259e45fbb153aad97fe21a41403b534.zip | |
OMAPDSS: remove dispc's dependency to VENC/HDMI
DISPC needs to know the clock rate for DIGIT (i.e. TV) channel, and this
clock is provided by either VENC or HDMI modules. Currently DISPC will
call a function in VENC/HDMI, asking what the clock rate is. This means
we have a fixed dependency from DISPC to both VENC and HDMI.
To have a more generic approach, and in particular to allow adding OMAP5
HDMI driver, we need to remove this dependency. This patch makes
VENC/HDMI inform DISPC when the their clock changes, thus reversing the
dependency and removing the issue.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/venc.c')
| -rw-r--r-- | drivers/video/omap2/dss/venc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index 4a8a214067ab..8720f137d4f8 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -492,12 +492,6 @@ static void venc_power_off(struct omap_dss_device *dssdev) venc_runtime_put(); } -unsigned long venc_get_pixel_clock(void) -{ - /* VENC Pixel Clock in Mhz */ - return 13500000; -} - int omapdss_venc_display_enable(struct omap_dss_device *dssdev) { struct omap_dss_device *out = &venc.output; @@ -551,6 +545,8 @@ void omapdss_venc_set_timings(struct omap_dss_device *dssdev, venc.timings = *timings; + dispc_set_tv_pclk(13500000); + mutex_unlock(&venc.venc_lock); } |