summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Liljeberg <mliljeberg@nvidia.com>2017-06-15 11:39:27 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-06-16 10:35:12 -0400
commit71ad466ee4d5ef1399d0b14f1fb33a1d3e259b0f (patch)
tree7dda88d7126b95f5617c493ca30caf8362f87a39
parentd06e385a89ed1025af6af20a0ba10b3bc7e0a386 (diff)
video: tegra: host: map VI5 and ISP5 Stream ID LUTs
Add VDK R7 mappings for VI. Add both VDK R6 and R7 mappings for ISP5. Jira CAMC-320. Change-Id: Iae7a6512e98173d23c0bbab4518f06a415b1dc13 Signed-off-by: Mika Liljeberg <mliljeberg@nvidia.com> Reviewed-on: http://git-master/r/1503165 GVS: Gerrit_Virtual_Submit Reviewed-by: Ajith Kumar <ajithk@nvidia.com> Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
-rw-r--r--drivers/video/tegra/host/t194/streamid_regs.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/tegra/host/t194/streamid_regs.c b/drivers/video/tegra/host/t194/streamid_regs.c
index cf745cfec..84d9e7317 100644
--- a/drivers/video/tegra/host/t194/streamid_regs.c
+++ b/drivers/video/tegra/host/t194/streamid_regs.c
@@ -31,7 +31,7 @@ static struct nvhost_streamid_mapping __attribute__((__unused__))
31 /* HOST1X_THOST_COMMON_SE4_STRMID_0_OFFSET_BASE_0 */ 31 /* HOST1X_THOST_COMMON_SE4_STRMID_0_OFFSET_BASE_0 */
32 { 0x00001ae0, 0x00000090, 0x00000090}, 32 { 0x00001ae0, 0x00000090, 0x00000090},
33 /* HOST1X_THOST_COMMON_ISP_STRMID_0_OFFSET_BASE_0 */ 33 /* HOST1X_THOST_COMMON_ISP_STRMID_0_OFFSET_BASE_0 */
34 { 0x00001ae8, 0x00000050, 0x00000050}, 34 { 0x00001ae8, 0x00000110, 0x00000110},
35 /* HOST1X_THOST_COMMON_VIC_STRMID_0_OFFSET_BASE_0 */ 35 /* HOST1X_THOST_COMMON_VIC_STRMID_0_OFFSET_BASE_0 */
36 { 0x00001af0, 0x00000030, 0x00000034}, 36 { 0x00001af0, 0x00000030, 0x00000034},
37 /* HOST1X_THOST_COMMON_NVENC_STRMID_0_OFFSET_BASE_0 */ 37 /* HOST1X_THOST_COMMON_NVENC_STRMID_0_OFFSET_BASE_0 */
@@ -72,7 +72,7 @@ static struct nvhost_streamid_mapping __attribute__((__unused__))
72 /* HOST1X_THOST_COMMON_SE4_STRMID_0_OFFSET_BASE_0 */ 72 /* HOST1X_THOST_COMMON_SE4_STRMID_0_OFFSET_BASE_0 */
73 { 0x00001ae0, 0x00000090, 0x00000090}, 73 { 0x00001ae0, 0x00000090, 0x00000090},
74 /* HOST1X_THOST_COMMON_ISP_STRMID_0_OFFSET_BASE_0 */ 74 /* HOST1X_THOST_COMMON_ISP_STRMID_0_OFFSET_BASE_0 */
75 { 0x00001ae8, 0x00000050, 0x00000050}, 75 { 0x00001ae8, 0x00000110, 0x00000110},
76 /* HOST1X_THOST_COMMON_VIC_STRMID_0_OFFSET_BASE_0 */ 76 /* HOST1X_THOST_COMMON_VIC_STRMID_0_OFFSET_BASE_0 */
77 { 0x00001af0, 0x00000030, 0x00000034}, 77 { 0x00001af0, 0x00000030, 0x00000034},
78 /* HOST1X_THOST_COMMON_NVENC_STRMID_0_OFFSET_BASE_0 */ 78 /* HOST1X_THOST_COMMON_NVENC_STRMID_0_OFFSET_BASE_0 */
@@ -86,11 +86,11 @@ static struct nvhost_streamid_mapping __attribute__((__unused__))
86 /* HOST1X_THOST_COMMON_TSECB_STRMID_0_OFFSET_BASE_0 */ 86 /* HOST1X_THOST_COMMON_TSECB_STRMID_0_OFFSET_BASE_0 */
87 { 0x00001b18, 0x00000030, 0x00000034}, 87 { 0x00001b18, 0x00000030, 0x00000034},
88 /* HOST1X_THOST_COMMON_VI_STRMID_0_OFFSET_BASE_0 */ 88 /* HOST1X_THOST_COMMON_VI_STRMID_0_OFFSET_BASE_0 */
89 { 0x00001b80, 0x00010000, 0x00010000}, 89 { 0x00001b80, 0x00000800, 0x00000800},
90 /* HOST1X_THOST_COMMON_VI_THI_STRMID_0_OFFSET_BASE_0 */ 90 /* HOST1X_THOST_COMMON_VI_THI_STRMID_0_OFFSET_BASE_0 */
91 { 0x00001b88, 0x00000000, 0x00000000 }, 91 { 0x00001b88, 0x00000030, 0x00000034 },
92 /* HOST1X_THOST_COMMON_ISP_THI_STRMID_0_OFFSET_BASE_0 */ 92 /* HOST1X_THOST_COMMON_ISP_THI_STRMID_0_OFFSET_BASE_0 */
93 { 0x00001b90, 0x00000000, 0x00000000 }, 93 { 0x00001b90, 0x00000030, 0x00000034 },
94 /* HOST1X_THOST_COMMON_PVA0_CLUSTER_STRMID_0_OFFSET_BASE_0 */ 94 /* HOST1X_THOST_COMMON_PVA0_CLUSTER_STRMID_0_OFFSET_BASE_0 */
95 { 0x00001b98, 0x00000000, 0x00000000 }, 95 { 0x00001b98, 0x00000000, 0x00000000 },
96 /* HOST1X_THOST_COMMON_PVA1_CLUSTER_STRMID_0_OFFSET_BASE_0 */ 96 /* HOST1X_THOST_COMMON_PVA1_CLUSTER_STRMID_0_OFFSET_BASE_0 */