intelfb: fixup pitch calculation like X does
Signed-off-by: Dave Airlie <airlied@linux.ie>
This commit is contained in:
parent
3aff13cfb8
commit
3587c50991
|
@ -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;
|
||||
|
|
|
@ -1210,7 +1210,7 @@ intelfbhw_mode_to_hw(struct intelfb_info *dinfo, struct intelfb_hwstate *hw,
|
|||
*ss = (hactive << SRC_SIZE_HORIZ_SHIFT) |
|
||||
(vactive << SRC_SIZE_VERT_SHIFT);
|
||||
|
||||
hw->disp_a_stride = var->xres_virtual * var->bits_per_pixel / 8;
|
||||
hw->disp_a_stride = dinfo->pitch;
|
||||
DBG_MSG("pitch is %d\n", hw->disp_a_stride);
|
||||
|
||||
hw->disp_a_base = hw->disp_a_stride * var->yoffset +
|
||||
|
|
Loading…
Reference in a new issue