All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Jones <pjones@redhat.com>
To: Max Staudt <mstaudt@suse.de>
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 <matt@codeblueprint.co.uk>
Subject: Re: [PATCH] [efifb] Fix 16 color palette entry calculation
Date: Tue, 07 Jun 2016 17:23:05 +0000	[thread overview]
Message-ID: <20160607172304.GD24886@redhat.com> (raw)
In-Reply-To: <1465307143-21398-1-git-send-email-mstaudt@suse.de>

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€0x600x16").
> 
> Signed-off-by: Max Staudt <mstaudt@suse.de>
> ---
>  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 <pjones@redhat.com>

-- 
  Peter

WARNING: multiple messages have this Message-ID (diff)
From: Peter Jones <pjones@redhat.com>
To: Max Staudt <mstaudt@suse.de>
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 <matt@codeblueprint.co.uk>
Subject: Re: [PATCH] [efifb] Fix 16 color palette entry calculation
Date: Tue, 7 Jun 2016 13:23:05 -0400	[thread overview]
Message-ID: <20160607172304.GD24886@redhat.com> (raw)
In-Reply-To: <1465307143-21398-1-git-send-email-mstaudt@suse.de>

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 <mstaudt@suse.de>
> ---
>  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 <pjones@redhat.com>

-- 
  Peter

  parent reply	other threads:[~2016-06-07 17:23 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-07 13:45 [PATCH] [efifb] Fix 16 color palette entry calculation Max Staudt
2016-06-07 13:45 ` Max Staudt
2016-06-07 16:41 ` Greg KH
2016-06-07 16:41   ` Greg KH
2016-06-07 17:23 ` Peter Jones [this message]
2016-06-07 17:23   ` Peter Jones
2016-06-08 12:43   ` Matt Fleming
2016-06-08 12:43     ` Matt Fleming
2016-06-10 11:33     ` Tomi Valkeinen
2016-06-10 11:33       ` Tomi Valkeinen
2016-06-13 17:15 ` [PATCH RESEND] fbdev/efifb: " Max Staudt
2016-06-13 17:15   ` Max Staudt
2016-08-10 10:53   ` Tomi Valkeinen
2016-08-10 10:53     ` Tomi Valkeinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160607172304.GD24886@redhat.com \
    --to=pjones@redhat.com \
    --cc=agraf@suse.de \
    --cc=eich@suse.de \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matt@codeblueprint.co.uk \
    --cc=mstaudt@suse.de \
    --cc=plagnioj@jcrosoft.com \
    --cc=tiwai@suse.de \
    --cc=tomi.valkeinen@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.