vt(4): Simplify vt_fb vt_fb_bitblt_bitmap
ClosedPublic
Actions

Authored by emaste on Apr 24 2015, 2:48 AM.

Details

Reviewers

dumbbell
ray

Commits

rS282247: vt: fix vt_fb_bitblt_bitmap mask corruption

Summary

This fixes mask corruption when the bitmap extends off the RHS of the window.

PR 199648
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=199648

Diff Detail

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

emaste updated this revision to Diff 4976.Apr 24 2015, 2:48 AM

emaste retitled this revision from to vt(4): Simplify vt_fb vt_fb_bitblt_bitmap.

emaste updated this object.

emaste edited the test plan for this revision. (Show Details)

emaste added reviewers: dumbbell, ray.

emaste added a subscriber: adrian.Apr 24 2015, 3:09 PM

I just discovered that this does not happen on stable/10. The latent bug here was exposed by r278673, which expanded the mouse pointer beyond 8 pixels wide. See D1801.

dumbbell accepted this revision.Apr 29 2015, 11:49 AM

dumbbell edited edge metadata.

This revision is now accepted and ready to land.Apr 29 2015, 11:49 AM

Closed by commit rS282247: vt: fix vt_fb_bitblt_bitmap mask corruption (authored by emaste). · Explain WhyApr 29 2015, 8:30 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

sys/

dev/

vt/

hw/

fb/

vt_fb.c

54 lines

Diff 4976

View Options

sys/dev/vt/hw/fb/vt_fb.c

	Show First 20 Lines • Show All 258 Lines • ▼ Show 20 Lines
	void			void
	vt_fb_bitblt_bitmap(struct vt_device vd, const struct vt_window vw,			vt_fb_bitblt_bitmap(struct vt_device vd, const struct vt_window vw,
	const uint8_t pattern, const uint8_t mask,			const uint8_t pattern, const uint8_t mask,
	unsigned int width, unsigned int height,			unsigned int width, unsigned int height,
	unsigned int x, unsigned int y, term_color_t fg, term_color_t bg)			unsigned int x, unsigned int y, term_color_t fg, term_color_t bg)
	{			{
	struct fb_info *info;			struct fb_info *info;
	uint32_t fgc, bgc, cc, o;			uint32_t fgc, bgc, cc, o;
	int c, l, bpp, bpl;			int bpp, bpl, xi, yi;
	u_long line;			int bit, byte;
	uint8_t b, m;
	const uint8_t *ch;

	info = vd->vd_softc;			info = vd->vd_softc;
	bpp = FBTYPE_GET_BYTESPP(info);			bpp = FBTYPE_GET_BYTESPP(info);
	fgc = info->fb_cmap[fg];			fgc = info->fb_cmap[fg];
	bgc = info->fb_cmap[bg];			bgc = info->fb_cmap[bg];
	b = m = 0;			bpl = (width + 7) / 8; /* Bytes per source line. */
	bpl = (width + 7) >> 3; /* Bytes per source line. */

	if (info->fb_flags & FB_FLAG_NOWRITE)			if (info->fb_flags & FB_FLAG_NOWRITE)
	return;			return;

	KASSERT((info->fb_vbase != 0), ("Unmapped framebuffer"));			KASSERT((info->fb_vbase != 0), ("Unmapped framebuffer"));

	line = (info->fb_stride * y) + (x * bpp);			/* Bound by right and bottom edges. */
	for (l = 0;			if (y + height > vw->vw_draw_area.tr_end.tp_row) {
	l < height && y + l < vw->vw_draw_area.tr_end.tp_row;			if (y >= vw->vw_draw_area.tr_end.tp_row)
	l++) {			return;
	ch = pattern;			height = vw->vw_draw_area.tr_end.tp_row - y;
	for (c = 0;
	c < width && x + c < vw->vw_draw_area.tr_end.tp_col;
	c++) {
	if (c % 8 == 0)
	b = *ch++;
	else
	b <<= 1;
	if (mask != NULL) {
	if (c % 8 == 0)
	m = *mask++;
	else
	m <<= 1;
	/* Skip pixel write, if mask has no bit set. */
	if ((m & 0x80) == 0)
	continue;
	}			}
	o = line + (c * bpp);			if (x + width > vw->vw_draw_area.tr_end.tp_col) {
	cc = b & 0x80 ? fgc : bgc;			if (x >= vw->vw_draw_area.tr_end.tp_col)
				return;
				width = vw->vw_draw_area.tr_end.tp_col - x;
				}
				for (yi = 0; yi < height; yi++) {
				for (xi = 0; xi < width; xi++) {
				byte = yi * bpl + xi / 8;
				bit = 0x80 >> (xi % 8);
				/* Skip pixel write, if mask bit not set. */
				if (mask != NULL && (mask[byte] & bit) == 0)
				continue;
				o = (y + yi) * info->fb_stride + (x + xi) * bpp;
				cc = pattern[byte] & bit ? fgc : bgc;

	switch(bpp) {			switch(bpp) {
	case 1:			case 1:
	vt_fb_mem_wr1(info, o, cc);			vt_fb_mem_wr1(info, o, cc);
	break;			break;
	case 2:			case 2:
	vt_fb_mem_wr2(info, o, cc);			vt_fb_mem_wr2(info, o, cc);
	break;			break;
	case 3:			case 3:
	/* Packed mode, so unaligned. Byte access. */			/* Packed mode, so unaligned. Byte access. */
	vt_fb_mem_wr1(info, o, (cc >> 16) & 0xff);			vt_fb_mem_wr1(info, o, (cc >> 16) & 0xff);
	vt_fb_mem_wr1(info, o + 1, (cc >> 8) & 0xff);			vt_fb_mem_wr1(info, o + 1, (cc >> 8) & 0xff);
	vt_fb_mem_wr1(info, o + 2, cc & 0xff);			vt_fb_mem_wr1(info, o + 2, cc & 0xff);
	break;			break;
	case 4:			case 4:
	vt_fb_mem_wr4(info, o, cc);			vt_fb_mem_wr4(info, o, cc);
	break;			break;
	default:			default:
	/* panic? */			/* panic? */
	break;			break;
	}			}
	}			}
	line += info->fb_stride;
	pattern += bpl;
	}			}
	}			}

	void			void
	vt_fb_bitblt_text(struct vt_device vd, const struct vt_window vw,			vt_fb_bitblt_text(struct vt_device vd, const struct vt_window vw,
	const term_rect_t *area)			const term_rect_t *area)
	{			{
	unsigned int col, row, x, y;			unsigned int col, row, x, y;
	▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines

vt(4): Simplify vt_fb vt_fb_bitblt_bitmapClosedPublicActions