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/video/samsung_extdisp/s3cfb_extdsp.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/video/samsung_extdisp/s3cfb_extdsp.h')
-rw-r--r-- | drivers/video/samsung_extdisp/s3cfb_extdsp.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/drivers/video/samsung_extdisp/s3cfb_extdsp.h b/drivers/video/samsung_extdisp/s3cfb_extdsp.h index 964c549..99f134c 100644 --- a/drivers/video/samsung_extdisp/s3cfb_extdsp.h +++ b/drivers/video/samsung_extdisp/s3cfb_extdsp.h @@ -50,6 +50,12 @@ enum s3cfb_extdsp_mem_owner_t { DMA_MEM_OTHER = 2, }; +enum s3cfb_extdsp_buf_status_t { + BUF_FREE = 0, + BUF_ACTIVE = 1, + BUF_LOCKED = 2, +}; + struct s3cfb_extdsp_lcd_polarity { int rise_vclk; int inv_hsync; @@ -73,6 +79,12 @@ struct s3cfb_extdsp_time_stamp { struct timeval time_marker; }; +struct s3cfb_extdsp_buf_list { + unsigned int phys_addr; + struct timeval time_marker; + int buf_status; +}; + struct s3cfb_extdsp_global { struct mutex lock; struct device *dev; @@ -90,8 +102,9 @@ struct s3cfb_extdsp_global { struct early_suspend early_suspend; struct wake_lock idle_lock; #endif - struct s3cfb_extdsp_time_stamp time_stamp[CONFIG_FB_S5P_EXTDSP_NR_BUFFERS]; + struct s3cfb_extdsp_buf_list buf_list[CONFIG_FB_S5P_EXTDSP_NR_BUFFERS]; unsigned int enabled_tz; + unsigned int lock_cnt; }; struct s3cfb_extdsp_window { @@ -105,6 +118,7 @@ struct s3cfb_extdsp_window { int lock_status; int lock_buf_idx; unsigned int lock_buf_offset; + unsigned int free_buf_offset; }; struct s3cfb_extdsp_user_window { @@ -131,6 +145,10 @@ struct s3cfb_extdsp_user_window { struct s3cfb_extdsp_time_stamp) #define S3CFB_EXTDSP_GET_TZ_MODE _IOW ('F', 325, unsigned int) #define S3CFB_EXTDSP_SET_TZ_MODE _IOW ('F', 326, unsigned int) +#define S3CFB_EXTDSP_GET_LOCKED_NUMBER _IOW ('F', 327, unsigned int) +#define S3CFB_EXTDSP_LOCK_AND_GET_BUF _IOW ('F', 328, \ + struct s3cfb_extdsp_buf_list) +#define S3CFB_EXTDSP_GET_FREE_BUFFER _IOW('F', 329, unsigned int) extern struct fb_ops s3cfb_extdsp_ops; extern inline struct s3cfb_extdsp_global *get_extdsp_global(int id); |