diff options
author | Wolfram Sang <wsa@kernel.org> | 2023-04-24 13:50:20 +0300 |
---|---|---|
committer | Wolfram Sang <wsa@kernel.org> | 2023-04-24 13:50:20 +0300 |
commit | 38c87827ffd3c7e1dd61eee9a7dea13d487dc2ed (patch) | |
tree | e6bd1c3ae56823874a736c1512409c123c9a4219 /drivers/video/fbdev/omap/omapfb_main.c | |
parent | 9496fffcb28f39e0352779a0199b6e61861c9221 (diff) | |
parent | d663d93bb47e7ab45602b227701022d8aa16040a (diff) | |
download | linux-38c87827ffd3c7e1dd61eee9a7dea13d487dc2ed.tar.xz |
Merge branch 'i2c/for-current' into i2c/for-mergewindow
This should have been in 6.3, but sadly I missed it.
Diffstat (limited to 'drivers/video/fbdev/omap/omapfb_main.c')
-rw-r--r-- | drivers/video/fbdev/omap/omapfb_main.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/drivers/video/fbdev/omap/omapfb_main.c b/drivers/video/fbdev/omap/omapfb_main.c index 1f3df2055ff0..18736079843d 100644 --- a/drivers/video/fbdev/omap/omapfb_main.c +++ b/drivers/video/fbdev/omap/omapfb_main.c @@ -544,19 +544,25 @@ static int set_fb_var(struct fb_info *fbi, var->yoffset = var->yres_virtual - var->yres; if (plane->color_mode == OMAPFB_COLOR_RGB444) { - var->red.offset = 8; var->red.length = 4; - var->red.msb_right = 0; - var->green.offset = 4; var->green.length = 4; - var->green.msb_right = 0; - var->blue.offset = 0; var->blue.length = 4; - var->blue.msb_right = 0; + var->red.offset = 8; + var->red.length = 4; + var->red.msb_right = 0; + var->green.offset = 4; + var->green.length = 4; + var->green.msb_right = 0; + var->blue.offset = 0; + var->blue.length = 4; + var->blue.msb_right = 0; } else { - var->red.offset = 11; var->red.length = 5; - var->red.msb_right = 0; - var->green.offset = 5; var->green.length = 6; - var->green.msb_right = 0; - var->blue.offset = 0; var->blue.length = 5; - var->blue.msb_right = 0; + var->red.offset = 11; + var->red.length = 5; + var->red.msb_right = 0; + var->green.offset = 5; + var->green.length = 6; + var->green.msb_right = 0; + var->blue.offset = 0; + var->blue.length = 5; + var->blue.msb_right = 0; } var->height = -1; |