summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorErik Gilling <konkers@android.com>2011-02-03 13:29:42 -0800
committerErik Gilling <konkers@android.com>2011-02-03 13:29:49 -0800
commita979d00287bcd3297bd13a59534073e6faa570c9 (patch)
tree7faff3d9021d64a0ef56d700ae14e8b120e7b5eb /arch
parente445bfcaf1ee8d0a43c6a4fd9e88073fd234ea89 (diff)
parent4a6469b9eb31fdbf9183417152af4ca151ddf230 (diff)
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: I65d011f4a13d99ffc617a807d551d5869b739662
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/include/mach/dc.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/include/mach/dc.h b/arch/arm/mach-tegra/include/mach/dc.h
index 9fe8d6a7e71b..f5a64cba61ae 100644
--- a/arch/arm/mach-tegra/include/mach/dc.h
+++ b/arch/arm/mach-tegra/include/mach/dc.h
@@ -63,6 +63,9 @@ struct tegra_dc_out {
unsigned align;
unsigned depth;
+ unsigned height; /* mm */
+ unsigned width; /* mm */
+
struct tegra_dc_mode *modes;
int n_modes;
@@ -184,4 +187,7 @@ int tegra_dc_sync_windows(struct tegra_dc_win *windows[], int n);
int tegra_dc_set_mode(struct tegra_dc *dc, const struct tegra_dc_mode *mode);
+unsigned tegra_dc_get_out_height(struct tegra_dc *dc);
+unsigned tegra_dc_get_out_width(struct tegra_dc *dc);
+
#endif