* [PATCH] [efifb] Fix 16 color palette entry calculation
@ 2016-06-07 13:45 Max Staudt
2016-06-07 16:41 ` Greg KH
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Max Staudt @ 2016-06-07 13:45 UTC (permalink / raw)
To: pjones, plagnioj, tomi.valkeinen
Cc: mstaudt, eich, tiwai, agraf, linux-fbdev, linux-kernel, stable
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] [efifb] Fix 16 color palette entry calculation
2016-06-07 13:45 [PATCH] [efifb] Fix 16 color palette entry calculation Max Staudt
@ 2016-06-07 16:41 ` Greg KH
2016-06-07 17:23 ` Peter Jones
2016-06-13 17:15 ` [PATCH RESEND] fbdev/efifb: " Max Staudt
2 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2016-06-07 16:41 UTC (permalink / raw)
To: Max Staudt
Cc: pjones, plagnioj, tomi.valkeinen, eich, tiwai, agraf,
linux-fbdev, linux-kernel, stable
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(-)
>
<formletter>
This is not the correct way to submit patches for inclusion in the
stable kernel tree. Please read Documentation/stable_kernel_rules.txt
for how to do this properly.
</formletter>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] [efifb] Fix 16 color palette entry calculation
2016-06-07 13:45 [PATCH] [efifb] Fix 16 color palette entry calculation Max Staudt
2016-06-07 16:41 ` Greg KH
@ 2016-06-07 17:23 ` Peter Jones
2016-06-08 12:43 ` Matt Fleming
2016-06-13 17:15 ` [PATCH RESEND] fbdev/efifb: " Max Staudt
2 siblings, 1 reply; 7+ messages in thread
From: Peter Jones @ 2016-06-07 17:23 UTC (permalink / raw)
To: Max Staudt
Cc: plagnioj, tomi.valkeinen, eich, tiwai, agraf, linux-fbdev,
linux-kernel, Matt Fleming
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] [efifb] Fix 16 color palette entry calculation
2016-06-07 17:23 ` Peter Jones
@ 2016-06-08 12:43 ` Matt Fleming
2016-06-10 11:33 ` Tomi Valkeinen
0 siblings, 1 reply; 7+ messages in thread
From: Matt Fleming @ 2016-06-08 12:43 UTC (permalink / raw)
To: Peter Jones
Cc: Max Staudt, plagnioj, tomi.valkeinen, eich, tiwai, agraf,
linux-fbdev, linux-kernel
On Tue, 07 Jun, at 01:23:05PM, Peter Jones wrote:
>
> Looks right to me.
>
> Acked-By: Peter Jones <pjones@redhat.com>
Tomi, are you OK to take this one or would you like me to take it
through the EFI tree?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] [efifb] Fix 16 color palette entry calculation
2016-06-08 12:43 ` Matt Fleming
@ 2016-06-10 11:33 ` Tomi Valkeinen
0 siblings, 0 replies; 7+ messages in thread
From: Tomi Valkeinen @ 2016-06-10 11:33 UTC (permalink / raw)
To: Matt Fleming, Peter Jones
Cc: Max Staudt, plagnioj, eich, tiwai, agraf, linux-fbdev, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 403 bytes --]
On 08/06/16 15:43, Matt Fleming wrote:
> On Tue, 07 Jun, at 01:23:05PM, Peter Jones wrote:
>>
>> Looks right to me.
>>
>> Acked-By: Peter Jones <pjones@redhat.com>
>
> Tomi, are you OK to take this one or would you like me to take it
> through the EFI tree?
I can pick this up, but as Greg said, this is not valid for stable.
Max, please resend with correct stable reference.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH RESEND] fbdev/efifb: Fix 16 color palette entry calculation
2016-06-07 13:45 [PATCH] [efifb] Fix 16 color palette entry calculation Max Staudt
2016-06-07 16:41 ` Greg KH
2016-06-07 17:23 ` Peter Jones
@ 2016-06-13 17:15 ` Max Staudt
2016-08-10 10:53 ` Tomi Valkeinen
2 siblings, 1 reply; 7+ messages in thread
From: Max Staudt @ 2016-06-13 17:15 UTC (permalink / raw)
To: pjones, plagnioj, tomi.valkeinen
Cc: mstaudt, eich, tiwai, agraf, linux-fbdev, linux-kernel, matt, stable
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").
Fixes: 7c83172b98e5 ("x86_64 EFI boot support: EFI frame buffer driver") # v2.6.24+
Signed-off-by: Max Staudt <mstaudt@suse.de>
Acked-By: Peter Jones <pjones@redhat.com>
Cc: stable@vger.kernel.org
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH RESEND] fbdev/efifb: Fix 16 color palette entry calculation
2016-06-13 17:15 ` [PATCH RESEND] fbdev/efifb: " Max Staudt
@ 2016-08-10 10:53 ` Tomi Valkeinen
0 siblings, 0 replies; 7+ messages in thread
From: Tomi Valkeinen @ 2016-08-10 10:53 UTC (permalink / raw)
To: Max Staudt, pjones, plagnioj
Cc: eich, tiwai, agraf, linux-fbdev, linux-kernel, matt, stable
[-- Attachment #1.1: Type: text/plain, Size: 1063 bytes --]
On 13/06/16 20:15, 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").
>
> Fixes: 7c83172b98e5 ("x86_64 EFI boot support: EFI frame buffer driver") # v2.6.24+
> Signed-off-by: Max Staudt <mstaudt@suse.de>
> Acked-By: Peter Jones <pjones@redhat.com>
> Cc: stable@vger.kernel.org
> ---
> drivers/video/fbdev/efifb.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Thanks, queued for v4.9.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-08-10 19:02 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-07 13:45 [PATCH] [efifb] Fix 16 color palette entry calculation Max Staudt
2016-06-07 16:41 ` Greg KH
2016-06-07 17:23 ` Peter Jones
2016-06-08 12:43 ` Matt Fleming
2016-06-10 11:33 ` Tomi Valkeinen
2016-06-13 17:15 ` [PATCH RESEND] fbdev/efifb: " Max Staudt
2016-08-10 10:53 ` Tomi Valkeinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).