diff options
| author | Robert Morell <rmorell@nvidia.com> | 2011-03-03 14:24:25 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:11 -0800 |
| commit | 3517cb3da60dc94c158c7cf2b39ad83e387a55dd (patch) | |
| tree | cc9def0ad884f75bef4b85e0ed70daf21810e649 /include/video | |
| parent | caec6505db7d6297dbf5767c48f23a346d7ef7be (diff) | |
video: tegra: Remove fbdev SET_NVMAP and FLIP ioctls
This is necessary so that multiple clients can open /dev/fb* at the same
time. The functionaly has been moved to the dc extension device nodes.
bug 818525
Original-Change-Id: I299e060fce3bb9e3cbf976f3d94dbabc4b3f1654
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-on: http://git-master/r/40515
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Rebase-Id: R32908db3f1e344eea13d628f0341600ed698783d
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/tegrafb.h | 68 |
1 files changed, 1 insertions, 67 deletions
diff --git a/include/video/tegrafb.h b/include/video/tegrafb.h index 6e765c5b175a..919661b1a8e0 100644 --- a/include/video/tegrafb.h +++ b/include/video/tegrafb.h @@ -20,79 +20,13 @@ #include <linux/fb.h> #include <linux/types.h> -#include <asm/ioctl.h> - -#define TEGRA_FB_WIN_FMT_P1 0 -#define TEGRA_FB_WIN_FMT_P2 1 -#define TEGRA_FB_WIN_FMT_P4 2 -#define TEGRA_FB_WIN_FMT_P8 3 -#define TEGRA_FB_WIN_FMT_B4G4R4A4 4 -#define TEGRA_FB_WIN_FMT_B5G5R5A 5 -#define TEGRA_FB_WIN_FMT_B5G6R5 6 -#define TEGRA_FB_WIN_FMT_AB5G5R5 7 -#define TEGRA_FB_WIN_FMT_B8G8R8A8 12 -#define TEGRA_FB_WIN_FMT_R8G8B8A8 13 -#define TEGRA_FB_WIN_FMT_B6x2G6x2R6x2A8 14 -#define TEGRA_FB_WIN_FMT_R6x2G6x2B6x2A8 15 -#define TEGRA_FB_WIN_FMT_YCbCr422 16 -#define TEGRA_FB_WIN_FMT_YUV422 17 -#define TEGRA_FB_WIN_FMT_YCbCr420P 18 -#define TEGRA_FB_WIN_FMT_YUV420P 19 -#define TEGRA_FB_WIN_FMT_YCbCr422P 20 -#define TEGRA_FB_WIN_FMT_YUV422P 21 -#define TEGRA_FB_WIN_FMT_YCbCr422R 22 -#define TEGRA_FB_WIN_FMT_YUV422R 23 -#define TEGRA_FB_WIN_FMT_YCbCr422RA 24 -#define TEGRA_FB_WIN_FMT_YUV422RA 25 - -#define TEGRA_FB_WIN_BLEND_NONE 0 -#define TEGRA_FB_WIN_BLEND_PREMULT 1 -#define TEGRA_FB_WIN_BLEND_COVERAGE 2 - -#define TEGRA_FB_WIN_FLAG_INVERT_H (1 << 0) -#define TEGRA_FB_WIN_FLAG_INVERT_V (1 << 1) -#define TEGRA_FB_WIN_FLAG_TILED (1 << 2) - -/* set index to -1 to ignore window data */ -struct tegra_fb_windowattr { - __s32 index; - __u32 buff_id; - __u32 flags; - __u32 blend; - __u32 offset; - __u32 offset_u; - __u32 offset_v; - __u32 stride; - __u32 stride_uv; - __u32 pixformat; - __u32 x; - __u32 y; - __u32 w; - __u32 h; - __u32 out_x; - __u32 out_y; - __u32 out_w; - __u32 out_h; - __u32 z; - __u32 pre_syncpt_id; - __u32 pre_syncpt_val; -}; - -#define TEGRA_FB_FLIP_N_WINDOWS 3 - -struct tegra_fb_flip_args { - struct tegra_fb_windowattr win[TEGRA_FB_FLIP_N_WINDOWS]; - __u32 post_syncpt_id; - __u32 post_syncpt_val; -}; +#include <linux/ioctl.h> struct tegra_fb_modedb { struct fb_var_screeninfo *modedb; __u32 modedb_len; }; -#define FBIO_TEGRA_SET_NVMAP_FD _IOW('F', 0x40, __u32) -#define FBIO_TEGRA_FLIP _IOW('F', 0x41, struct tegra_fb_flip_args) #define FBIO_TEGRA_GET_MODEDB _IOWR('F', 0x42, struct tegra_fb_modedb) #endif |