[PATCH] firmware/sysfb: Fix wrong stride when bits-per-pixel is calculated

[Javier Martinez Canillas]

Javier Martinez Canillas <javierm at redhat.com> writes:

[...]

>> ========== Bad after patch, typing blind to log in !==================
>> grub: gfxpayload=keep
>> [    0.003333] Console: colour dummy device 128x48
>> [    0.003333] printk: console [tty0] enabled
>> [    0.423925] fbcon: Taking over console
>> [    0.520030] pci 0000:01:05.0: vgaarb: setting as boot VGA device
>> [    0.520061] pci 0000:01:05.0: vgaarb: bridge control possible
>> [    0.520085] pci 0000:01:05.0: vgaarb: VGA device added:
>> decodes=io+mem,owns=io+mem,locks=none
>> [    0.520120] vgaarb: loaded
>> [    3.290444] simple-framebuffer simple-framebuffer.0: framebuffer at
>> 0xd8000000, 0x240000 bytes
>> [    3.290483] simple-framebuffer simple-framebuffer.0: format=r8g8b8,
>> mode=1024x768x24, linelength=3072
>
> Now, this is the part where things start to break I believe. Because you
> mentioned before that gfxpayload=keep used to set the format to xr8g8b8
> but now after my patch (and also after the original commit f35cd3fa7729)
> it is set to r8g8b8 instead.
>

I still don't understand why this particular configuration didn't work...

The framebuffer starts at 0xd8000000 and has a size of 0x240000 bytes, so
a r8g8b8 pixel format with resolution 1024x768 should be correct. Since is
1024 * 768 * (24 / 8) = 2359296 = 0x240000.

In any case, it seems that there is something wrong on how the screen_info
is reported to sysfb since you mentioned that gfxpayload=1024x768x32 leads
to a format=r8g8b8 and mode=1024x768x24, instead of the format=xr8g8b8 and
mode=1024x768x32 that is expected.

Could you please apply the following diff that will print all the relevant
fields from the screen_info that are used to calculate the bpp and stride.

My guess is that the rsvd_size and rsvd_pos are not correct and that's why
the bpp is set to 24 instead of 32.

diff --git a/drivers/firmware/sysfb_simplefb.c b/drivers/firmware/sysfb_simplefb.c
index 5dc23e57089f..6678ac6ff5b1 100644
--- a/drivers/firmware/sysfb_simplefb.c
+++ b/drivers/firmware/sysfb_simplefb.c
@@ -58,6 +58,13 @@ __init bool sysfb_parse_mode(const struct screen_info *si,
         * If a calculated bits_per_pixel is used instead of lfb_depth,
         * then also ignore lfb_linelength and calculate the stride.
         */
+
+       printk("sysfb: si->lfb_depth %u si->lfb_width %u\n", si->lfb_depth, si->lfb_width);
+       printk("sysfb: si->red_size %u si->red_pos %u\n", si->red_size, si->red_pos);
+       printk("sysfb: si->green_size %u si->green_pos %u\n", si->green_size, si->green_pos);
+       printk("sysfb: si->blue_size %u si->blue_pos %u\n", si->blue_size, si->blue_pos);
+       printk("sysfb: si->rsvd_size %u si->rsvd_pos %u\n", si->rsvd_size, si->rsvd_pos);
+
        if (si->lfb_depth > 8) {
                bits_per_pixel = max(max3(si->red_size + si->red_pos,
                                          si->green_size + si->green_pos,
@@ -69,6 +76,9 @@ __init bool sysfb_parse_mode(const struct screen_info *si,
                stride = si->lfb_linelength;
        }
 
+       printk("sysfb: bits_per_pixel %u si->lfb_linelength %u\n", bits_per_pixel, si->lfb_linelength);
+       printk("sysfb: stride %u\n", stride);
+
        for (i = 0; i < ARRAY_SIZE(formats); ++i) {
                const struct simplefb_format *f = &formats[i];
 
@@ -86,6 +96,7 @@ __init bool sysfb_parse_mode(const struct screen_info *si,
                        mode->width = si->lfb_width;
                        mode->height = si->lfb_height;
                        mode->stride = stride;
+                       printk("sysfb: format %s\n", f->name);
                        return true;
                }
        }

-- 
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat