diff options
| author | Dima Zavin <dima@android.com> | 2013-04-09 16:05:44 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2013-04-10 22:22:13 -0700 |
| commit | 7738efc2f677583f9b6cd4404154b61ae9baddbd (patch) | |
| tree | 2d609f93b2cbb815a41467d66179c908c3c997a0 /original-kernel-headers | |
| parent | 87356abf320acf3644fae67cda532e667106efa2 (diff) | |
| download | msm8x74-7738efc2f677583f9b6cd4404154b61ae9baddbd.tar.gz | |
8x74: update ion/mdp/kgsl headers to M8626AAAAANLYA0070008
Change-Id: I60bf43be4f6f1aa69d11d703b5b2a90119072058
Signed-off-by: Dima Zavin <dima@android.com>
Diffstat (limited to 'original-kernel-headers')
| -rw-r--r-- | original-kernel-headers/linux/msm_ion.h | 4 | ||||
| -rw-r--r-- | original-kernel-headers/linux/msm_kgsl.h | 2 | ||||
| -rw-r--r-- | original-kernel-headers/linux/msm_mdp.h | 15 |
3 files changed, 17 insertions, 4 deletions
diff --git a/original-kernel-headers/linux/msm_ion.h b/original-kernel-headers/linux/msm_ion.h index ff22e12..95c4e6a 100644 --- a/original-kernel-headers/linux/msm_ion.h +++ b/original-kernel-headers/linux/msm_ion.h @@ -40,6 +40,7 @@ enum ion_heap_ids { ION_CP_MFC_HEAP_ID = 12, ION_CP_WB_HEAP_ID = 16, /* 8660 only */ ION_CAMERA_HEAP_ID = 20, /* 8660 only */ + ION_SYSTEM_CONTIG_HEAP_ID = 21, ION_ADSP_HEAP_ID = 22, ION_PIL1_HEAP_ID = 23, /* Currently used for other PIL images */ ION_SF_HEAP_ID = 24, @@ -90,6 +91,7 @@ enum cp_mem_usage { #define ION_ADSP_HEAP_NAME "adsp" #define ION_VMALLOC_HEAP_NAME "vmalloc" +#define ION_KMALLOC_HEAP_NAME "kmalloc" #define ION_AUDIO_HEAP_NAME "audio" #define ION_SF_HEAP_NAME "sf" #define ION_MM_HEAP_NAME "mm" @@ -163,7 +165,7 @@ struct ion_cp_heap_pdata { enum ion_fixed_position fixed_position; int iommu_map_all; int iommu_2x_map_domain; - ion_virt_addr_t *virt_addr; + void *virt_addr; int (*request_region)(void *); int (*release_region)(void *); void *(*setup_region)(void); diff --git a/original-kernel-headers/linux/msm_kgsl.h b/original-kernel-headers/linux/msm_kgsl.h index 4e62b4f..b7d393f 100644 --- a/original-kernel-headers/linux/msm_kgsl.h +++ b/original-kernel-headers/linux/msm_kgsl.h @@ -20,6 +20,8 @@ #define KGSL_CONTEXT_TRASH_STATE 0x00000020 #define KGSL_CONTEXT_PER_CONTEXT_TS 0x00000040 #define KGSL_CONTEXT_USER_GENERATED_TS 0x00000080 +#define KGSL_CONTEXT_NO_FAULT_TOLERANCE 0x00000200 + #define KGSL_CONTEXT_INVALID 0xffffffff diff --git a/original-kernel-headers/linux/msm_mdp.h b/original-kernel-headers/linux/msm_mdp.h index 7e347ee..5deff7a 100644 --- a/original-kernel-headers/linux/msm_mdp.h +++ b/original-kernel-headers/linux/msm_mdp.h @@ -70,11 +70,11 @@ #define MSMFB_MDP_PP _IOWR(MSMFB_IOCTL_MAGIC, 156, struct msmfb_mdp_pp) #define MSMFB_OVERLAY_VSYNC_CTRL _IOW(MSMFB_IOCTL_MAGIC, 160, unsigned int) #define MSMFB_VSYNC_CTRL _IOW(MSMFB_IOCTL_MAGIC, 161, unsigned int) -#define MSMFB_METADATA_SET _IOW(MSMFB_IOCTL_MAGIC, 162, struct msmfb_metadata) +#define MSMFB_BUFFER_SYNC _IOW(MSMFB_IOCTL_MAGIC, 162, struct mdp_buf_sync) #define MSMFB_OVERLAY_COMMIT _IO(MSMFB_IOCTL_MAGIC, 163) -#define MSMFB_BUFFER_SYNC _IOW(MSMFB_IOCTL_MAGIC, 164, struct mdp_buf_sync) -#define MSMFB_DISPLAY_COMMIT _IOW(MSMFB_IOCTL_MAGIC, 165, \ +#define MSMFB_DISPLAY_COMMIT _IOW(MSMFB_IOCTL_MAGIC, 164, \ struct mdp_display_commit) +#define MSMFB_METADATA_SET _IOW(MSMFB_IOCTL_MAGIC, 165, struct msmfb_metadata) #define MSMFB_METADATA_GET _IOW(MSMFB_IOCTL_MAGIC, 166, struct msmfb_metadata) #define FB_TYPE_3D_PANEL 0x10101010 @@ -95,6 +95,7 @@ enum { MDP_RGB_888, /* RGB 888 planer */ MDP_Y_CRCB_H2V2, /* Y and CrCb, pseudo planer w/ Cr is in MSB */ MDP_YCRYCB_H2V1, /* YCrYCb interleave */ + MDP_CBYCRY_H2V1, /* CbYCrY interleave */ MDP_Y_CRCB_H2V1, /* Y and CrCb, pseduo planer w/ Cr is in MSB */ MDP_Y_CBCR_H2V1, /* Y and CrCb, pseduo planer w/ Cr is in MSB */ MDP_Y_CRCB_H1V2, @@ -638,11 +639,19 @@ struct mdp_buf_sync { }; #define MDP_DISPLAY_COMMIT_OVERLAY 1 +struct mdp_buf_fence { + uint32_t flags; + uint32_t acq_fen_fd_cnt; + int acq_fen_fd[MDP_MAX_FENCE_FD]; + int rel_fen_fd[MDP_MAX_FENCE_FD]; +}; + struct mdp_display_commit { uint32_t flags; uint32_t wait_for_finish; struct fb_var_screeninfo var; + struct mdp_buf_fence buf_fence; }; struct mdp_page_protection { |