aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/intelfb/intelfbhw.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/intelfb/intelfbhw.c')
-rw-r--r--drivers/video/intelfb/intelfbhw.c7
1 files changed, 5 insertions, 2 deletions
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,
1005 u32 vsync_start, vsync_end, vblank_start, vblank_end, vtotal, vactive; 1005 u32 vsync_start, vsync_end, vblank_start, vblank_end, vtotal, vactive;
1006 u32 vsync_pol, hsync_pol; 1006 u32 vsync_pol, hsync_pol;
1007 u32 *vs, *vb, *vt, *hs, *hb, *ht, *ss, *pipe_conf; 1007 u32 *vs, *vb, *vt, *hs, *hb, *ht, *ss, *pipe_conf;
1008 u32 stride_alignment;
1008 1009
1009 DBG_MSG("intelfbhw_mode_to_hw\n"); 1010 DBG_MSG("intelfbhw_mode_to_hw\n");
1010 1011
@@ -1216,9 +1217,11 @@ intelfbhw_mode_to_hw(struct intelfb_info *dinfo, struct intelfb_hwstate *hw,
1216 hw->disp_a_base += dinfo->fb.offset << 12; 1217 hw->disp_a_base += dinfo->fb.offset << 12;
1217 1218
1218 /* Check stride alignment. */ 1219 /* Check stride alignment. */
1219 if (hw->disp_a_stride % STRIDE_ALIGNMENT != 0) { 1220 stride_alignment = IS_I9XX(dinfo) ? STRIDE_ALIGNMENT_I9XX :
1221 STRIDE_ALIGNMENT;
1222 if (hw->disp_a_stride % stride_alignment != 0) {
1220 WRN_MSG("display stride %d has bad alignment %d\n", 1223 WRN_MSG("display stride %d has bad alignment %d\n",
1221 hw->disp_a_stride, STRIDE_ALIGNMENT); 1224 hw->disp_a_stride, stride_alignment);
1222 return 1; 1225 return 1;
1223 } 1226 }
1224 1227