diff options
| author | Ari Hirvonen <ahirvonen@nvidia.com> | 2011-03-02 02:06:27 +0200 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2011-05-24 13:55:12 -0700 |
| commit | 31d7b7582026fc16c5ca29908ff33e5af2a2510f (patch) | |
| tree | af85e5f8805ec9acc2715479ffbc293ca27dc7f2 /drivers | |
| parent | 789333436de3878b2ea878d4c2c030af7ed481ce (diff) | |
video: tegra: add display inversion support
Change-Id: Ied3851e0cb801f607499493f1e552f42daa97e6b
Signed-off-by: Ari Hirvonen <ahirvonen@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/tegra/dc/dc.c | 25 | ||||
| -rw-r--r-- | drivers/video/tegra/dc/dc_reg.h | 4 | ||||
| -rw-r--r-- | drivers/video/tegra/fb.c | 4 |
3 files changed, 28 insertions, 5 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index 4549670fdff5..e846be96c7e6 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -500,6 +500,10 @@ int tegra_dc_update_windows(struct tegra_dc_win *windows[], int n) struct tegra_dc_win *win = windows[i]; unsigned h_dda; unsigned v_dda; + unsigned h_offset; + unsigned v_offset; + bool invert_h = (win->flags & TEGRA_WIN_FLAG_INVERT_H) != 0; + bool invert_v = (win->flags & TEGRA_WIN_FLAG_INVERT_V) != 0; bool yuvp = tegra_dc_is_yuv_planar(win->fmt); if (win->z != dc->blend.z[win->idx]) { @@ -567,9 +571,19 @@ int tegra_dc_update_windows(struct tegra_dc_win *windows[], int n) DC_WIN_LINE_STRIDE); } - tegra_dc_writel(dc, win->x * tegra_dc_fmt_bpp(win->fmt) / 8, - DC_WINBUF_ADDR_H_OFFSET); - tegra_dc_writel(dc, win->y, DC_WINBUF_ADDR_V_OFFSET); + h_offset = win->x; + if (invert_h) { + h_offset += win->w - 1; + } + h_offset *= tegra_dc_fmt_bpp(win->fmt) / 8; + + v_offset = win->y; + if (invert_v) { + v_offset += win->h - 1; + } + + tegra_dc_writel(dc, h_offset, DC_WINBUF_ADDR_H_OFFSET); + tegra_dc_writel(dc, v_offset, DC_WINBUF_ADDR_V_OFFSET); val = WIN_ENABLE; if (yuvp) @@ -582,6 +596,11 @@ int tegra_dc_update_windows(struct tegra_dc_win *windows[], int n) if (win->h != win->out_h) val |= V_FILTER_ENABLE; + if (invert_h) + val |= H_DIRECTION_DECREMENT; + if (invert_v) + val |= V_DIRECTION_DECREMENT; + tegra_dc_writel(dc, val, DC_WIN_WIN_OPTIONS); win->dirty = no_vsync ? 0 : 1; diff --git a/drivers/video/tegra/dc/dc_reg.h b/drivers/video/tegra/dc/dc_reg.h index ab21c6eba0e1..43d0fa579375 100644 --- a/drivers/video/tegra/dc/dc_reg.h +++ b/drivers/video/tegra/dc/dc_reg.h @@ -332,9 +332,9 @@ #define DC_WIN_V_FILTER_P(x) (0x619 + (x)) #define DC_WIN_WIN_OPTIONS 0x700 #define H_DIRECTION_INCREMENT (0 << 0) -#define H_DIRECTION_DECREMENTT (1 << 0) +#define H_DIRECTION_DECREMENT (1 << 0) #define V_DIRECTION_INCREMENT (0 << 2) -#define V_DIRECTION_DECREMENTT (1 << 2) +#define V_DIRECTION_DECREMENT (1 << 2) #define COLOR_EXPAND (1 << 6) #define H_FILTER_ENABLE (1 << 8) #define V_FILTER_ENABLE (1 << 10) diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c index 9b70114c9cd1..06f399b58d55 100644 --- a/drivers/video/tegra/fb.c +++ b/drivers/video/tegra/fb.c @@ -387,6 +387,10 @@ static int tegra_fb_set_windowattr(struct tegra_fb_info *tegra_fb, win->flags |= TEGRA_WIN_FLAG_BLEND_PREMULT; else if (flip_win->attr.blend == TEGRA_FB_WIN_BLEND_COVERAGE) win->flags |= TEGRA_WIN_FLAG_BLEND_COVERAGE; + if (flip_win->attr.flags & TEGRA_FB_WIN_FLAG_INVERT_H) + 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; win->fmt = flip_win->attr.pixformat; win->x = flip_win->attr.x; win->y = flip_win->attr.y; |