From 020d4e034f134e6fcfd1d1611cd53ff87a5187b3 Mon Sep 17 00:00:00 2001 From: Arto Merilainen Date: Sun, 5 Oct 2014 21:02:39 +0300 Subject: video: tegra: host: Reorganize mutex allocations This patch reorganizes mutex allocations to match the current hardware use model. In addition, this patch removes no-longer-used syncpoint base allocations Bug 200041935 Change-Id: Ie94c645af559fa25af4cab00914c6daaf002b315 Signed-off-by: Arto Merilainen --- include/linux/nvhost.h | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'include/linux') diff --git a/include/linux/nvhost.h b/include/linux/nvhost.h index 67ddd0a45..59f6e89a5 100644 --- a/include/linux/nvhost.h +++ b/include/linux/nvhost.h @@ -60,27 +60,17 @@ struct sync_pt; #define NVSYNCPT_VBLANK0 (26) /* t20, t30, t114, t148 */ #define NVSYNCPT_VBLANK1 (27) /* t20, t30, t114, t148 */ -#define NVWAITBASE_2D_0 (1) /* t20, t30, t114 */ -#define NVWAITBASE_2D_1 (2) /* t20, t30, t114 */ -#define NVWAITBASE_3D (3) /* t20, t30, t114 */ -#define NVWAITBASE_MPE (4) /* t20, t30 */ -#define NVWAITBASE_MSENC (4) /* t114, t148 */ -#define NVWAITBASE_TSEC (5) /* t114, t148 */ - -#define NVMODMUTEX_2D_FULL (1) /* t20, t30, t114, t148 */ -#define NVMODMUTEX_ISP_0 (1) /* t124 */ -#define NVMODMUTEX_2D_SIMPLE (2) /* t20, t30, t114, t148 */ -#define NVMODMUTEX_ISP_1 (2) /* t124 */ -#define NVMODMUTEX_2D_SB_A (3) /* t20, t30, t114, t148 */ -#define NVMODMUTEX_2D_SB_B (4) /* t20, t30, t114, t148 */ -#define NVMODMUTEX_3D (5) /* t20, t30, t114, t148 */ -#define NVMODMUTEX_DISPLAYA (6) /* t20, t30, t114, t148 */ -#define NVMODMUTEX_DISPLAYB (7) /* t20, t30, t114, t148 */ -#define NVMODMUTEX_VI (8) /* t20, t30, t114 */ +#define NVMODMUTEX_ISP_0 (1) /* t124, t132, t210 */ +#define NVMODMUTEX_ISP_1 (2) /* t124, t132, t210 */ +#define NVMODMUTEX_NVJPG (3) /* t210 */ +#define NVMODMUTEX_NVDEC (4) /* t210 */ +#define NVMODMUTEX_MSENC (5) /* t124, t132, t210 */ +#define NVMODMUTEX_TSECA (6) /* t124, t132, t210 */ +#define NVMODMUTEX_TSECB (7) /* t124, t132, t210 */ +#define NVMODMUTEX_VI (8) /* t124, t132, t210 */ #define NVMODMUTEX_VI_0 (8) /* t148 */ -#define NVMODMUTEX_DSI (9) /* t20, t30, t114, t148 */ -#define NVMODMUTEX_VIC (10) /* t124 */ -#define NVMODMUTEX_VI_1 (11) /* t124 */ +#define NVMODMUTEX_VIC (10) /* t124, t132, t210 */ +#define NVMODMUTEX_VI_1 (11) /* t124, t132, t210 */ enum nvhost_power_sysfs_attributes { NVHOST_POWER_SYSFS_ATTRIB_CLOCKGATE_DELAY = 0, -- cgit v1.2.2