diff options
| author | James Thomas <james.thomas@codethink.co.uk> | 2014-08-18 16:33:06 +0100 |
|---|---|---|
| committer | James Thomas <james.thomas@codethink.co.uk> | 2014-08-18 16:33:06 +0100 |
| commit | de3664efca390a8d2fe525a583d17772deee8500 (patch) | |
| tree | 8e036ae4a4120ed011cd2fb1faf9e81ad5655697 /drivers/video/tegra/dc/dc_reg.h | |
| parent | 1f12d2a9854d101f23cce77f6fe8e53814c8a896 (diff) | |
| parent | 123cc68c33ff537748a244f4932640083b4b6825 (diff) | |
| download | linux-de3664efca390a8d2fe525a583d17772deee8500.tar.gz | |
Merge branch 'baserock/james/tegra-3.10' into baserock/arm/tegra-3.10baserock/arm/tegra-3.10
Reviewed by : Paul Sherwood <paul.sherwood@codethink.co.uk>
Reviewed by : Richard Maw <richard.maw@codethink.co.uk>
Merged by : James Thomas <james.thomas@codethink.co.uk>
Diffstat (limited to 'drivers/video/tegra/dc/dc_reg.h')
| -rw-r--r-- | drivers/video/tegra/dc/dc_reg.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/tegra/dc/dc_reg.h b/drivers/video/tegra/dc/dc_reg.h index 8586d32a37ec..3580153ef5d2 100644 --- a/drivers/video/tegra/dc/dc_reg.h +++ b/drivers/video/tegra/dc/dc_reg.h @@ -503,16 +503,16 @@ #define DC_WIN_COLOR_DEPTH 0x703 #define DC_WIN_POSITION 0x704 -#define H_POSITION(x) (((x) & 0xfff) << 0) -#define V_POSITION(x) (((x) & 0xfff) << 16) +#define H_POSITION(x) (((x) & 0x1fff) << 0) +#define V_POSITION(x) (((x) & 0x1fff) << 16) #define DC_WIN_SIZE 0x705 -#define H_SIZE(x) (((x) & 0xfff) << 0) -#define V_SIZE(x) (((x) & 0xfff) << 16) +#define H_SIZE(x) (((x) & 0x1fff) << 0) +#define V_SIZE(x) (((x) & 0x1fff) << 16) #define DC_WIN_PRESCALED_SIZE 0x706 -#define H_PRESCALED_SIZE(x) (((x) & 0x3fff) << 0) -#define V_PRESCALED_SIZE(x) (((x) & 0xfff) << 16) +#define H_PRESCALED_SIZE(x) (((x) & 0x7fff) << 0) +#define V_PRESCALED_SIZE(x) (((x) & 0x1fff) << 16) #define DC_WIN_H_INITIAL_DDA 0x707 #define DC_WIN_V_INITIAL_DDA 0x708 |