diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-22 09:40:34 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-22 19:31:57 +0200 |
| commit | 5b7a74d7494464a7a5ced34b90e3bdeccdd86695 (patch) | |
| tree | 73862e1d950f7dd708ab5701cc088c85ba1345fd /drivers | |
| parent | 889153e24f53c49635e72d7477025fb2a9c85116 (diff) | |
| download | barebox-5b7a74d7494464a7a5ced34b90e3bdeccdd86695.tar.gz barebox-5b7a74d7494464a7a5ced34b90e3bdeccdd86695.tar.xz | |
fb: i.MX IPU: move fb_info initialization to a single function
The bitfield information was only added to fb_info when the
framebuffer actually was enabled. That made it impossible to
call 'bmp' before enabling the display.
So, move all fb_info init to a single place and make it a function
to better allow for multiple displays later.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/imx-ipu-fb.c | 63 |
1 files changed, 35 insertions, 28 deletions
diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c index 399af755f6..08036aa353 100644 --- a/drivers/video/imx-ipu-fb.c +++ b/drivers/video/imx-ipu-fb.c @@ -729,7 +729,6 @@ static void sdc_enable_channel(struct ipu_fb_info *fbi, void *fbmem) static int mx3fb_set_par(struct fb_info *info) { struct ipu_fb_info *fbi = info->priv; - struct imx_ipu_fb_rgb *rgb; struct fb_videomode *mode = info->mode; int ret; @@ -740,29 +739,6 @@ static int mx3fb_set_par(struct fb_info *info) reg_write(fbi, (mode->left_margin << 16) | mode->upper_margin, SDC_BG_POS); - switch (info->bits_per_pixel) { - case 32: - rgb = &def_rgb_32; - break; - case 24: - rgb = &def_rgb_24; - break; - case 16: - default: - rgb = &def_rgb_16; - break; - } - - /* - * Copy the RGB parameters for this display - * from the machine specific parameters. - */ - info->red = rgb->red; - info->green = rgb->green; - info->blue = rgb->blue; - info->transp = rgb->transp; - - return 0; } @@ -853,6 +829,39 @@ static struct fb_ops imxfb_ops = { .fb_disable = ipu_fb_disable, }; +static void imxfb_init_info(struct fb_info *info, struct fb_videomode *mode, + int bpp) +{ + struct imx_ipu_fb_rgb *rgb; + + info->mode = mode; + info->xres = mode->xres; + info->yres = mode->yres; + info->bits_per_pixel = bpp; + + switch (info->bits_per_pixel) { + case 32: + rgb = &def_rgb_32; + break; + case 24: + rgb = &def_rgb_24; + break; + case 16: + default: + rgb = &def_rgb_16; + break; + } + + /* + * Copy the RGB parameters for this display + * from the machine specific parameters. + */ + info->red = rgb->red; + info->green = rgb->green; + info->blue = rgb->blue; + info->transp = rgb->transp; +} + static int imxfb_probe(struct device_d *dev) { struct ipu_fb_info *fbi; @@ -869,13 +878,11 @@ static int imxfb_probe(struct device_d *dev) fbi->regs = (void *)dev->map_base; fbi->dev = dev; info->priv = fbi; - info->mode = pdata->mode; - info->xres = pdata->mode->xres; - info->yres = pdata->mode->yres; - info->bits_per_pixel = pdata->bpp; info->fbops = &imxfb_ops; fbi->enable = pdata->enable; + imxfb_init_info(info, pdata->mode, pdata->bpp); + dev_info(dev, "i.MX Framebuffer driver\n"); /* |