From owner-svn-src-all@freebsd.org Fri Nov 6 21:27:55 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 25E502D32FF; Fri, 6 Nov 2020 21:27:55 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CSYQM0dyfz4nmg; Fri, 6 Nov 2020 21:27:55 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 050092B66B; Fri, 6 Nov 2020 21:27:55 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A6LRsjk074622; Fri, 6 Nov 2020 21:27:54 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A6LRsP6074621; Fri, 6 Nov 2020 21:27:54 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <202011062127.0A6LRsP6074621@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Fri, 6 Nov 2020 21:27:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367431 - head/sys/dev/vt/hw/efifb X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/sys/dev/vt/hw/efifb X-SVN-Commit-Revision: 367431 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Nov 2020 21:27:55 -0000 Author: tsoome Date: Fri Nov 6 21:27:54 2020 New Revision: 367431 URL: https://svnweb.freebsd.org/changeset/base/367431 Log: efifb: vt_generate_cons_palette() takes max color, not mask vt_generate_cons_palette() does take max values of RGB component colours, not mask. Also we need to set info->fb_cmsize, or vt_fb_init() will re-initialize the info->fb_cmap. Modified: head/sys/dev/vt/hw/efifb/efifb.c Modified: head/sys/dev/vt/hw/efifb/efifb.c ============================================================================== --- head/sys/dev/vt/hw/efifb/efifb.c Fri Nov 6 19:27:27 2020 (r367430) +++ head/sys/dev/vt/hw/efifb/efifb.c Fri Nov 6 21:27:54 2020 (r367431) @@ -102,6 +102,7 @@ vt_efifb_init(struct vt_device *vd) struct fb_info *info; struct efi_fb *efifb; caddr_t kmdp; + int roff, goff, boff; info = vd->vd_softc; if (info == NULL) @@ -126,10 +127,14 @@ vt_efifb_init(struct vt_device *vd) /* Stride in bytes, not pixels */ info->fb_stride = efifb->fb_stride * (info->fb_bpp / NBBY); + roff = ffs(efifb->fb_mask_red) - 1; + goff = ffs(efifb->fb_mask_green) - 1; + boff = ffs(efifb->fb_mask_blue) - 1; vt_generate_cons_palette(info->fb_cmap, COLOR_FORMAT_RGB, - efifb->fb_mask_red, ffs(efifb->fb_mask_red) - 1, - efifb->fb_mask_green, ffs(efifb->fb_mask_green) - 1, - efifb->fb_mask_blue, ffs(efifb->fb_mask_blue) - 1); + efifb->fb_mask_red >> roff, roff, + efifb->fb_mask_green >> goff, goff, + efifb->fb_mask_blue >> boff, boff); + info->fb_cmsize = NCOLORS; info->fb_size = info->fb_height * info->fb_stride; info->fb_pbase = efifb->fb_addr;