diff options
| author | Michael I. Gold <gold@nvidia.com> | 2011-03-30 19:07:07 -0700 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2011-05-27 19:53:00 -0700 |
| commit | 805d703deb4d7d6f0d719b07b62c491c95abd0ad (patch) | |
| tree | 39a7201c0c1af57b32f21f5979a087e8f51a6901 | |
| parent | 60c73b63e651413fb8fba2c03b32c21843e8de22 (diff) | |
video: tegra: add support for tiled surfaces
Change-Id: I035a6cd254342fe11f074cb85439f378a7675943
Signed-off-by: Michael I. Gold <gold@nvidia.com>
Reviewed-on: http://git-master/r/33038
Reviewed-by: Brian Anderson <branderson@nvidia.com>
| -rw-r--r-- | drivers/video/tegra/fb.c | 2 | ||||
| -rw-r--r-- | include/video/tegrafb.h | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c index d23199600269..b64c4bb6bb97 100644 --- a/drivers/video/tegra/fb.c +++ b/drivers/video/tegra/fb.c @@ -411,7 +411,7 @@ static int tegra_fb_set_windowattr(struct tegra_fb_info *tegra_fb, win->flags |= TEGRA_WIN_FLAG_INVERT_H; if (flip_win->attr.flags & TEGRA_FB_WIN_FLAG_INVERT_V) win->flags |= TEGRA_WIN_FLAG_INVERT_V; - if (flip_win->attr.layout == TEGRA_FB_WIN_LAYOUT_TILED) + if (flip_win->attr.flags & TEGRA_FB_WIN_FLAG_TILED) win->flags |= TEGRA_WIN_FLAG_TILED; win->fmt = flip_win->attr.pixformat; diff --git a/include/video/tegrafb.h b/include/video/tegrafb.h index 3d75f2dbe0eb..6e765c5b175a 100644 --- a/include/video/tegrafb.h +++ b/include/video/tegrafb.h @@ -51,9 +51,7 @@ #define TEGRA_FB_WIN_FLAG_INVERT_H (1 << 0) #define TEGRA_FB_WIN_FLAG_INVERT_V (1 << 1) - -#define TEGRA_FB_WIN_LAYOUT_LINEAR 0 -#define TEGRA_FB_WIN_LAYOUT_TILED 1 +#define TEGRA_FB_WIN_FLAG_TILED (1 << 2) /* set index to -1 to ignore window data */ struct tegra_fb_windowattr { @@ -61,7 +59,6 @@ struct tegra_fb_windowattr { __u32 buff_id; __u32 flags; __u32 blend; - __u32 layout; __u32 offset; __u32 offset_u; __u32 offset_v; |