D56537.id175941.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D56537.id175941.diff
View Options

	diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
	--- a/sys/dev/vt/vt_core.c
	+++ b/sys/dev/vt/vt_core.c
	@@ -1687,16 +1687,20 @@
	if (!(vd->vd_flags & VDF_TEXTMODE) && (boothowto & RB_MUTE)) {
	if (rebooting == 1) {
	si = MD_FETCH(preload_kmdp, MODINFOMD_SHTDWNSPLASH, struct splash_info *);
	- vd->vd_driver->vd_blank(vd, TC_BLACK);
	+ if (vd->vd_driver->vd_blank != NULL)
	+ vd->vd_driver->vd_blank(vd, TC_BLACK);
	} else {
	si = MD_FETCH(preload_kmdp, MODINFOMD_SPLASH, struct splash_info *);
	}
	if (si == NULL) {
	top = (vd->vd_height - vt_logo_height) / 2;
	left = (vd->vd_width - vt_logo_width) / 2;
	- vd->vd_driver->vd_bitblt_bmp(vd, vd->vd_curwindow,
	- vt_logo_image, NULL, vt_logo_width, vt_logo_height,
	- left, top, TC_WHITE, TC_BLACK);
	+ if (vd->vd_driver->vd_bitblt_bmp != NULL) {
	+ vd->vd_driver->vd_bitblt_bmp(vd,
	+ vd->vd_curwindow, vt_logo_image, NULL,
	+ vt_logo_width, vt_logo_height, left, top,
	+ TC_WHITE, TC_BLACK);
	+ }
	} else {
	if (si->si_depth != 4)
	return;
	@@ -1704,9 +1708,11 @@
	image = roundup2(image, 8);
	top = (vd->vd_height - si->si_height) / 2;
	left = (vd->vd_width - si->si_width) / 2;
	- vd->vd_driver->vd_bitblt_argb(vd, vd->vd_curwindow,
	- (unsigned char *)image, si->si_width, si->si_height,
	- left, top);
	+ if (vd->vd_driver->vd_bitblt_argb != NULL) {
	+ vd->vd_driver->vd_bitblt_argb(vd,
	+ vd->vd_curwindow, (unsigned char *)image,
	+ si->si_width, si->si_height, left, top);
	+ }
	}
	vd->vd_flags \|= VDF_SPLASH;
	}