| Message ID | 1375346437-18991-2-git-send-email-maxime.ripard@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/08/13 11:40, Maxime Ripard wrote: > From: Hector Palacios <hector.palacios@digi.com> > > For a combination of 18bit LCD data bus width and a color > mode of 32bpp, the driver was setting the color mapping to > rgb666, which is wrong, as the color in memory realy has an > rgb888 layout. > > This patch also removes the setting of flag CTRL_DF24 that > makes the driver dimiss the upper 2 bits when handling 32/24bpp > colors in a diplay with 18bit data bus width. This flag made > true color images display wrong in such configurations. > > Finally, the color mapping rgb666 has also been removed as nobody > is using it and high level applications like Qt5 cannot work > with it either. > > Reference: https://lkml.org/lkml/2013/5/23/220 > Signed-off-by: Hector Palacios <hector.palacios@digi.com> > Acked-by: Juergen Beisert <jbe@pengutronix.de> > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > drivers/video/mxsfb.c | 26 -------------------------- > 1 file changed, 26 deletions(-) This one is labeled as "fix". Should it got to v3.11? Tomi
On Fri, Aug 02, 2013 at 11:35:29AM +0300, Tomi Valkeinen wrote: > On 01/08/13 11:40, Maxime Ripard wrote: > > From: Hector Palacios <hector.palacios@digi.com> > > > > For a combination of 18bit LCD data bus width and a color > > mode of 32bpp, the driver was setting the color mapping to > > rgb666, which is wrong, as the color in memory realy has an > > rgb888 layout. > > > > This patch also removes the setting of flag CTRL_DF24 that > > makes the driver dimiss the upper 2 bits when handling 32/24bpp > > colors in a diplay with 18bit data bus width. This flag made > > true color images display wrong in such configurations. > > > > Finally, the color mapping rgb666 has also been removed as nobody > > is using it and high level applications like Qt5 cannot work > > with it either. > > > > Reference: https://lkml.org/lkml/2013/5/23/220 > > Signed-off-by: Hector Palacios <hector.palacios@digi.com> > > Acked-by: Juergen Beisert <jbe@pengutronix.de> > > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > --- > > drivers/video/mxsfb.c | 26 -------------------------- > > 1 file changed, 26 deletions(-) > > This one is labeled as "fix". Should it got to v3.11? It would be better yes. Otherwise, 3.12 will do.
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index 3ba3771..dc09ebe 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -239,24 +239,6 @@ static const struct fb_bitfield def_rgb565[] = { } }; -static const struct fb_bitfield def_rgb666[] = { - [RED] = { - .offset = 16, - .length = 6, - }, - [GREEN] = { - .offset = 8, - .length = 6, - }, - [BLUE] = { - .offset = 0, - .length = 6, - }, - [TRANSP] = { /* no support for transparency */ - .length = 0, - } -}; - static const struct fb_bitfield def_rgb888[] = { [RED] = { .offset = 16, @@ -309,9 +291,6 @@ static int mxsfb_check_var(struct fb_var_screeninfo *var, break; case STMLCDIF_16BIT: case STMLCDIF_18BIT: - /* 24 bit to 18 bit mapping */ - rgb = def_rgb666; - break; case STMLCDIF_24BIT: /* real 24 bit */ rgb = def_rgb888; @@ -453,11 +432,6 @@ static int mxsfb_set_par(struct fb_info *fb_info) return -EINVAL; case STMLCDIF_16BIT: case STMLCDIF_18BIT: - /* 24 bit to 18 bit mapping */ - ctrl |= CTRL_DF24; /* ignore the upper 2 bits in - * each colour component - */ - break; case STMLCDIF_24BIT: /* real 24 bit */ break;