From: Mans Rullgard <mans@mansr.com>
Date: Mon, 7 Jul 2008 00:13:00 +0000 (+0100)
Subject: omapfb: fix display panning
X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=9fec252c96b0e69bcef0afd9cb9dd72b7179c239

omapfb: fix display panning
---

diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index 4e1a8e3..c17371c 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -435,6 +435,8 @@ static inline int _setup_plane(int plane, int channel_out,
 
 	dispc_write_reg(ri_reg[plane], (screen_width - width) * bpp / 8 + 1);
 
+	MOD_REG_FLD(DISPC_CONTROL, 1<<5, 1<<5);
+
 	return height * screen_width * bpp / 8;
 }
 
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 1166a01..3e4959e 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -206,8 +206,8 @@ static int ctrl_change_mode(struct fb_info *fbi)
 	struct omapfb_device *fbdev = plane->fbdev;
 	struct fb_var_screeninfo *var = &fbi->var;
 
-	offset = var->yoffset * fbi->fix.line_length +
-		 var->xoffset * var->bits_per_pixel / 8;
+	offset = (var->yoffset * var->xres_virtual + var->xoffset) *
+		var->bits_per_pixel / 8;
 
 	if (fbdev->ctrl->sync)
 		fbdev->ctrl->sync();
@@ -423,6 +423,8 @@ static void set_fb_fix(struct fb_info *fbi)
 	}
 	fix->accel		= FB_ACCEL_OMAP1610;
 	fix->line_length	= var->xres_virtual * bpp / 8;
+	fix->xpanstep		= 1;
+	fix->ypanstep		= 1;
 }
 
 static int set_color_mode(struct omapfb_plane_struct *plane,
