diff options
author | Erik Gilling <konkers@android.com> | 2011-02-03 13:15:50 -0800 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:36:57 -0800 |
commit | 1321ef14671f996a7bd893cb2f3ffa4cf36b5519 (patch) | |
tree | f9803155b75f700d087e0efa77fccd09a5433622 /drivers | |
parent | 596bae8ed31502518214796a4e91bed9007a78f4 (diff) |
video: tegra: add height/width to dc and fb
Change-Id: I22c280928079af04263375fce63a87776588a457
Signed-off-by: Erik Gilling <konkers@android.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/tegra/dc/dc.c | 17 | ||||
-rw-r--r-- | drivers/video/tegra/fb.c | 5 |
2 files changed, 19 insertions, 3 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index 3be602658c31..cee7f2543323 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -799,6 +799,23 @@ static void tegra_dc_set_out(struct tegra_dc *dc, struct tegra_dc_out *out) } +unsigned tegra_dc_get_out_height(struct tegra_dc *dc) +{ + if (dc->out) + return dc->out->height; + else + return 0; +} +EXPORT_SYMBOL(tegra_dc_get_out_height); + +unsigned tegra_dc_get_out_width(struct tegra_dc *dc) +{ + if (dc->out) + return dc->out->width; + else + return 0; +} +EXPORT_SYMBOL(tegra_dc_get_out_width); static irqreturn_t tegra_dc_irq(int irq, void *ptr) { diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c index 4f8a5c0270f7..1f0b967acd89 100644 --- a/drivers/video/tegra/fb.c +++ b/drivers/video/tegra/fb.c @@ -745,9 +745,8 @@ struct tegra_fb_info *tegra_fb_register(struct nvhost_device *ndev, info->var.yres_virtual = fb_data->yres * 2; info->var.bits_per_pixel = fb_data->bits_per_pixel; info->var.activate = FB_ACTIVATE_VBL; - /* TODO: fill in the following by querying the DC */ - info->var.height = -1; - info->var.width = -1; + info->var.height = tegra_dc_get_out_height(dc); + info->var.width = tegra_dc_get_out_width(dc); info->var.pixclock = 0; info->var.left_margin = 0; info->var.right_margin = 0; |