From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755927AbcFGRXO (ORCPT ); Tue, 7 Jun 2016 13:23:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49882 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755181AbcFGRXL (ORCPT ); Tue, 7 Jun 2016 13:23:11 -0400 Date: Tue, 7 Jun 2016 13:23:05 -0400 From: Peter Jones To: Max Staudt Cc: plagnioj@jcrosoft.com, tomi.valkeinen@ti.com, eich@suse.de, tiwai@suse.de, agraf@suse.de, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Matt Fleming Subject: Re: [PATCH] [efifb] Fix 16 color palette entry calculation Message-ID: <20160607172304.GD24886@redhat.com> References: <1465307143-21398-1-git-send-email-mstaudt@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1465307143-21398-1-git-send-email-mstaudt@suse.de> User-Agent: Mutt/1.6.1 (2016-04-27) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 07 Jun 2016 17:23:11 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 07, 2016 at 03:45:43PM +0200, Max Staudt wrote: > When using efifb with a 16-bit (5:6:5) visual, fbcon's text is rendered > in the wrong colors - e.g. text gray (#aaaaaa) is rendered as green > (#50bc50) and neighboring pixels have slightly different values > (such as #50bc78). > > The reason is that fbcon loads its 16 color palette through > efifb_setcolreg(), which in turn calculates a 32-bit value to write > into memory for each palette index. > Until now, this code could only handle 8-bit visuals and didn't mask > overlapping values when ORing them. > > With this patch, fbcon displays the correct colors when a qemu VM is > booted in 16-bit mode (in GRUB: "set gfxpayload=800x600x16"). > > Signed-off-by: Max Staudt > --- > drivers/video/fbdev/efifb.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c > index 924bad4..37a37c4 100644 > --- a/drivers/video/fbdev/efifb.c > +++ b/drivers/video/fbdev/efifb.c > @@ -50,9 +50,9 @@ static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green, > return 1; > > if (regno < 16) { > - red >>= 8; > - green >>= 8; > - blue >>= 8; > + red >>= 16 - info->var.red.length; > + green >>= 16 - info->var.green.length; > + blue >>= 16 - info->var.blue.length; > ((u32 *)(info->pseudo_palette))[regno] = > (red << info->var.red.offset) | > (green << info->var.green.offset) | > -- > 2.6.6 Looks right to me. Acked-By: Peter Jones -- Peter