Attachment 159892 Details for Bug 193745 – Proposed fix and cleanups

[patch] Proposed fix and cleanups

efifb.diff (text/plain), 1.60 KB, created by Marcel Moolenaar on 2015-08-15 06:01:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel Moolenaar

Created: 2015-08-15 06:01:05 UTC

Size: 1.60 KB

patch

obsolete

>Index: sys/dev/vt/hw/efifb/efifb.c
>===================================================================
>--- sys/dev/vt/hw/efifb/efifb.c	(revision 286795)
>+++ sys/dev/vt/hw/efifb/efifb.c	(working copy)
>@@ -96,7 +96,6 @@
> static int
> vt_efifb_init(struct vt_device *vd)
> {
>-	int		depth, d;
> 	struct fb_info	*info;
> 	struct efi_fb	*efifb;
> 	caddr_t		kmdp;
>@@ -116,16 +115,12 @@
> 	info->fb_height = efifb->fb_height;
> 	info->fb_width = efifb->fb_width;
> 
>-	depth = fls(efifb->fb_mask_red);
>-	d = fls(efifb->fb_mask_green);
>-	depth = d > depth ? d : depth;
>-	d = fls(efifb->fb_mask_blue);
>-	depth = d > depth ? d : depth;
>-	d = fls(efifb->fb_mask_reserved);
>-	depth = d > depth ? d : depth;
>-	info->fb_depth = depth;
>+	info->fb_depth = fls(efifb->fb_mask_red | efifb->fb_mask_green |
>+	    efifb->fb_mask_blue | efifb->fb_mask_reserved);
>+	info->fb_bpp = info->fb_depth;
> 
>-	info->fb_stride = efifb->fb_stride * (depth / 8);
>+	/* Stride in bytes, not pixels */
>+	info->fb_stride = efifb->fb_stride * (info->fb_bpp >> 3);
> 
> 	vt_generate_cons_palette(info->fb_cmap, COLOR_FORMAT_RGB,
> 	    efifb->fb_mask_red, ffs(efifb->fb_mask_red) - 1,
>@@ -137,16 +132,6 @@
> 	info->fb_vbase = (intptr_t)pmap_mapdev_attr(info->fb_pbase,
> 	    info->fb_size, VM_MEMATTR_WRITE_COMBINING);
> 
>-	/* Get pixel storage size. */
>-	info->fb_bpp = info->fb_stride / info->fb_width * 8;
>-
>-	/*
>-	 * Early FB driver work with static window buffer, so reduce to minimal
>-	 * size, buffer or screen.
>-	 */
>-	info->fb_width = MIN(info->fb_width, VT_FB_DEFAULT_WIDTH);
>-	info->fb_height = MIN(info->fb_height, VT_FB_DEFAULT_HEIGHT);
>-
> 	vt_fb_init(vd);
> 
> 	return (CN_INTERNAL);

Actions: View | Diff

Attachments on bug 193745: 147441 | 147874 | 147944 | 159892 | 159937