diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-05-25 14:41:49 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-05-25 14:41:49 +0530 |
| commit | 0ddd2fe3f85f8581e9fed54bd5fdfe6341fdab50 (patch) | |
| tree | c3f13b912a6a13e239e012f02b815b1d8392f626 /include | |
| parent | 7746a73b787ca8956d0df66c1b8e11c0343d54fe (diff) | |
| parent | e70a45d0e17f752d11d1d6bc8df29fdf12b80196 (diff) | |
Merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/include/mach/dc.h
drivers/video/tegra/dc/dc.c
Change-Id: I88eb56972632ec9c87c6ac81c14c0cadb689415c
Diffstat (limited to 'include')
| -rw-r--r-- | include/video/tegrafb.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/video/tegrafb.h b/include/video/tegrafb.h index b9861bc7953a..6e765c5b175a 100644 --- a/include/video/tegrafb.h +++ b/include/video/tegrafb.h @@ -45,14 +45,19 @@ #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_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; |