intelfb -- uses stride alignment of 64 on the 9xx chipsets.

Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>

3 files changed, 10 insertions, 3 deletions

diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h
index 631a3a95de40..469b06c29180 100644
--- a/drivers/video/intelfb/intelfb.h
+++ b/drivers/video/intelfb/intelfb.h
@@ -59,6 +59,7 @@
 #define INTEL_REG_SIZE                  0x80000
 
 #define STRIDE_ALIGNMENT                16
+#define STRIDE_ALIGNMENT_I9XX           64
 
 #define PALETTE_8_ENTRIES               256
 
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 2aba6a4a9eae..b92bc908335e 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -1141,7 +1141,10 @@ update_dinfo(struct intelfb_info *dinfo, struct fb_var_screeninfo *var)
         }
 
         /* Make sure the line length is a aligned correctly. */
-        dinfo->pitch = ROUND_UP_TO(dinfo->pitch, STRIDE_ALIGNMENT);
+        if (IS_I9XX(dinfo))
+                dinfo->pitch = ROUND_UP_TO(dinfo->pitch, STRIDE_ALIGNMENT_I9XX);
+        else
+                dinfo->pitch = ROUND_UP_TO(dinfo->pitch, STRIDE_ALIGNMENT);
 
         if (FIXED_MODE(dinfo))
                 dinfo->pitch = dinfo->initial_pitch;
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 05f0a3c9440f..eba8f8f6a4d4 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -1005,6 +1005,7 @@ intelfbhw_mode_to_hw(struct intelfb_info *dinfo, struct intelfb_hwstate *hw,
         u32 vsync_start, vsync_end, vblank_start, vblank_end, vtotal, vactive;
         u32 vsync_pol, hsync_pol;
         u32 *vs, *vb, *vt, *hs, *hb, *ht, *ss, *pipe_conf;
+        u32 stride_alignment;
 
         DBG_MSG("intelfbhw_mode_to_hw\n");
 
@@ -1216,9 +1217,11 @@ intelfbhw_mode_to_hw(struct intelfb_info *dinfo, struct intelfb_hwstate *hw,
         hw->disp_a_base += dinfo->fb.offset << 12;
 
         /* Check stride alignment. */
-        if (hw->disp_a_stride % STRIDE_ALIGNMENT != 0) {
+        stride_alignment = IS_I9XX(dinfo) ? STRIDE_ALIGNMENT_I9XX :
+                                            STRIDE_ALIGNMENT;
+        if (hw->disp_a_stride % stride_alignment != 0) {
                 WRN_MSG("display stride %d has bad alignment %d\n",
-                        hw->disp_a_stride, STRIDE_ALIGNMENT);
+                        hw->disp_a_stride, stride_alignment);
                 return 1;
         }