]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
video: tegra: dc: use updated API to get syncpoint
authorDeepak Nibade <dnibade@nvidia.com>
Wed, 3 Jun 2015 09:46:15 +0000 (15:16 +0530)
committerArto Merilainen <amerilainen@nvidia.com>
Fri, 5 Jun 2015 07:51:54 +0000 (00:51 -0700)
Pass client device pointer for below API :
nvhost_get_syncpt_client_managed()

Bug 1611482

Change-Id: I05473fb5be47275b427d97c36e6e9bc4874fdf74
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/751840
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Tested-by: Arto Merilainen <amerilainen@nvidia.com>
drivers/video/tegra/dc/dc.c
drivers/video/tegra/dc/dsi.c

index b7bb78c5671a076a94e0b3f1ab011766b46d5811..39327bf2e76f1107f218e0df821a2dbfc2e6e651 100644 (file)
@@ -4405,23 +4405,23 @@ static int tegra_dc_probe(struct platform_device *ndev)
        if (TEGRA_DISPLAY_BASE == res->start) {
                dc->vblank_syncpt = NVSYNCPT_VBLANK0;
                dc->windows[0].syncpt.id =
-                       nvhost_get_syncpt_client_managed("disp0_a");
+                       nvhost_get_syncpt_client_managed(ndev, "disp0_a");
                dc->windows[1].syncpt.id =
-                       nvhost_get_syncpt_client_managed("disp0_b");
+                       nvhost_get_syncpt_client_managed(ndev, "disp0_b");
                dc->windows[2].syncpt.id =
-                       nvhost_get_syncpt_client_managed("disp0_c");
+                       nvhost_get_syncpt_client_managed(ndev, "disp0_c");
                dc->valid_windows = 0x07;
 #if defined(CONFIG_ARCH_TEGRA_14x_SOC)
                dc->windows[3].syncpt.id =
-                       nvhost_get_syncpt_client_managed("disp0_d");
+                       nvhost_get_syncpt_client_managed(ndev, "disp0_d");
                dc->windows[4].syncpt.id =
-                       nvhost_get_syncpt_client_managed("disp0_h");
+                       nvhost_get_syncpt_client_managed(ndev, "disp0_h");
                dc->valid_windows |= 0x18;
 #elif !defined(CONFIG_ARCH_TEGRA_2x_SOC) && \
        !defined(CONFIG_ARCH_TEGRA_3x_SOC) && \
        !defined(CONFIG_ARCH_TEGRA_11x_SOC)
                dc->windows[3].syncpt.id =
-                       nvhost_get_syncpt_client_managed("disp0_d");
+                       nvhost_get_syncpt_client_managed(ndev, "disp0_d");
                dc->valid_windows |= 0x08;
 #endif
 #ifdef CONFIG_PM_GENERIC_DOMAINS_OF
@@ -4442,15 +4442,15 @@ static int tegra_dc_probe(struct platform_device *ndev)
        } else if (TEGRA_DISPLAY2_BASE == res->start) {
                dc->vblank_syncpt = NVSYNCPT_VBLANK1;
                dc->windows[0].syncpt.id =
-                       nvhost_get_syncpt_client_managed("disp1_a");
+                       nvhost_get_syncpt_client_managed(ndev, "disp1_a");
                dc->windows[1].syncpt.id =
-                       nvhost_get_syncpt_client_managed("disp1_b");
+                       nvhost_get_syncpt_client_managed(ndev, "disp1_b");
                dc->windows[2].syncpt.id =
-                       nvhost_get_syncpt_client_managed("disp1_c");
+                       nvhost_get_syncpt_client_managed(ndev, "disp1_c");
                dc->valid_windows = 0x07;
 #ifdef CONFIG_ARCH_TEGRA_14x_SOC
                dc->windows[4].syncpt.id =
-                       nvhost_get_syncpt_client_managed("disp1_h");
+                       nvhost_get_syncpt_client_managed(ndev, "disp1_h");
                dc->valid_windows |= 0x10;
 #endif
 #ifdef CONFIG_PM_GENERIC_DOMAINS_OF
index ef232e25b3b827d1e4a8e056679107f8f96b24cf..4a989a9bcd8ac3b0deb4f8538610e252dc979a56 100644 (file)
@@ -788,7 +788,7 @@ static void tegra_dsi_init_sw(struct tegra_dc *dc,
        dsi->clk_ref = false;
 
 #if DSI_USE_SYNC_POINTS
-       dsi->syncpt_id = nvhost_get_syncpt_client_managed("dsi");
+       dsi->syncpt_id = nvhost_get_syncpt_client_managed(dc->ndev, "dsi");
 #endif
 
        tegra_dsi_init_clock_param(dc);