diff options
| author | Dennis Munsie <dmunsie@cecropia.com> | 2006-05-27 18:17:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-05-27 18:17:52 +1000 |
| commit | df7df8ab7b38ca80bbaf5ffafd401d6c739fd45f (patch) | |
| tree | 83f7f6768ac730231386fdbf70f30c165d3cb134 /drivers/video/intelfb/intelfbhw.c | |
| parent | 51d797474f87b375819d084f7583a2864c5656c4 (diff) | |
| download | kernel_samsung_smdk4412-df7df8ab7b38ca80bbaf5ffafd401d6c739fd45f.zip kernel_samsung_smdk4412-df7df8ab7b38ca80bbaf5ffafd401d6c739fd45f.tar.gz kernel_samsung_smdk4412-df7df8ab7b38ca80bbaf5ffafd401d6c739fd45f.tar.bz2 | |
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>
Diffstat (limited to 'drivers/video/intelfb/intelfbhw.c')
| -rw-r--r-- | drivers/video/intelfb/intelfbhw.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index 05f0a3c..eba8f8f 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; } |