diff options
Diffstat (limited to 'drivers/video/tegra/host/host1x/host1x_syncpt.h')
| -rw-r--r-- | drivers/video/tegra/host/host1x/host1x_syncpt.h | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/drivers/video/tegra/host/host1x/host1x_syncpt.h b/drivers/video/tegra/host/host1x/host1x_syncpt.h index 0d263dc92ed5..a971db8b1d94 100644 --- a/drivers/video/tegra/host/host1x/host1x_syncpt.h +++ b/drivers/video/tegra/host/host1x/host1x_syncpt.h @@ -21,9 +21,12 @@ #ifndef __NVHOST_HOST1X_HOST1X_SYNCPT_H #define __NVHOST_HOST1X_HOST1X_SYNCPT_H -#define NVSYNCPT_DISP0_A (8) -#define NVSYNCPT_DISP1_A (9) -#define NVSYNCPT_AVP_0 (10) +/* FIXME: + * Sync point ids are now split into 2 files. + * 1 if this one and other is in include/linux/nvhost.h + * So if someone decides to add new sync point in future + * please check both the header files + */ #define NVSYNCPT_CSI_VI_0 (11) #define NVSYNCPT_CSI_VI_1 (12) #define NVSYNCPT_VI_ISP_0 (13) @@ -33,23 +36,10 @@ #define NVSYNCPT_VI_ISP_4 (17) #define NVSYNCPT_2D_0 (18) #define NVSYNCPT_2D_1 (19) -#define NVSYNCPT_DISP0_B (20) -#define NVSYNCPT_DISP1_B (21) #define NVSYNCPT_3D (22) #define NVSYNCPT_MPE (23) -#define NVSYNCPT_DISP0_C (24) -#define NVSYNCPT_DISP1_C (25) -#define NVSYNCPT_VBLANK0 (26) -#define NVSYNCPT_VBLANK1 (27) #define NVSYNCPT_MPE_EBM_EOF (28) #define NVSYNCPT_MPE_WR_SAFE (29) -#define NVSYNCPT_DSI (31) - - -/*#define NVSYNCPT_2D_CHANNEL2_0 (20) */ -/*#define NVSYNCPT_2D_CHANNEL2_1 (21) */ -/*#define NVSYNCPT_2D_TINYBLT_WAR (30)*/ -/*#define NVSYNCPT_2D_TINYBLT_RESTORE_CLASS_ID (30)*/ /* sync points that are wholly managed by the client */ #define NVSYNCPTS_CLIENT_MANAGED ( \ @@ -64,14 +54,9 @@ BIT(NVSYNCPT_MPE_EBM_EOF) | BIT(NVSYNCPT_MPE_WR_SAFE) | \ BIT(NVSYNCPT_2D_1) | BIT(NVSYNCPT_AVP_0)) - #define NVWAITBASE_2D_0 (1) #define NVWAITBASE_2D_1 (2) #define NVWAITBASE_3D (3) #define NVWAITBASE_MPE (4) -struct nvhost_master; -int host1x_init_syncpt(struct nvhost_master *host); -int host1x_init_syncpt_support(struct nvhost_master *host); - #endif |