summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/fb.c
diff options
context:
space:
mode:
authorErik Gilling <konkers@android.com>2010-10-11 15:36:11 -0700
committerErik Gilling <konkers@android.com>2010-10-12 18:07:15 -0700
commit22adcfad507db0e5af942a0fac7d2928306c3db0 (patch)
treeda637c34702138c23b4502bd8c37072a4fcb001d /drivers/video/tegra/fb.c
parent19eb4599aaca491cbe981000357fc709a9b2a005 (diff)
Revert "video: tegra: add utility function to compute framebuffer stride"
This reverts commit 10c751b8f5bb78f674d4939b47be933934bb23dd. Change-Id: I236ddcd531d3ca17c8727cac84e6d2aa6e27dbe1
Diffstat (limited to 'drivers/video/tegra/fb.c')
-rw-r--r--drivers/video/tegra/fb.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c
index 9e5bb1639554..87ba58b06cd1 100644
--- a/drivers/video/tegra/fb.c
+++ b/drivers/video/tegra/fb.c
@@ -148,10 +148,7 @@ static int tegra_fb_set_par(struct fb_info *info)
default:
return -EINVAL;
}
-
- info->fix.line_length = tegra_dc_compute_stride(var->xres,
- var->bits_per_pixel, TEGRA_WIN_LAYOUT_PITCH);
- tegra_fb->win->stride = info->fix.line_length;
+ info->fix.line_length = var->xres * var->bits_per_pixel / 8;
if (var->pixclock) {
struct tegra_dc_mode mode;
@@ -681,9 +678,7 @@ struct tegra_fb_info *tegra_fb_register(struct nvhost_device *ndev,
win->z = 0;
win->phys_addr = fb_phys;
win->virt_addr = fb_base;
- win->layout = TEGRA_WIN_LAYOUT_PITCH;
- win->stride = tegra_dc_compute_stride(fb_data->xres,
- fb_data->bits_per_pixel, win->layout);
+ win->stride = fb_data->xres * fb_data->bits_per_pixel / 8;
win->flags = TEGRA_WIN_FLAG_ENABLED;
if (fb_mem)