summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/dc.c
diff options
context:
space:
mode:
authorJon Mayo <jmayo@nvidia.com>2012-01-11 17:49:27 -0800
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-01-16 09:05:52 -0800
commitcf13d400b343151816bb873b8c949a18ab63ba81 (patch)
treead1897f24d25b1b27f444323e15a61c4a21f8228 /drivers/video/tegra/dc/dc.c
parente09bd7a46f7df0ce9e5c1d3c44c542e5e696dd53 (diff)
Revert "video: tegra: dc: fix DSI pclk calculation"
This reverts commit 20f43dfc590d22ad1e80b7b948f108b17038b084. Conflicts: drivers/video/tegra/dc/dc.c This fix is no longer needed to boot. Change-Id: Ie8d877207b6a1d70c63834f234d7a7cc68a372bf Signed-off-by: Jon Mayo <jmayo@nvidia.com> Reviewed-on: http://git-master/r/74884 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Kevin Huang (Eng-SW) <kevinh@nvidia.com> Reviewed-on: http://git-master/r/75151 Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc/dc.c')
-rw-r--r--drivers/video/tegra/dc/dc.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 3d834eb..e6fc065 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -942,7 +942,7 @@ static unsigned long tegra_dc_calc_win_bandwidth(struct tegra_dc *dc,
2 * tegra_dc_fmt_bpp(w->fmt) : tegra_dc_fmt_bpp(w->fmt);
/* perform calculations with most significant bits of pixel clock
* to prevent overflow of long. */
- ret = (unsigned long)(dc->pixel_clk >> 16) *
+ ret = (unsigned long)(dc->mode.pclk >> 16) *
bpp / 8 *
(win_use_v_filter(w) ? 2 : 1) * dfixed_trunc(w->w) / w->out_w *
(WIN_IS_TILED(w) ? tiled_windows_bw_multiplier : 1);
@@ -1545,14 +1545,14 @@ static bool check_ref_to_sync(struct tegra_dc_mode *mode)
#ifdef DEBUG
/* return in 1000ths of a Hertz */
-static int calc_refresh(struct tegra_dc *dc, const struct tegra_dc_mode *m)
+static int calc_refresh(const struct tegra_dc_mode *m)
{
long h_total, v_total, refresh;
h_total = m->h_active + m->h_front_porch + m->h_back_porch +
m->h_sync_width;
v_total = m->v_active + m->v_front_porch + m->v_back_porch +
m->v_sync_width;
- refresh = dc->pixel_clk / h_total;
+ refresh = m->pclk / h_total;
refresh *= 1000;
refresh /= v_total;
return refresh;
@@ -1659,8 +1659,6 @@ static int tegra_dc_program_mode(struct tegra_dc *dc, struct tegra_dc_mode *mode
(mode->h_active << 16) | mode->v_active);
#endif
- dc->pixel_clk = dc->mode.pclk;
-
return 0;
}