diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/media/video/samsung/mfc5x/mfc_buf.h | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/media/video/samsung/mfc5x/mfc_buf.h')
| -rw-r--r-- | drivers/media/video/samsung/mfc5x/mfc_buf.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/video/samsung/mfc5x/mfc_buf.h b/drivers/media/video/samsung/mfc5x/mfc_buf.h index 7fafb94..28ef0d6 100644 --- a/drivers/media/video/samsung/mfc5x/mfc_buf.h +++ b/drivers/media/video/samsung/mfc5x/mfc_buf.h @@ -142,6 +142,10 @@ struct mfc_alloc_buffer { unsigned char *addr; /* kernel virtual address space */ unsigned int type; /* buffer type */ int owner; /* instance context id */ +#if defined(CONFIG_DMA_CMA) && defined(CONFIG_USE_MFC_CMA) + struct device *dev; + dma_addr_t dma_addr; +#endif #if defined(CONFIG_VIDEO_MFC_VCM_UMP) struct vcm_mmu_res *vcm_s; struct vcm_res *vcm_k; @@ -159,6 +163,9 @@ struct mfc_alloc_buffer { * when user use mmap, * user can access whole of memory by offset. */ +#ifdef CONFIG_SLP_DMABUF + int dmabuf_fd; +#endif #endif }; @@ -187,6 +194,9 @@ unsigned long mfc_get_buf_real(int owner, unsigned int key); unsigned char *mfc_get_buf_addr(int owner, unsigned char *user); unsigned char *_mfc_get_buf_addr(int owner, unsigned char *user); */ +#ifdef CONFIG_SLP_DMABUF +int mfc_get_buf_dmabuf(unsigned long real); +#endif #ifdef CONFIG_VIDEO_MFC_VCM_UMP unsigned int mfc_vcm_bind_from_others(struct mfc_inst_ctx *ctx, struct mfc_buf_alloc_arg *args, int flag); |