summaryrefslogtreecommitdiffstats
path: root/drivers/video/intelfb/intelfbdrv.c
diff options
context:
space:
mode:
authorDennis Munsie <dmunsie@cecropia.com>2006-05-27 10:17:52 +0200
committerDave Airlie <airlied@linux.ie>2006-05-27 10:17:52 +0200
commitdf7df8ab7b38ca80bbaf5ffafd401d6c739fd45f (patch)
tree83f7f6768ac730231386fdbf70f30c165d3cb134 /drivers/video/intelfb/intelfbdrv.c
parentintelfb: some cleanups for intelfbhw (diff)
downloadlinux-df7df8ab7b38ca80bbaf5ffafd401d6c739fd45f.tar.xz
linux-df7df8ab7b38ca80bbaf5ffafd401d6c739fd45f.zip
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/intelfbdrv.c')
-rw-r--r--drivers/video/intelfb/intelfbdrv.c5
1 files changed, 4 insertions, 1 deletions
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;