diff options
author | Dave Airlie <airlied@linux.ie> | 2006-04-03 14:46:55 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-04-03 14:46:55 +1000 |
commit | 3587c50991b96fee2d26942f380e36e4f40fad71 (patch) | |
tree | 1266f26fa14b96e540a1388968a030edf264894d /drivers/video/intelfb/intelfbdrv.c | |
parent | 3aff13cfb8810cc228e8fdcb92103ed0b11ee38e (diff) | |
download | blackbird-op-linux-3587c50991b96fee2d26942f380e36e4f40fad71.tar.gz blackbird-op-linux-3587c50991b96fee2d26942f380e36e4f40fad71.zip |
intelfb: fixup pitch calculation like X does
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/video/intelfb/intelfbdrv.c')
-rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index 9e83664e345c..2aba6a4a9eae 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c @@ -1164,16 +1164,33 @@ intelfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) struct fb_var_screeninfo v; struct intelfb_info *dinfo; static int first = 1; + int i; + /* Good pitches to allow tiling. Don't care about pitches < 1024. */ + static const int pitches[] = { + 128 * 8, + 128 * 16, + 128 * 32, + 128 * 64, + 0 + }; DBG_MSG("intelfb_check_var: accel_flags is %d\n", var->accel_flags); dinfo = GET_DINFO(info); + /* update the pitch */ if (intelfbhw_validate_mode(dinfo, var) != 0) return -EINVAL; v = *var; + for (i = 0; pitches[i] != 0; i++) { + if (pitches[i] >= v.xres_virtual) { + v.xres_virtual = pitches[i]; + break; + } + } + /* Check for a supported bpp. */ if (v.bits_per_pixel <= 8) { v.bits_per_pixel = 8; |