diff options
| author | Archit Taneja <archit@ti.com> | 2012-04-09 15:06:41 +0530 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-09 13:44:09 +0300 |
| commit | 3fa03ba8542c40b90c95facfecd9b2789f71c0b6 (patch) | |
| tree | df910c413818cbbb1c03e36abe561f19ae941d65 /drivers/video/omap2/dss | |
| parent | b3d795abb253c7605f8b6257f2e25e7ebaaf4b57 (diff) | |
| download | op-kernel-dev-3fa03ba8542c40b90c95facfecd9b2789f71c0b6.zip op-kernel-dev-3fa03ba8542c40b90c95facfecd9b2789f71c0b6.tar.gz | |
OMAPDSS: DISPC: Remove omap_dss_device pointer usage from dispc_mgr_pclk_rate()
The pixel clock rate for the TV manager is calculated by checking the device
type connected to the manager, and then requesting the VENC/HDMI interface for
the pixel clock rate.
Remove the use of omap_dss_device pointer from here by checking which interface
generates the pixel clock by reading the DSS_CTRL.VENC_HDMI_SWITCH bit.
Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss')
| -rw-r--r-- | drivers/video/omap2/dss/dispc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 6eec084..cd0a397 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -2643,13 +2643,14 @@ unsigned long dispc_mgr_pclk_rate(enum omap_channel channel) return r / pcd; } else { - struct omap_dss_device *dssdev = - dispc_mgr_get_device(channel); + enum dss_hdmi_venc_clk_source_select source; - switch (dssdev->type) { - case OMAP_DISPLAY_TYPE_VENC: + source = dss_get_hdmi_venc_clk_source(); + + switch (source) { + case DSS_VENC_TV_CLK: return venc_get_pixel_clock(); - case OMAP_DISPLAY_TYPE_HDMI: + case DSS_HDMI_M_PCLK: return hdmi_get_pixel_clock(); default: BUG(); |
