diff options
| author | Deepak Nibade <dnibade@nvidia.com> | 2014-02-05 21:19:11 +0530 |
|---|---|---|
| committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-03-19 23:50:17 -0700 |
| commit | 10f9513b71a305a83bd005c866449b3846f2246c (patch) | |
| tree | 1b490a314a392171fdb3e88838f8bd14193516a2 /drivers/video/tegra/dc/dc.c | |
| parent | 8799156ca2cf9ff5de8786b76480f7f278320641 (diff) | |
video: tegra: dc: use dynamic syncpt
- use API nvhost_get_syncpt_client_managed() to get syncpts dynamically
- keep VBLANK syncpts hard-coded until we resolve the conflicts with
hard coded syncpt increments from bootloader
Bug 1305024
Change-Id: I814b61b15c017faf66a5ba144153f84c18685c6a
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/381957
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc/dc.c')
| -rw-r--r-- | drivers/video/tegra/dc/dc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index b4bd4fa4f3f0..f34ad5c4c95e 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -2869,16 +2869,16 @@ static int tegra_dc_probe(struct platform_device *ndev) if (TEGRA_DISPLAY_BASE == res->start) { dc->vblank_syncpt = NVSYNCPT_VBLANK0; - dc->win_syncpt[0] = NVSYNCPT_DISP0_A; - dc->win_syncpt[1] = NVSYNCPT_DISP0_B; - dc->win_syncpt[2] = NVSYNCPT_DISP0_C; + dc->win_syncpt[0] = nvhost_get_syncpt_client_managed("disp0_a"); + dc->win_syncpt[1] = nvhost_get_syncpt_client_managed("disp0_b"); + dc->win_syncpt[2] = nvhost_get_syncpt_client_managed("disp0_c"); dc->valid_windows = 0x07; #ifdef CONFIG_ARCH_TEGRA_14x_SOC - dc->win_syncpt[3] = NVSYNCPT_DISP0_D; - dc->win_syncpt[4] = NVSYNCPT_DISP0_H; + dc->win_syncpt[3] = nvhost_get_syncpt_client_managed("disp0_d"); + dc->win_syncpt[4] = nvhost_get_syncpt_client_managed("disp0_h"); dc->valid_windows |= 0x18; #elif defined(CONFIG_ARCH_TEGRA_12x_SOC) - dc->win_syncpt[3] = NVSYNCPT_DISP0_D; + dc->win_syncpt[3] = nvhost_get_syncpt_client_managed("disp0_d"); dc->valid_windows |= 0x08; #endif dc->powergate_id = TEGRA_POWERGATE_DISA; @@ -2887,12 +2887,12 @@ static int tegra_dc_probe(struct platform_device *ndev) #endif } else if (TEGRA_DISPLAY2_BASE == res->start) { dc->vblank_syncpt = NVSYNCPT_VBLANK1; - dc->win_syncpt[0] = NVSYNCPT_DISP1_A; - dc->win_syncpt[1] = NVSYNCPT_DISP1_B; - dc->win_syncpt[2] = NVSYNCPT_DISP1_C; + dc->win_syncpt[0] = nvhost_get_syncpt_client_managed("disp1_a"); + dc->win_syncpt[1] = nvhost_get_syncpt_client_managed("disp1_b"); + dc->win_syncpt[2] = nvhost_get_syncpt_client_managed("disp1_c"); dc->valid_windows = 0x07; #ifdef CONFIG_ARCH_TEGRA_14x_SOC - dc->win_syncpt[4] = NVSYNCPT_DISP1_H; + dc->win_syncpt[4] = nvhost_get_syncpt_client_managed("disp1_h"); dc->valid_windows |= 0x10; #endif dc->powergate_id = TEGRA_POWERGATE_DISB; |