video: tegra: add display inversion support

Change-Id: Ied3851e0cb801f607499493f1e552f42daa97e6b
Signed-off-by: Ari Hirvonen <ahirvonen@nvidia.com>

diff --git a/arch/arm/mach-tegra/include/mach/dc.h b/arch/arm/mach-tegra/include/mach/dc.h
index 9bd26194f0c96263eca8e65ebed228925abf0b0b..8ca6f3da3c8eb582053882e9327310bd343438c2 100644 (file)
--- a/arch/arm/mach-tegra/include/mach/dc.h
+++ b/arch/arm/mach-tegra/include/mach/dc.h
@@ -122,6 +122,8 @@ struct tegra_dc_win {
 #define TEGRA_WIN_FLAG_ENABLED         (1 << 0)
 #define TEGRA_WIN_FLAG_BLEND_PREMULT   (1 << 1)
 #define TEGRA_WIN_FLAG_BLEND_COVERAGE  (1 << 2)
+#define TEGRA_WIN_FLAG_INVERT_H                (1 << 3)
+#define TEGRA_WIN_FLAG_INVERT_V                (1 << 4)
 
 #define TEGRA_WIN_BLEND_FLAGS_MASK \
        (TEGRA_WIN_FLAG_BLEND_PREMULT | TEGRA_WIN_FLAG_BLEND_COVERAGE)

diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 4549670fdff52f65967e86335d938afe84752c1d..e846be96c7e672c602a09e04739d0289dd0f1bda 100644 (file)
--- 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 ab21c6eba0e169fa98661c11402859fc650b4204..43d0fa57937563259267ff318e94d5a8ca5c2fa2 100644 (file)
--- 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 9b70114c9cd107d10da923a13f697285aa7c3b9d..06f399b58d55fe43a6edc00e0dcc5f61657bbe58 100644 (file)
--- 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;

diff --git a/include/video/tegrafb.h b/include/video/tegrafb.h
index b9861bc7953aecc906992431b942cbe633705d2e..01f94c6c2fb776de000f0a2ccdcaaac1ae767098 100644 (file)
--- a/include/video/tegrafb.h
+++ b/include/video/tegrafb.h
@@ -45,14 +45,18 @@
 #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)
 
 /* 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;