Revert "video: tegra: host: hard-code syncpts for t114"

This reverts commit 1bf4f9a5e3334756dc789dfc9408e5c64b121f59.

Commit "1bf4f9a" was hard coding some syncpts and was needed
to support T114 on dev-kernel
Since now T114 support is removed from dev-kernel/main branch,
this change can be reverted

Bug 1305024

Change-Id: I5ff5f1190b700fb168b59b6fcff0ec5d66844861
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/384265
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

diff --git a/drivers/video/tegra/host/nvhost_syncpt.c b/drivers/video/tegra/host/nvhost_syncpt.c
index 26076c2665e8616d479c251848cbb7088710f5fb..dbd1765bf6ef2802d582df7151bacc75e44c4411 100644 (file)
--- a/drivers/video/tegra/host/nvhost_syncpt.c
+++ b/drivers/video/tegra/host/nvhost_syncpt.c
@@ -66,11 +66,7 @@ int nvhost_syncpt_get_waitbase(struct nvhost_channel *ch, int id)
        for (i = 0; i < NVHOST_MODULE_MAX_SYNCPTS && pdata->syncpts[i]; ++i)
                ret |= (pdata->syncpts[i] == id);
 
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-       if (!ret || (id == NVSYNCPT_2D_0))
-#else
        if (!ret)
-#endif
                return NVSYNCPT_INVALID;
 
        return pdata->waitbases[0];
@@ -884,29 +880,6 @@ static void nvhost_reserve_syncpts(struct nvhost_syncpt *sp)
        mutex_unlock(&sp->syncpt_mutex);
 }
 
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-static void nvhost_reserve_gr_syncpt(struct nvhost_syncpt *sp)
-{
-       mutex_lock(&sp->syncpt_mutex);
-
-       sp->assigned[NVSYNCPT_2D_0] = true;
-       sp->syncpt_names[NVSYNCPT_2D_0] = "2d_0";
-
-       sp->assigned[NVSYNCPT_2D_1] = true;
-       sp->client_managed[NVSYNCPT_2D_1] = true;
-       sp->syncpt_names[NVSYNCPT_2D_1] = "2d_1";
-
-       /* HACK: some tests for t114 require syncpt 17
-        * to be reserved as client managed
-        */
-       sp->assigned[17] = true;
-       sp->client_managed[17] = true;
-       sp->syncpt_names[17] = "3d_1";
-
-       mutex_unlock(&sp->syncpt_mutex);
-}
-#endif
-
 int nvhost_syncpt_init(struct platform_device *dev,
                struct nvhost_syncpt *sp)
 {
@@ -1015,9 +988,6 @@ int nvhost_syncpt_init(struct platform_device *dev,
         * external dependencies / constraints
         */
        nvhost_reserve_syncpts(sp);
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-       nvhost_reserve_gr_syncpt(sp);
-#endif
 
        return err;
 

diff --git a/drivers/video/tegra/host/t114/t114.c b/drivers/video/tegra/host/t114/t114.c
index 951e2e73382c767722bfa72fbb60e776358b367a..84cfaaffe54d11d5cc47b3a5f2d368866d2155bf 100644 (file)
--- a/drivers/video/tegra/host/t114/t114.c
+++ b/drivers/video/tegra/host/t114/t114.c
@@ -96,7 +96,6 @@ static struct platform_device tegra_host1x02_device = {
 struct nvhost_device_data t11_gr3d_info = {
        .version        = 3,
        .index          = 1,
-       .syncpts        = {NVSYNCPT_3D},
        .waitbases      = {NVWAITBASE_3D},
        .modulemutexes  = {NVMODMUTEX_3D},
        .class          = NV_GRAPHICS_3D_CLASS_ID,
@@ -137,7 +136,6 @@ static struct platform_device tegra_gr3d03_device = {
 struct nvhost_device_data t11_gr2d_info = {
        .version        = 2,
        .index          = 2,
-       .syncpts        = {NVSYNCPT_2D_0, NVSYNCPT_2D_1},
        .waitbases      = {NVWAITBASE_2D_0, NVWAITBASE_2D_1},
        .modulemutexes  = {NVMODMUTEX_2D_FULL, NVMODMUTEX_2D_SIMPLE,
                          NVMODMUTEX_2D_SB_A, NVMODMUTEX_2D_SB_B},

diff --git a/include/linux/nvhost.h b/include/linux/nvhost.h
index 22ef155bc4ca51f0d93b644f66645952a6dfecd7..553f7b05bed64b6c215b7539f735ca3aac152154 100644 (file)
--- a/include/linux/nvhost.h
+++ b/include/linux/nvhost.h
@@ -58,8 +58,6 @@ struct sync_pt;
 #define NVSYNCPT_GRAPHICS_HOST         (0)     /* t20, t30, t114, t148 */
 
 #define NVSYNCPT_AVP_0                 (10)    /* t20, t30, t114, t148 */
-#define NVSYNCPT_2D_0                  (18)
-#define NVSYNCPT_2D_1                  (19)
 #define NVSYNCPT_3D                    (22)    /* t20, t30, t114, t148 */
 #define NVSYNCPT_VBLANK0               (26)    /* t20, t30, t114, t148 */
 #define NVSYNCPT_VBLANK1               (27)    /* t20, t30, t114, t148 */