diff options
| author | Shridhar Rasal <srasal@nvidia.com> | 2014-02-25 17:17:20 +0530 |
|---|---|---|
| committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-02-25 05:54:34 -0800 |
| commit | 22fd2ba354071237fe4c199e10b6d284b03d29a5 (patch) | |
| tree | 0f9158812d9619d96780802f72db091ceb647044 /drivers/video/tegra/host/t114/t114.c | |
| parent | e392dd5d6fa08ab41a65f719e0db7e17e607c0c7 (diff) | |
video: tegra: host: Revert dynamic syncpt patches
With dynamic syncpoint allocation ap_systemsw fails
intermittently for TN8. so reverting series of dynamic
syncpoint patches.
Bug 1305024
Bug 1467163
Revert "video: tegra: host: add pbdma syncpoint headers"
commit 62efc18329c5da0e6dc90f088c145e1099213f20.
Revert "video: tegra: host: print syncpt id in debug spew"
commit c918cc4494008fe764e746142060d896436a1d3c.
Revert "video: tegra: host: remove static from get_syncpt_name()"
commit c098ce933738d892bbeba003ab35505c4b7d7951.
Revert "video: tegra: host: remove unused variable"
commit a4dad0592c95165e8366ebe939367a1ece2cb9b9.
Revert "video: tegra: host: Hardcode AVP sync point"
commit 8da84e56de66f20806cb706ee005f263ca5e213f.
Revert "video: tegra: host: hard-code syncpts for t114"
commit 410536f668a62d94603bc3287efaef3dcffb1226.
Revert "video: tegra: host: remove static syncpt mappings"
commit 4cee1d17b01019cc122acf21604d4f01ac6f7474.
Revert "media: tegra_camera: use dynamic syncpts"
commit eae55c8e4cbb65e3ed1a8c8ef8150d8a6ba938bf.
Revert "video: tegra: dc: use dynamic syncpt"
commit 03d7c261ceb62bf1eb93cae48aaa84881d6de5b9.
Revert "video: tegra: host: use dynamic syncpt for hwctx"
commit 03136f549f54a26d77987f3751bf12d202614372.
Revert "video: tegra: host: implement dynamic synpt"
commit 6c2d1b43e51f2e0424b793c9da1c25adf63ea569.
Change-Id: I19a63e812680b7521bed3c1188858b2165a88c89
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-on: http://git-master/r/374169
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/host/t114/t114.c')
| -rw-r--r-- | drivers/video/tegra/host/t114/t114.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/drivers/video/tegra/host/t114/t114.c b/drivers/video/tegra/host/t114/t114.c index eda00231d06e..7b149d77455f 100644 --- a/drivers/video/tegra/host/t114/t114.c +++ b/drivers/video/tegra/host/t114/t114.c @@ -3,7 +3,7 @@ * * Tegra Graphics Init for Tegra11 Architecture Chips * - * Copyright (c) 2011-2014, NVIDIA Corporation. All rights reserved. + * Copyright (c) 2011-2013, NVIDIA Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -70,11 +70,30 @@ static struct resource tegra_host1x02_resources[] = { }, }; +static const char *s_syncpt_names[32] = { + "gfx_host", + "", "", "", "", "", "", "", + "disp0_a", "disp1_a", "avp_0", + "csi_vi_0", "csi_vi_1", + "vi_isp_0", "vi_isp_1", "vi_isp_2", "vi_isp_3", "vi_isp_4", + "2d_0", "2d_1", + "disp0_b", "disp1_b", + "3d", + "msenc", + "disp0_c", "disp1_c", + "vblank0", "vblank1", + "tsec", "msenc_unused", + "2d_tinyblt", + "dsi" +}; + static struct host1x_device_info host1x02_info = { .nb_channels = 9, .nb_pts = 32, .nb_mlocks = 16, .nb_bases = 12, + .syncpt_names = s_syncpt_names, + .client_managed = NVSYNCPTS_CLIENT_MANAGED, }; struct nvhost_device_data t11_host1x_info = { @@ -174,6 +193,8 @@ static struct resource isp_resources[] = { struct nvhost_device_data t11_isp_info = { .index = 3, + .syncpts = {NVSYNCPT_VI_ISP_2, NVSYNCPT_VI_ISP_3, + NVSYNCPT_VI_ISP_4}, .keepalive = true, NVHOST_MODULE_NO_POWERGATE_IDS, NVHOST_DEFAULT_CLOCKGATE_DELAY, @@ -207,6 +228,10 @@ static struct resource vi_resources[] = { struct nvhost_device_data t11_vi_info = { .index = 4, + .syncpts = {NVSYNCPT_CSI_VI_0, NVSYNCPT_CSI_VI_1, + NVSYNCPT_VI_ISP_0, NVSYNCPT_VI_ISP_1, + NVSYNCPT_VI_ISP_2, NVSYNCPT_VI_ISP_3, + NVSYNCPT_VI_ISP_4}, .modulemutexes = {NVMODMUTEX_VI}, .clocks = { {"host1x", 136000000, 6} }, .exclusive = true, @@ -239,6 +264,7 @@ static struct resource msenc_resources[] = { struct nvhost_device_data t11_msenc_info = { .version = NVHOST_ENCODE_MSENC_VER(2, 0), .index = 5, + .syncpts = {NVSYNCPT_MSENC}, .waitbases = {NVWAITBASE_MSENC}, .class = NV_VIDEO_ENCODE_MSENC_CLASS_ID, .clocks = { {"msenc", UINT_MAX, 107, TEGRA_MC_CLIENT_MSENC}, @@ -275,6 +301,7 @@ static struct resource tsec_resources[] = { struct nvhost_device_data t11_tsec_info = { .version = NVHOST_ENCODE_TSEC_VER(1, 0), .index = 7, + .syncpts = {NVSYNCPT_TSEC}, .waitbases = {NVWAITBASE_TSEC}, .class = NV_TSEC_CLASS_ID, .exclusive = false, |