aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-02-25 06:04:06 -0500
committerThierry Reding <treding@nvidia.com>2014-06-05 17:09:17 -0400
commiteba66501ac41b717d60bebc6f9ae0f3195c6c422 (patch)
tree5d5b05e9f6ecb263aa0a835173185be3d9bdec8b
parenta82752e19954cb741a7a582482e5c05c50d7acd3 (diff)
drm/tegra: dc - Rename INVERT_V to V_DIRECTION
V_DIRECTION is the name of the field in the documentation, so use that for consistency. Also add the H_DIRECTION field for completeness. Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/drm/tegra/dc.c6
-rw-r--r--drivers/gpu/drm/tegra/dc.h3
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index f9cd2474403b..2571082a46eb 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -181,13 +181,13 @@ static int tegra_dc_set_base(struct tegra_dc *dc, int x, int y,
181 /* make sure bottom-up buffers are properly displayed */ 181 /* make sure bottom-up buffers are properly displayed */
182 if (tegra_fb_is_bottom_up(fb)) { 182 if (tegra_fb_is_bottom_up(fb)) {
183 value = tegra_dc_readl(dc, DC_WIN_WIN_OPTIONS); 183 value = tegra_dc_readl(dc, DC_WIN_WIN_OPTIONS);
184 value |= INVERT_V; 184 value |= V_DIRECTION;
185 tegra_dc_writel(dc, value, DC_WIN_WIN_OPTIONS); 185 tegra_dc_writel(dc, value, DC_WIN_WIN_OPTIONS);
186 186
187 v_offset += fb->height - 1; 187 v_offset += fb->height - 1;
188 } else { 188 } else {
189 value = tegra_dc_readl(dc, DC_WIN_WIN_OPTIONS); 189 value = tegra_dc_readl(dc, DC_WIN_WIN_OPTIONS);
190 value &= ~INVERT_V; 190 value &= ~V_DIRECTION;
191 tegra_dc_writel(dc, value, DC_WIN_WIN_OPTIONS); 191 tegra_dc_writel(dc, value, DC_WIN_WIN_OPTIONS);
192 } 192 }
193 193
@@ -578,7 +578,7 @@ int tegra_dc_setup_window(struct tegra_dc *dc, unsigned int index,
578 } 578 }
579 579
580 if (window->bottom_up) 580 if (window->bottom_up)
581 value |= INVERT_V; 581 value |= V_DIRECTION;
582 582
583 tegra_dc_writel(dc, value, DC_WIN_WIN_OPTIONS); 583 tegra_dc_writel(dc, value, DC_WIN_WIN_OPTIONS);
584 584
diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/drm/tegra/dc.h
index c94101494826..44e31aefe899 100644
--- a/drivers/gpu/drm/tegra/dc.h
+++ b/drivers/gpu/drm/tegra/dc.h
@@ -312,7 +312,8 @@
312#define DC_WIN_CSC_KVB 0x618 312#define DC_WIN_CSC_KVB 0x618
313 313
314#define DC_WIN_WIN_OPTIONS 0x700 314#define DC_WIN_WIN_OPTIONS 0x700
315#define INVERT_V (1 << 2) 315#define H_DIRECTION (1 << 0)
316#define V_DIRECTION (1 << 2)
316#define COLOR_EXPAND (1 << 6) 317#define COLOR_EXPAND (1 << 6)
317#define CSC_ENABLE (1 << 18) 318#define CSC_ENABLE (1 << 18)
318#define WIN_ENABLE (1 << 30) 319#define WIN_ENABLE (1 << 30)