Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df7df8ab authored by Dennis Munsie's avatar Dennis Munsie Committed by Dave Airlie
Browse files

intelfb -- uses stride alignment of 64 on the 9xx chipsets. 



Signed-off-by: default avatarDennis Munsie <dmunsie@cecropia.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 51d79747

drivers/video/intelfb/intelfb.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,7 @@ 
#define INTEL_REG_SIZE			0x80000

#define INTEL_REG_SIZE			0x80000





#define STRIDE_ALIGNMENT		16

#define STRIDE_ALIGNMENT		16

#define STRIDE_ALIGNMENT_I9XX		64





#define PALETTE_8_ENTRIES		256

#define PALETTE_8_ENTRIES		256

drivers/video/intelfb/intelfbdrv.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1141,6 +1141,9 @@ update_dinfo(struct intelfb_info *dinfo, struct fb_var_screeninfo *var) 
	}

	}





	/* Make sure the line length is a aligned correctly. */

	/* Make sure the line length is a aligned correctly. */

	if (IS_I9XX(dinfo))

		dinfo->pitch = ROUND_UP_TO(dinfo->pitch, STRIDE_ALIGNMENT_I9XX);

	else

		dinfo->pitch = ROUND_UP_TO(dinfo->pitch, STRIDE_ALIGNMENT);

		dinfo->pitch = ROUND_UP_TO(dinfo->pitch, STRIDE_ALIGNMENT);





	if (FIXED_MODE(dinfo))

	if (FIXED_MODE(dinfo))

drivers/video/intelfb/intelfbhw.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -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_start, vsync_end, vblank_start, vblank_end, vtotal, vactive;

	u32 vsync_pol, hsync_pol;

	u32 vsync_pol, hsync_pol;

	u32 *vs, *vb, *vt, *hs, *hb, *ht, *ss, *pipe_conf;

	u32 *vs, *vb, *vt, *hs, *hb, *ht, *ss, *pipe_conf;

	u32 stride_alignment;





	DBG_MSG("intelfbhw_mode_to_hw\n");

	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;

	hw->disp_a_base += dinfo->fb.offset << 12;





	/* Check stride alignment. */

	/* 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",

		WRN_MSG("display stride %d has bad alignment %d\n",

			hw->disp_a_stride, STRIDE_ALIGNMENT);

			hw->disp_a_stride, stride_alignment);

		return 1;

		return 1;

	}

	}