* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/init.h>
-#include <linux/delay.h>
#include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
#include <asm/uaccess.h>
-#include <asm/atomic.h>
#include <asm/mach-types.h>
-
#include <asm/arch/dma.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/board.h>
#include <asm/arch/omapfb.h>
-/* #define OMAPFB_DBG 1 */
-
-#include "debug.h"
-
-#define OMAPFB_DRIVER "omapfb"
#define MODULE_NAME "omapfb"
-#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME ": " fmt, ## args)
-
static unsigned int def_accel;
-static unsigned long def_vram;
+static unsigned long def_vram[OMAPFB_PLANE_NUM];
+static int def_vram_cnt;
static unsigned long def_vxres;
static unsigned long def_vyres;
static unsigned int def_rotate;
extern struct lcd_ctrl omap1_int_ctrl;
extern struct lcd_ctrl omap2_int_ctrl;
extern struct lcd_ctrl hwa742_ctrl;
-extern struct lcd_ctrl blizzard_ctrl;
static struct lcd_ctrl *ctrls[] = {
#ifdef CONFIG_ARCH_OMAP1
#ifdef CONFIG_FB_OMAP_LCDC_EXTERNAL
#ifdef CONFIG_ARCH_OMAP1
-extern struct lcd_ctrl_extif sossi_extif;
+extern struct lcd_ctrl_extif omap1_ext_if;
#else
-extern struct lcd_ctrl_extif rfbi_extif;
+extern struct lcd_ctrl_extif omap2_ext_if;
#endif
#endif
static int ctrl_init(struct omapfb_device *fbdev)
{
int r;
+ int i;
- DBGENTER(1);
+ /* kernel/module vram parameters override boot tags/board config */
+ if (def_vram_cnt) {
+ for (i = 0; i < def_vram_cnt; i++)
+ fbdev->mem_desc.region[i].size = def_vram[i];
+ fbdev->mem_desc.region_cnt = i;
+ } else {
+ struct omapfb_platform_data *conf;
- r = fbdev->ctrl->init(fbdev, 0, def_vram);
- if (r < 0) {
- pr_err("controller initialization failed\n");
- goto exit;
+ conf = fbdev->dev->platform_data;
+ fbdev->mem_desc = conf->mem_desc;
}
- fbdev->ctrl->get_vram_layout(&fbdev->vram_size, &fbdev->vram_virt_base,
- &fbdev->vram_phys_base);
-
- DBGPRINT(1, "vram_phys %08x vram_virt %p vram_size=%lu\n",
- fbdev->vram_phys_base, fbdev->vram_virt_base,
- fbdev->vram_size);
+ if (!fbdev->mem_desc.region_cnt) {
+ struct lcd_panel *panel = fbdev->panel;
+ int def_size;
+ int bpp = panel->bpp;
+
+ /* 12 bpp is packed in 16 bits */
+ if (bpp == 12)
+ bpp = 16;
+ def_size = def_vxres * def_vyres * bpp / 8;
+ fbdev->mem_desc.region_cnt = 1;
+ fbdev->mem_desc.region[0].size = def_size;
+ }
+ r = fbdev->ctrl->init(fbdev, 0, &fbdev->mem_desc);
+ if (r < 0) {
+ dev_err(fbdev->dev, "controller initialization failed (%d)\n", r);
+ return r;
+ }
- DBGLEAVE(1);
+#ifdef DEBUG
+ for (i = 0; i < fbdev->mem_desc.region_cnt; i++) {
+ dev_dbg(fbdev->dev, "region%d phys %08x virt %p size=%lu\n",
+ i,
+ fbdev->mem_desc.region[i].paddr,
+ fbdev->mem_desc.region[i].vaddr,
+ fbdev->mem_desc.region[i].size);
+ }
+#endif
return 0;
-exit:
- DBGLEAVE(1);
- return r;
}
static void ctrl_cleanup(struct omapfb_device *fbdev)
fbdev->ctrl->cleanup();
}
-static int ctrl_change_mode(struct omapfb_device *fbdev)
+static int ctrl_change_mode(struct fb_info *fbi)
{
int r;
unsigned long offset;
- struct fb_var_screeninfo *var = &fbdev->fb_info->var;
+ struct omapfb_plane_struct *plane = fbi->par;
+ struct omapfb_device *fbdev = plane->fbdev;
+ struct fb_var_screeninfo *var = &fbi->var;
- DBGPRINT(1, "xoffset %d yoffset %d line_length %d bits_per_pixel %d\n",
- var->xoffset, var->yoffset, fbdev->fb_info->fix.line_length,
- var->bits_per_pixel);
- offset = var->yoffset * fbdev->fb_info->fix.line_length +
+ offset = var->yoffset * fbi->fix.line_length +
var->xoffset * var->bits_per_pixel / 8;
- r = fbdev->ctrl->setup_plane(OMAPFB_PLANE_GFX, OMAPFB_CHANNEL_OUT_LCD,
- offset, var->xres_virtual, 0, 0, var->xres,
- var->yres, fbdev->color_mode);
- DBGLEAVE(1);
+
+ omapfb_rqueue_lock(fbdev);
+ r = fbdev->ctrl->setup_plane(plane->idx, plane->info.channel_out,
+ offset, var->xres_virtual,
+ plane->info.pos_x, plane->info.pos_y,
+ var->xres, var->yres, plane->color_mode);
+ if (fbdev->ctrl->set_scale != NULL)
+ r = fbdev->ctrl->set_scale(plane->idx,
+ var->xres, var->yres,
+ plane->info.out_width,
+ plane->info.out_height);
+ omapfb_rqueue_unlock(fbdev);
return r;
}
/* Called each time the omapfb device is opened */
static int omapfb_open(struct fb_info *info, int user)
{
- DBGENTER(1);
- DBGLEAVE(1);
return 0;
}
* gfx DMA operations are ended, before we return. */
static int omapfb_release(struct fb_info *info, int user)
{
- DBGENTER(1);
-
omapfb_sync(info);
-
- DBGLEAVE(1);
return 0;
}
static int _setcolreg(struct fb_info *info, u_int regno, u_int red, u_int green,
u_int blue, u_int transp, int update_hw_pal)
{
- struct omapfb_device *fbdev = (struct omapfb_device *)info->par;
+ struct omapfb_plane_struct *plane = info->par;
+ struct omapfb_device *fbdev = plane->fbdev;
struct fb_var_screeninfo *var = &info->var;
int r = 0;
- switch (fbdev->color_mode) {
+ switch (plane->color_mode) {
case OMAPFB_COLOR_YUV422:
case OMAPFB_COLOR_YUV420:
+ case OMAPFB_COLOR_YUY422:
r = -EINVAL;
break;
case OMAPFB_COLOR_CLUT_8BPP:
if (regno < 16) {
u16 pal;
- pal = ((red >> (16 - var->red.length)) << var->red.offset) |
- ((green >> (16 - var->green.length)) << var->green.offset) |
- (blue >> (16 - var->blue.length));
+ pal = ((red >> (16 - var->red.length)) <<
+ var->red.offset) |
+ ((green >> (16 - var->green.length)) <<
+ var->green.offset) |
+ (blue >> (16 - var->blue.length));
((u32 *)(info->pseudo_palette))[regno] = pal;
}
break;
static int omapfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
u_int transp, struct fb_info *info)
{
- int r = 0;
-
- DBGENTER(2);
-
- _setcolreg(info, regno, red, green, blue, transp, 1);
-
- DBGLEAVE(2);
-
- return r;
+ return _setcolreg(info, regno, red, green, blue, transp, 1);
}
static int omapfb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
return 0;
}
-static int omapfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
-{
- struct omapfb_device *fbdev = info->par;
- int r;
-
- omapfb_rqueue_lock(fbdev);
- r = fbdev->ctrl->mmap(vma);
- omapfb_rqueue_unlock(fbdev);
-
- return r;
-}
-
-static void omapfb_update_full_screen(struct omapfb_device *fbdev);
+static int omapfb_update_full_screen(struct fb_info *fbi);
static int omapfb_blank(int blank, struct fb_info *fbi)
{
- struct omapfb_device *fbdev = (struct omapfb_device *)fbi->par;
+ struct omapfb_plane_struct *plane = fbi->par;
+ struct omapfb_device *fbdev = plane->fbdev;
int do_update = 0;
int r = 0;
- DBGENTER(1);
-
omapfb_rqueue_lock(fbdev);
switch (blank) {
case VESA_NO_BLANKING:
if (fbdev->state == OMAPFB_SUSPENDED) {
if (fbdev->ctrl->resume)
fbdev->ctrl->resume();
- fbdev->panel->enable();
+ fbdev->panel->enable(fbdev->panel);
fbdev->state = OMAPFB_ACTIVE;
if (fbdev->ctrl->get_update_mode() ==
OMAPFB_MANUAL_UPDATE)
break;
case VESA_POWERDOWN:
if (fbdev->state == OMAPFB_ACTIVE) {
- fbdev->panel->disable();
+ fbdev->panel->disable(fbdev->panel);
if (fbdev->ctrl->suspend)
fbdev->ctrl->suspend();
fbdev->state = OMAPFB_SUSPENDED;
}
omapfb_rqueue_unlock(fbdev);
- if (do_update)
- omapfb_update_full_screen(fbdev);
+ if (r == 0 && do_update)
+ r = omapfb_update_full_screen(fbi);
- DBGLEAVE(1);
return r;
}
static void omapfb_sync(struct fb_info *fbi)
{
- struct omapfb_device *fbdev = (struct omapfb_device *)fbi->par;
+ struct omapfb_plane_struct *plane = fbi->par;
+ struct omapfb_device *fbdev = plane->fbdev;
omapfb_rqueue_lock(fbdev);
if (fbdev->ctrl->sync)
/* Set fb_info.fix fields and also updates fbdev.
* When calling this fb_info.var must be set up already.
*/
-static void set_fb_fix(struct omapfb_device *fbdev)
+static void set_fb_fix(struct fb_info *fbi)
{
- struct fb_info *fbi = fbdev->fb_info;
struct fb_fix_screeninfo *fix = &fbi->fix;
struct fb_var_screeninfo *var = &fbi->var;
+ int bpp;
- strncpy(fix->id, OMAPFB_DRIVER, sizeof(fix->id));
fix->type = FB_TYPE_PACKED_PIXELS;
- switch (var->bits_per_pixel) {
+ bpp = var->bits_per_pixel;
+ if (var->nonstd)
+ fix->visual = FB_VISUAL_PSEUDOCOLOR;
+ else switch (var->bits_per_pixel) {
case 16:
+ case 12:
fix->visual = FB_VISUAL_TRUECOLOR;
+ /* 12bpp is stored in 16 bits */
+ bpp = 16;
break;
case 1:
case 2:
break;
}
fix->accel = FB_ACCEL_OMAP1610;
- fix->line_length = var->xres_virtual * var->bits_per_pixel / 8;
- fix->smem_len = fbdev->vram_size;
- fix->smem_start = fbdev->vram_phys_base;
+ fix->line_length = var->xres_virtual * bpp / 8;
+}
+
+static int set_color_mode(struct omapfb_plane_struct *plane,
+ struct fb_var_screeninfo *var)
+{
+ switch (var->nonstd) {
+ case 0:
+ break;
+ case OMAPFB_COLOR_YUV422:
+ var->bits_per_pixel = 16;
+ plane->color_mode = var->nonstd;
+ return 0;
+ case OMAPFB_COLOR_YUV420:
+ var->bits_per_pixel = 12;
+ plane->color_mode = var->nonstd;
+ return 0;
+ case OMAPFB_COLOR_YUY422:
+ var->bits_per_pixel = 16;
+ plane->color_mode = var->nonstd;
+ return 0;
+ default:
+ return -EINVAL;
+ }
+
+ switch (var->bits_per_pixel) {
+ case 1:
+ plane->color_mode = OMAPFB_COLOR_CLUT_1BPP;
+ return 0;
+ case 2:
+ plane->color_mode = OMAPFB_COLOR_CLUT_2BPP;
+ return 0;
+ case 4:
+ plane->color_mode = OMAPFB_COLOR_CLUT_4BPP;
+ return 0;
+ case 8:
+ plane->color_mode = OMAPFB_COLOR_CLUT_8BPP;
+ return 0;
+ case 12:
+ plane->color_mode = OMAPFB_COLOR_RGB444;
+ return 0;
+ case 16:
+ plane->color_mode = OMAPFB_COLOR_RGB565;
+ return 0;
+ default:
+ return -EINVAL;
+ }
}
/* Check the values in var against our capabilities and in case of out of
* bound values try to adjust them.
*/
-static int set_fb_var(struct omapfb_device *fbdev,
+static int set_fb_var(struct fb_info *fbi,
struct fb_var_screeninfo *var)
{
int bpp;
unsigned long max_frame_size;
unsigned long line_size;
+ int xres_min, xres_max;
+ int yres_min, yres_max;
+ struct omapfb_plane_struct *plane = fbi->par;
+ struct omapfb_device *fbdev = plane->fbdev;
struct lcd_panel *panel = fbdev->panel;
- if (panel->bpp == 12)
- bpp = var->bits_per_pixel = 16; /* 12-bit bpp mode stores colours in 16-bits */
- else
- bpp = var->bits_per_pixel = panel->bpp;
-
- switch (panel->bpp) {
- case 16:
- fbdev->color_mode = OMAPFB_COLOR_RGB565;
- break;
- case 12:
- fbdev->color_mode = OMAPFB_COLOR_RGB444;
- break;
- case 8:
- fbdev->color_mode = OMAPFB_COLOR_CLUT_8BPP;
- break;
- default:
- /* FIXME: other BPPs not yet supported */
+ if (set_color_mode(plane, var) < 0)
return -EINVAL;
- }
+
+ bpp = var->bits_per_pixel;
+ if (plane->color_mode == OMAPFB_COLOR_RGB444)
+ bpp = 16;
switch (var->rotate) {
case 0:
case 180:
- var->xres = fbdev->panel->x_res;
- var->yres = fbdev->panel->y_res;
+ xres_min = OMAPFB_PLANE_XRES_MIN;
+ xres_max = panel->x_res;
+ yres_min = OMAPFB_PLANE_YRES_MIN;
+ yres_max = panel->y_res;
+ if (cpu_is_omap1510()) {
+ var->xres = panel->x_res;
+ var->yres = panel->y_res;
+ }
break;
case 90:
case 270:
- var->xres = fbdev->panel->y_res;
- var->yres = fbdev->panel->x_res;
+ xres_min = OMAPFB_PLANE_YRES_MIN;
+ xres_max = panel->y_res;
+ yres_min = OMAPFB_PLANE_XRES_MIN;
+ yres_max = panel->x_res;
+ if (cpu_is_omap1510()) {
+ var->xres = panel->y_res;
+ var->yres = panel->x_res;
+ }
break;
default:
return -EINVAL;
}
+
+ if (var->xres < xres_min)
+ var->xres = xres_min;
+ if (var->yres < yres_min)
+ var->yres = yres_min;
+ if (var->xres > xres_max)
+ var->xres = xres_max;
+ if (var->yres > yres_max)
+ var->yres = yres_max;
+
if (var->xres_virtual < var->xres)
var->xres_virtual = var->xres;
if (var->yres_virtual < var->yres)
var->yres_virtual = var->yres;
- max_frame_size = fbdev->vram_size;
+ max_frame_size = fbdev->mem_desc.region[plane->idx].size;
line_size = var->xres_virtual * bpp / 8;
if (line_size * var->yres_virtual > max_frame_size) {
/* Try to keep yres_virtual first */
var->yoffset = var->yres_virtual - var->yres;
line_size = var->xres * bpp / 8;
- if (fbdev->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;
- }
- 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;
+ 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;
+ } 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->height = -1;
var->width = -1;
var->grayscale = 0;
- var->nonstd = 0;
/* pixclock in ps, the rest in pixclock */
var->pixclock = 10000000 / (panel->pixel_clock / 100);
/* Set rotation (0, 90, 180, 270 degree), and switch to the new mode. */
static void omapfb_rotate(struct fb_info *fbi, int rotate)
{
- struct omapfb_device *fbdev = (struct omapfb_device *)fbi->par;
-
- DBGENTER(1);
-
- if (cpu_is_omap1510() && rotate != fbdev->fb_info->var.rotate) {
+ if (cpu_is_omap1510() && rotate != fbi->var.rotate) {
memcpy(&new_var, &fbi->var, sizeof(new_var));
new_var.rotate = rotate;
- if (set_fb_var(fbdev, &new_var) == 0 &&
+ if (set_fb_var(fbi, &new_var) == 0 &&
memcmp(&new_var, &fbi->var, sizeof(new_var))) {
memcpy(&fbi->var, &new_var, sizeof(new_var));
- ctrl_change_mode(fbdev);
+ ctrl_change_mode(fbi);
}
}
-
- DBGLEAVE(1);
}
/* Set new x,y offsets in the virtual display for the visible area and switch
static int omapfb_pan_display(struct fb_var_screeninfo *var,
struct fb_info *fbi)
{
- struct omapfb_device *fbdev = (struct omapfb_device *)fbi->par;
int r = 0;
- DBGENTER(1);
-
if (var->xoffset != fbi->var.xoffset ||
var->yoffset != fbi->var.yoffset) {
memcpy(&new_var, &fbi->var, sizeof(new_var));
new_var.xoffset = var->xoffset;
new_var.yoffset = var->yoffset;
- if (set_fb_var(fbdev, &new_var))
+ if (set_fb_var(fbi, &new_var))
r = -EINVAL;
else {
memcpy(&fbi->var, &new_var, sizeof(new_var));
- ctrl_change_mode(fbdev);
+ ctrl_change_mode(fbi);
}
}
- DBGLEAVE(1);
return r;
}
/* Set mirror to vertical axis and switch to the new mode. */
-static int omapfb_mirror(struct omapfb_device *fbdev, int mirror)
+static int omapfb_mirror(struct fb_info *fbi, int mirror)
{
+ struct omapfb_plane_struct *plane = fbi->par;
int r = 0;
- DBGENTER(1);
-
mirror = mirror ? 1 : 0;
if (cpu_is_omap1510())
r = -EINVAL;
- else if (mirror != fbdev->mirror) {
- fbdev->mirror = mirror;
- r = ctrl_change_mode(fbdev);
+ else if (mirror != plane->info.mirror) {
+ plane->info.mirror = mirror;
+ r = ctrl_change_mode(fbi);
}
- DBGLEAVE(1);
return r;
}
*/
static int omapfb_check_var(struct fb_var_screeninfo *var, struct fb_info *fbi)
{
- struct omapfb_device *fbdev = (struct omapfb_device *)fbi->par;
- int r;
-
- DBGENTER(1);
-
- r = set_fb_var(fbdev, var);
-
- DBGLEAVE(1);
- return r;
+ return set_fb_var(fbi, var);
}
/* Switch to a new mode. The parameters for it has been check already by
*/
static int omapfb_set_par(struct fb_info *fbi)
{
- int r;
- struct omapfb_device *fbdev = (struct omapfb_device *)fbi->par;
-
- DBGENTER(1);
-
- set_fb_fix(fbdev);
- r = ctrl_change_mode(fbdev);
-
- DBGLEAVE(1);
- return r;
+ set_fb_fix(fbi);
+ return ctrl_change_mode(fbi);
}
-int omapfb_update_window_async(struct omapfb_update_window *win,
- void (*callback)(void *),
- void *callback_data)
+int omapfb_update_window_async(struct fb_info *fbi,
+ struct omapfb_update_window *win,
+ void (*callback)(void *),
+ void *callback_data)
{
- struct omapfb_device *fbdev = omapfb_dev;
+ struct omapfb_plane_struct *plane = fbi->par;
+ struct omapfb_device *fbdev = plane->fbdev;
struct fb_var_screeninfo *var;
- DBGENTER(2);
- if (fbdev == NULL) {
- DBGPRINT(1, "no fbdev\n");
- return -ENODEV;
- }
-
- var = &fbdev->fb_info->var;
+ var = &fbi->var;
- if (win->x >= var->xres || win->y >= var->yres) {
- DBGPRINT(1, "invalid x %d, y %d\n", win->x, win->y);
+ if (win->x >= var->xres || win->y >= var->yres)
return -EINVAL;
- }
if (!fbdev->ctrl->update_window ||
- fbdev->ctrl->get_update_mode() != OMAPFB_MANUAL_UPDATE) {
- DBGPRINT(1, "invalid update mode\n");
+ fbdev->ctrl->get_update_mode() != OMAPFB_MANUAL_UPDATE)
return -ENODEV;
- }
if (win->x + win->width >= var->xres)
win->width = var->xres - win->x;
if (win->y + win->height >= var->yres)
win->height = var->yres - win->y;
- if (!win->width || !win->height) {
- DBGPRINT(1, "zero size window\n");
+ if (!win->width || !win->height)
return 0;
- }
- return fbdev->ctrl->update_window(win, callback, callback_data);
+ return fbdev->ctrl->update_window(fbi, win, callback, callback_data);
}
EXPORT_SYMBOL(omapfb_update_window_async);
-static int omapfb_update_win(struct omapfb_device *fbdev,
+static int omapfb_update_win(struct fb_info *fbi,
struct omapfb_update_window *win)
{
+ struct omapfb_plane_struct *plane = fbi->par;
int ret;
- omapfb_rqueue_lock(fbdev);
- ret = omapfb_update_window_async(win, NULL, 0);
- omapfb_rqueue_unlock(fbdev);
+ omapfb_rqueue_lock(plane->fbdev);
+ ret = omapfb_update_window_async(fbi, win, NULL, 0);
+ omapfb_rqueue_unlock(plane->fbdev);
return ret;
}
-static void omapfb_update_full_screen(struct omapfb_device *fbdev)
+static int omapfb_update_full_screen(struct fb_info *fbi)
{
+ struct omapfb_plane_struct *plane = fbi->par;
+ struct omapfb_device *fbdev = plane->fbdev;
struct omapfb_update_window win;
+ int r;
+
+ if (!fbdev->ctrl->update_window ||
+ fbdev->ctrl->get_update_mode() != OMAPFB_MANUAL_UPDATE)
+ return -ENODEV;
win.x = 0;
win.y = 0;
- win.width = fbdev->panel->x_res;
- win.height = fbdev->panel->y_res;
+ win.width = fbi->var.xres;
+ win.height = fbi->var.yres;
win.format = 0;
omapfb_rqueue_lock(fbdev);
- fbdev->ctrl->update_window(&win, NULL, 0);
+ r = fbdev->ctrl->update_window(fbi, &win, NULL, 0);
omapfb_rqueue_unlock(fbdev);
+
+ return r;
}
-static int omapfb_setup_plane(struct omapfb_device *fbdev,
- struct omapfb_setup_plane *sp)
+static int omapfb_setup_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
{
+ struct omapfb_plane_struct *plane = fbi->par;
+ struct omapfb_device *fbdev = plane->fbdev;
int r;
- omapfb_rqueue_lock(fbdev);
- r = fbdev->ctrl->setup_plane(sp->plane, sp->channel_out, sp->offset,
- sp->width, sp->pos_x, sp->pos_y, sp->width,
- sp->height, sp->color_mode);
- omapfb_rqueue_unlock(fbdev);
+ plane->info = *pi;
+ r = ctrl_change_mode(fbi);
+ if (r < 0)
+ return r;
+ return fbdev->ctrl->enable_plane(plane->idx, pi->enabled);
+}
- return r;
+static int omapfb_query_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
+{
+ struct omapfb_plane_struct *plane = fbi->par;
+
+ *pi = plane->info;
+ return 0;
}
-static int omapfb_enable_plane(struct omapfb_device *fbdev, int plane,
- int enable)
+static int omapfb_set_color_key(struct omapfb_device *fbdev,
+ struct omapfb_color_key *ck)
{
int r;
+ if (!fbdev->ctrl->set_color_key)
+ return -ENODEV;
+
omapfb_rqueue_lock(fbdev);
- r = fbdev->ctrl->enable_plane(plane, enable);
+ r = fbdev->ctrl->set_color_key(ck);
omapfb_rqueue_unlock(fbdev);
return r;
}
-static int omapfb_set_color_key(struct omapfb_device *fbdev,
+static int omapfb_get_color_key(struct omapfb_device *fbdev,
struct omapfb_color_key *ck)
{
int r;
- if (!fbdev->ctrl->set_color_key)
+ if (!fbdev->ctrl->get_color_key)
return -ENODEV;
omapfb_rqueue_lock(fbdev);
- r = fbdev->ctrl->set_color_key(ck);
+ r = fbdev->ctrl->get_color_key(ck);
omapfb_rqueue_unlock(fbdev);
return r;
}
-static BLOCKING_NOTIFIER_HEAD(omapfb_notifier_list);
+static struct blocking_notifier_head omapfb_client_list[OMAPFB_PLANE_NUM];
+static int notifier_inited;
+
+static void omapfb_init_notifier(void)
+{
+ int i;
+
+ for (i = 0; i < OMAPFB_PLANE_NUM; i++)
+ BLOCKING_INIT_NOTIFIER_HEAD(&omapfb_client_list[i]);
+}
int omapfb_register_client(struct omapfb_notifier_block *omapfb_nb,
- omapfb_notifier_callback_t callback,
- void *callback_data)
+ omapfb_notifier_callback_t callback,
+ void *callback_data)
{
int r;
- DBGENTER(1);
+ if ((unsigned)omapfb_nb->plane_idx > OMAPFB_PLANE_NUM)
+ return -EINVAL;
+
+ if (!notifier_inited) {
+ omapfb_init_notifier();
+ notifier_inited = 1;
+ }
omapfb_nb->nb.notifier_call = (int (*)(struct notifier_block *,
unsigned long, void *))callback;
omapfb_nb->data = callback_data;
- r = blocking_notifier_chain_register(&omapfb_notifier_list, &omapfb_nb->nb);
+ r = blocking_notifier_chain_register(
+ &omapfb_client_list[omapfb_nb->plane_idx],
+ &omapfb_nb->nb);
if (r)
return r;
if (omapfb_dev != NULL &&
int omapfb_unregister_client(struct omapfb_notifier_block *omapfb_nb)
{
- return blocking_notifier_chain_unregister(&omapfb_notifier_list,
- &omapfb_nb->nb);
+ return blocking_notifier_chain_unregister(
+ &omapfb_client_list[omapfb_nb->plane_idx], &omapfb_nb->nb);
}
EXPORT_SYMBOL(omapfb_unregister_client);
void omapfb_notify_clients(struct omapfb_device *fbdev, unsigned long event)
{
- DBGENTER(1);
- blocking_notifier_call_chain(&omapfb_notifier_list, event, fbdev);
+ int i;
+
+ if (!notifier_inited)
+ /* no client registered yet */
+ return;
+
+ for (i = 0; i < OMAPFB_PLANE_NUM; i++)
+ blocking_notifier_call_chain(&omapfb_client_list[i], event,
+ fbdev->fb_info[i]);
}
EXPORT_SYMBOL(omapfb_notify_clients);
return r;
}
-static unsigned long omapfb_get_caps(struct fb_info *fbi)
+static unsigned long omapfb_get_caps(struct omapfb_device *fbdev)
{
- struct omapfb_device *fbdev = (struct omapfb_device *)fbi->par;
unsigned long caps;
caps = 0;
- caps |= fbdev->panel->get_caps();
+ caps |= fbdev->panel->get_caps(fbdev->panel);
caps |= fbdev->ctrl->get_caps();
return caps;
}
void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval)
{
omapfb_rqueue_lock(fbdev);
- *(u16 *)fbdev->vram_virt_base = pixval;
+ *(u16 *)fbdev->mem_desc.region[0].vaddr = pixval;
if (fbdev->ctrl->get_update_mode() == OMAPFB_MANUAL_UPDATE) {
struct omapfb_update_window win;
win.width = 1;
win.height = 1;
win.format = 0;
- fbdev->ctrl->update_window(&win, NULL, 0);
+ fbdev->ctrl->update_window(fbdev->fb_info[0], &win, NULL, 0);
}
omapfb_rqueue_unlock(fbdev);
}
EXPORT_SYMBOL(omapfb_write_first_pixel);
/* Ioctl interface. Part of the kernel mode frame buffer API is duplicated
- * here to be accessible by user mode code. In addition transparent copy
- * graphics transformations, frame flipping support is provided through this
- * interface.
+ * here to be accessible by user mode code.
*/
static int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd,
unsigned long arg)
{
- struct omapfb_device *fbdev = (struct omapfb_device *)fbi->par;
+ struct omapfb_plane_struct *plane = fbi->par;
+ struct omapfb_device *fbdev = plane->fbdev;
struct fb_ops *ops = fbi->fbops;
union {
struct omapfb_update_window update_window;
- struct omapfb_setup_plane setup_plane;
- struct omapfb_enable_plane enable_plane;
+ struct omapfb_plane_info plane_info;
struct omapfb_color_key color_key;
enum omapfb_update_mode update_mode;
unsigned long caps;
unsigned int mirror;
+ int plane_out;
+ int enable_plane;
} p;
int r = 0;
BUG_ON(!ops);
- DBGPRINT(2, "cmd=%010x\n", cmd);
switch (cmd)
{
case OMAPFB_MIRROR:
if (get_user(p.mirror, (int __user *)arg))
r = -EFAULT;
else
- omapfb_mirror(fbdev, p.mirror);
+ omapfb_mirror(fbi, p.mirror);
break;
case OMAPFB_SYNC_GFX:
omapfb_sync(fbi);
r = -EFAULT;
else {
p.update_window.format = 0;
- r = omapfb_update_win(fbdev, &p.update_window);
+ r = omapfb_update_win(fbi, &p.update_window);
}
break;
case OMAPFB_UPDATE_WINDOW:
sizeof(p.update_window)))
r = -EFAULT;
else
- r = omapfb_update_win(fbdev, &p.update_window);
+ r = omapfb_update_win(fbi, &p.update_window);
break;
case OMAPFB_SETUP_PLANE:
- if (copy_from_user(&p.setup_plane, (void __user *)arg,
- sizeof(p.setup_plane)))
+ if (copy_from_user(&p.plane_info, (void __user *)arg,
+ sizeof(p.plane_info)))
r = -EFAULT;
else
- r = omapfb_setup_plane(fbdev, &p.setup_plane);
+ r = omapfb_setup_plane(fbi, &p.plane_info);
break;
- case OMAPFB_ENABLE_PLANE:
- if (copy_from_user(&p.enable_plane, (void __user *)arg,
- sizeof(p.enable_plane)))
+ case OMAPFB_QUERY_PLANE:
+ if ((r = omapfb_query_plane(fbi, &p.plane_info)) < 0)
+ break;
+ if (copy_to_user((void __user *)arg, &p.plane_info,
+ sizeof(p.plane_info)))
r = -EFAULT;
- else
- r = omapfb_enable_plane(fbdev,
- p.enable_plane.plane, p.enable_plane.enable);
break;
case OMAPFB_SET_COLOR_KEY:
if (copy_from_user(&p.color_key, (void __user *)arg,
else
r = omapfb_set_color_key(fbdev, &p.color_key);
break;
- case OMAPFB_GET_CAPS:
- p.caps = omapfb_get_caps(fbi);
- if (put_user(p.caps, (unsigned long __user *)arg))
+ case OMAPFB_GET_COLOR_KEY:
+ if ((r = omapfb_get_color_key(fbdev, &p.color_key)) < 0)
+ break;
+ if (copy_to_user((void __user *)arg, &p.color_key,
+ sizeof(p.color_key)))
r = -EFAULT;
break;
case OMAPFB_LCD_TEST:
r = -EINVAL;
break;
}
- r = fbdev->panel->run_test(test_num);
+ r = fbdev->panel->run_test(fbdev->panel, test_num);
break;
}
case OMAPFB_CTRL_TEST:
r = -EINVAL;
}
- DBGLEAVE(2);
return r;
}
{
struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
- return snprintf(buf, PAGE_SIZE, "%#010lx\n",
- omapfb_get_caps(fbdev->fb_info));
+ return snprintf(buf, PAGE_SIZE, "%#010lx\n", omapfb_get_caps(fbdev));
}
static ssize_t omapfb_show_caps_text(struct device *dev, struct device_attribute *attr, char *buf)
int i;
unsigned long caps;
- caps = omapfb_get_caps(fbdev->fb_info);
+ caps = omapfb_get_caps(fbdev);
for (i = 0; i < ARRAY_SIZE(omapfb_caps_table) && pos < PAGE_SIZE; i++) {
if (omapfb_caps_table[i].flag & caps) {
pos += snprintf(&buf[pos], PAGE_SIZE - pos, "%s\n",
if (fbdev->panel->get_bklight_level) {
r = snprintf(buf, PAGE_SIZE, "%d\n",
- fbdev->panel->get_bklight_level());
+ fbdev->panel->get_bklight_level(fbdev->panel));
} else
r = -ENODEV;
return r;
unsigned int level;
if (sscanf(buf, "%10d", &level) == 1) {
- r = fbdev->panel->set_bklight_level(level);
+ r = fbdev->panel->set_bklight_level(fbdev->panel, level);
} else
r = -EINVAL;
} else
if (fbdev->panel->get_bklight_level) {
r = snprintf(buf, PAGE_SIZE, "%d\n",
- fbdev->panel->get_bklight_max());
+ fbdev->panel->get_bklight_max(fbdev->panel));
} else
r = -ENODEV;
return r;
fail1:
device_remove_file(fbdev->dev, &dev_attr_caps_num);
fail0:
- pr_err("unable to register sysfs interface\n");
+ dev_err(fbdev->dev, "unable to register sysfs interface\n");
return r;
}
/* Initialize system fb_info object and set the default video mode.
* The frame buffer memory already allocated by lcddma_init
*/
-static int fbinfo_init(struct omapfb_device *fbdev)
+static int fbinfo_init(struct omapfb_device *fbdev, struct fb_info *info,
+ struct omapfb_mem_region *region)
{
- struct fb_info *info = fbdev->fb_info;
struct fb_var_screeninfo *var = &info->var;
+ struct fb_fix_screeninfo *fix = &info->fix;
int r = 0;
- DBGENTER(1);
-
- BUG_ON(!fbdev->vram_virt_base);
-
info->fbops = &omapfb_ops;
info->flags = FBINFO_FLAG_DEFAULT;
- info->screen_base = (char __iomem *)fbdev->vram_virt_base;
+
+ strncpy(fix->id, MODULE_NAME, sizeof(fix->id));
+
+ info->screen_base = (char __iomem *)region->vaddr;
+ fix->smem_start = region->paddr;
+ fix->smem_len = region->size;
info->pseudo_palette = fbdev->pseudo_palette;
var->accel_flags = def_accel ? FB_ACCELF_TEXT : 0;
+ var->xres = def_vxres;
+ var->yres = def_vyres;
var->xres_virtual = def_vxres;
var->yres_virtual = def_vyres;
var->rotate = def_rotate;
+ var->bits_per_pixel = fbdev->panel->bpp;
- fbdev->mirror = def_mirror;
-
- set_fb_var(fbdev, var);
- set_fb_fix(fbdev);
+ set_fb_var(info, var);
+ set_fb_fix(info);
r = fb_alloc_cmap(&info->cmap, 16, 0);
if (r != 0)
- pr_err("unable to allocate color map memory\n");
+ dev_err(fbdev->dev, "unable to allocate color map memory\n");
- DBGLEAVE(1);
return r;
}
/* Release the fb_info object */
-static void fbinfo_cleanup(struct omapfb_device *fbdev)
+static void fbinfo_cleanup(struct omapfb_device *fbdev, struct fb_info *fbi)
{
- DBGENTER(1);
+ fb_dealloc_cmap(&fbi->cmap);
+}
- fb_dealloc_cmap(&fbdev->fb_info->cmap);
+static void planes_cleanup(struct omapfb_device *fbdev)
+{
+ int i;
- DBGLEAVE(1);
+ for (i = 0; i < fbdev->mem_desc.region_cnt; i++) {
+ if (fbdev->fb_info[i] == NULL)
+ break;
+ fbinfo_cleanup(fbdev, fbdev->fb_info[i]);
+ framebuffer_release(fbdev->fb_info[i]);
+ }
+}
+
+static int planes_init(struct omapfb_device *fbdev)
+{
+ struct fb_info *fbi;
+ int i;
+ int r;
+
+ for (i = 0; i < fbdev->mem_desc.region_cnt; i++) {
+ struct omapfb_plane_struct *plane;
+ fbi = framebuffer_alloc(sizeof(struct omapfb_plane_struct),
+ fbdev->dev);
+ if (fbi == NULL) {
+ dev_err(fbdev->dev,
+ "unable to allocate memory for plane info\n");
+ planes_cleanup(fbdev);
+ return -ENOMEM;
+ }
+ plane = fbi->par;
+ plane->idx = i;
+ plane->fbdev = fbdev;
+ plane->info.mirror = def_mirror;
+ fbdev->fb_info[i] = fbi;
+
+ if ((r = fbinfo_init(fbdev, fbi,
+ &fbdev->mem_desc.region[i])) < 0) {
+ framebuffer_release(fbi);
+ planes_cleanup(fbdev);
+ return r;
+ }
+ plane->info.out_width = fbi->var.xres;
+ plane->info.out_height = fbi->var.yres;
+ }
+ return 0;
}
/* Free driver resources. Can be called to rollback an aborted initialization
*/
static void omapfb_free_resources(struct omapfb_device *fbdev, int state)
{
+ int i;
+
switch (state) {
case OMAPFB_ACTIVE:
- unregister_framebuffer(fbdev->fb_info);
+ for (i = 0; i < fbdev->mem_desc.region_cnt; i++)
+ unregister_framebuffer(fbdev->fb_info[i]);
case 7:
omapfb_unregister_sysfs(fbdev);
case 6:
- fbdev->panel->disable();
+ fbdev->panel->disable(fbdev->panel);
case 5:
omapfb_set_update_mode(fbdev, OMAPFB_UPDATE_DISABLED);
case 4:
- fbinfo_cleanup(fbdev);
+ planes_cleanup(fbdev);
case 3:
ctrl_cleanup(fbdev);
case 2:
- fbdev->panel->cleanup();
+ fbdev->panel->cleanup(fbdev->panel);
case 1:
dev_set_drvdata(fbdev->dev, NULL);
- framebuffer_release(fbdev->fb_info);
+ kfree(fbdev);
case 0:
/* nothing to free */
break;
char name[17];
int i;
- conf = (struct omapfb_platform_data *)fbdev->dev->platform_data;
+ conf = fbdev->dev->platform_data;
fbdev->ctrl = NULL;
- if (conf == NULL) {
- DBGPRINT(1, "omap_lcd_config not found\n");
- return -1;
- }
strncpy(name, conf->lcd.ctrl_name, sizeof(name) - 1);
name[sizeof(name) - 1] = '\0';
}
for (i = 0; i < ARRAY_SIZE(ctrls); i++) {
- DBGPRINT(1, "ctrl %s\n", ctrls[i]->name);
+ dev_dbg(fbdev->dev, "ctrl %s\n", ctrls[i]->name);
if (strcmp(ctrls[i]->name, name) == 0) {
fbdev->ctrl = ctrls[i];
break;
}
if (fbdev->ctrl == NULL) {
- DBGPRINT(1, "ctrl %s not supported\n", name);
+ dev_dbg(fbdev->dev, "ctrl %s not supported\n", name);
return -1;
}
/* Called by LDM binding to probe and attach a new device.
* Initialization sequence:
- * 1. allocate system fb_info structure
- * select panel type according to machine type
- * 2. init LCD panel
+ * 1. allocate system omapfb_device structure
+ * 2. select controller type according to platform configuration
+ * init LCD panel
* 3. init LCD controller and LCD DMA
- * 4. init system fb_info structure
- * 5. init gfx DMA
+ * 4. init system fb_info structure for all planes
+ * 5. setup video mode for first plane and enable it
* 6. enable LCD panel
- * start LCD frame transfer
- * 7. register system fb_info structure
+ * 7. register sysfs attributes
+ * OMAPFB_ACTIVE: register system fb_info structure for all planes
*/
static int omapfb_do_probe(struct platform_device *pdev, struct lcd_panel *panel)
{
struct omapfb_device *fbdev = NULL;
- struct fb_info *fbi;
int init_state;
unsigned long phz, hhz, vhz;
+ unsigned long vram;
+ int i;
int r = 0;
- DBGENTER(1);
-
init_state = 0;
if (pdev->num_resources != 0) {
- pr_err("probed for an unknown device\n");
+ dev_err(&pdev->dev, "probed for an unknown device\n");
r = -ENODEV;
goto cleanup;
}
- fbi = framebuffer_alloc(sizeof(struct omapfb_device), &pdev->dev);
- if (fbi == NULL) {
- pr_err("unable to allocate memory for device info\n");
+ if (pdev->dev.platform_data == NULL) {
+ dev_err(&pdev->dev, "missing platform data\n");
+ r = -ENOENT;
+ goto cleanup;
+ }
+
+ fbdev = kzalloc(sizeof(struct omapfb_device), GFP_KERNEL);
+ if (fbdev == NULL) {
+ dev_err(&pdev->dev,
+ "unable to allocate memory for device info\n");
r = -ENOMEM;
goto cleanup;
}
init_state++;
- fbdev = (struct omapfb_device *)fbi->par;
- fbdev->fb_info = fbi;
fbdev->dev = &pdev->dev;
fbdev->panel = panel;
platform_set_drvdata(pdev, fbdev);
#ifdef CONFIG_ARCH_OMAP1
fbdev->int_ctrl = &omap1_int_ctrl;
#ifdef CONFIG_FB_OMAP_LCDC_EXTERNAL
- fbdev->ext_if = &sossi_extif;
+ fbdev->ext_if = &omap1_ext_if;
#endif
#else /* OMAP2 */
fbdev->int_ctrl = &omap2_int_ctrl;
#ifdef CONFIG_FB_OMAP_LCDC_EXTERNAL
- fbdev->ext_if = &rfbi_extif;
+ fbdev->ext_if = &omap2_ext_if;
#endif
#endif
if (omapfb_find_ctrl(fbdev) < 0) {
- pr_err("LCD controller not found, board not supported\n");
+ dev_err(fbdev->dev,
+ "LCD controller not found, board not supported\n");
r = -ENODEV;
goto cleanup;
}
- pr_info(MODULE_NAME ": configured for panel %s\n", fbdev->panel->name);
-
- r = fbdev->panel->init(fbdev);
+ r = fbdev->panel->init(fbdev->panel, fbdev);
if (r)
goto cleanup;
+
+ pr_info("omapfb: configured for panel %s\n", fbdev->panel->name);
+
+ def_vxres = def_vxres ? : fbdev->panel->x_res;
+ def_vyres = def_vyres ? : fbdev->panel->y_res;
+
init_state++;
r = ctrl_init(fbdev);
goto cleanup;
init_state++;
- /* We depend on doing this after ctrl_init, since it can redefine
- * member functions.
- */
- if (fbdev->ctrl->mmap)
- omapfb_ops.fb_mmap = omapfb_mmap;
-
check_required_callbacks(fbdev);
- r = fbinfo_init(fbdev);
+ r = planes_init(fbdev);
if (r)
goto cleanup;
init_state++;
#ifdef CONFIG_FB_OMAP_DMA_TUNE
/* Set DMA priority for EMIFF access to highest */
if (cpu_class_is_omap1())
- omap_set_dma_priority(0, OMAP_DMA_PORT_EMIFF, 15);
+ omap_set_dma_priority(OMAP_DMA_PORT_EMIFF, 15);
#endif
- r = ctrl_change_mode(fbdev);
+ r = ctrl_change_mode(fbdev->fb_info[0]);
if (r) {
- pr_err("mode setting failed\n");
+ dev_err(fbdev->dev, "mode setting failed\n");
goto cleanup;
}
- if (!manual_update)
- omapfb_enable_plane(fbdev, OMAPFB_PLANE_GFX, 1);
+ /* GFX plane is enabled by default */
+ r = fbdev->ctrl->enable_plane(OMAPFB_PLANE_GFX, 1);
+ if (r)
+ goto cleanup;
omapfb_set_update_mode(fbdev, manual_update ?
OMAPFB_MANUAL_UPDATE : OMAPFB_AUTO_UPDATE);
init_state++;
- r = fbdev->panel->enable();
+ r = fbdev->panel->enable(fbdev->panel);
if (r)
goto cleanup;
init_state++;
goto cleanup;
init_state++;
- r = register_framebuffer(fbdev->fb_info);
- if (r != 0) {
- pr_err("register_framebuffer failed\n");
- goto cleanup;
+ vram = 0;
+ for (i = 0; i < fbdev->mem_desc.region_cnt; i++) {
+ r = register_framebuffer(fbdev->fb_info[i]);
+ if (r != 0) {
+ dev_err(fbdev->dev,
+ "registering framebuffer %d failed\n", i);
+ goto cleanup;
+ }
+ vram += fbdev->mem_desc.region[i].size;
}
fbdev->state = OMAPFB_ACTIVE;
omapfb_dev = fbdev;
- pr_info(MODULE_NAME ": initialized vram=%lu "
- "pixclock %lu kHz hfreq %lu.%lu kHz vfreq %lu.%lu Hz\n",
- fbdev->vram_size,
+ pr_info("omapfb: Framebuffer initialized. Total vram %lu planes %d\n",
+ vram, fbdev->mem_desc.region_cnt);
+ pr_info("omapfb: Pixclock %lu kHz hfreq %lu.%lu kHz "
+ "vfreq %lu.%lu Hz\n",
phz / 1000, hhz / 10000, hhz % 10, vhz / 10, vhz % 10);
- DBGLEAVE(1);
return 0;
cleanup:
omapfb_free_resources(fbdev, init_state);
- DBGLEAVE(1);
return r;
}
{
BUG_ON(fbdev_pdev != NULL);
- DBGENTER(1);
+ /* Delay actual initialization until the LCD is registered */
fbdev_pdev = pdev;
if (fbdev_panel != NULL)
omapfb_do_probe(fbdev_pdev, fbdev_panel);
{
BUG_ON(fbdev_panel != NULL);
- DBGENTER(1);
fbdev_panel = panel;
if (fbdev_pdev != NULL)
omapfb_do_probe(fbdev_pdev, fbdev_panel);
struct omapfb_device *fbdev = platform_get_drvdata(pdev);
enum omapfb_state saved_state = fbdev->state;
- DBGENTER(1);
/* FIXME: wait till completion of pending events */
fbdev->state = OMAPFB_DISABLED;
omapfb_free_resources(fbdev, saved_state);
- DBGLEAVE(1);
return 0;
}
{
struct omapfb_device *fbdev = platform_get_drvdata(pdev);
- DBGENTER(1);
-
- omapfb_blank(VESA_POWERDOWN, fbdev->fb_info);
-
- DBGLEAVE(1);
+ omapfb_blank(VESA_POWERDOWN, fbdev->fb_info[0]);
return 0;
}
{
struct omapfb_device *fbdev = platform_get_drvdata(pdev);
- DBGENTER(1);
-
- omapfb_blank(VESA_NO_BLANKING, fbdev->fb_info);
-
- DBGLEAVE(1);
+ omapfb_blank(VESA_NO_BLANKING, fbdev->fb_info[0]);
return 0;
}
.suspend = omapfb_suspend,
.resume = omapfb_resume,
.driver = {
- .name = OMAPFB_DRIVER,
+ .name = MODULE_NAME,
.owner = THIS_MODULE,
},
};
char *this_opt = NULL;
int r = 0;
- DBGENTER(1);
+ pr_debug("omapfb: options %s\n", options);
if (!options || !*options)
- goto exit;
+ return 0;
while (!r && (this_opt = strsep(&options, ",")) != NULL) {
if (!strncmp(this_opt, "accel", 5))
def_accel = 1;
else if (!strncmp(this_opt, "vram:", 5)) {
char *suffix;
- def_vram = (simple_strtoul(this_opt + 5, &suffix, 0));
+ unsigned long vram;
+ vram = (simple_strtoul(this_opt + 5, &suffix, 0));
switch (suffix[0]) {
case '\0':
break;
case 'm':
case 'M':
- def_vram *= 1024;
+ vram *= 1024;
/* Fall through */
case 'k':
case 'K':
- def_vram *= 1024;
+ vram *= 1024;
break;
default:
- pr_err("invalid vram suffix\n");
+ pr_debug("omapfb: invalid vram suffix %c\n",
+ suffix[0]);
r = -1;
}
+ def_vram[def_vram_cnt++] = vram;
}
else if (!strncmp(this_opt, "vxres:", 6))
def_vxres = simple_strtoul(this_opt + 6, NULL, 0);
else if (!strncmp(this_opt, "manual_update", 13))
manual_update = 1;
else {
- pr_err("invalid option\n");
+ pr_debug("omapfb: invalid option\n");
r = -1;
}
}
-exit:
- DBGLEAVE(1);
+
return r;
}
/* Register both the driver and the device */
static int __init omapfb_init(void)
{
- int r = 0;
-
- DBGENTER(1);
-
#ifndef MODULE
- {
- char *option;
+ char *option;
- if (fb_get_options("omapfb", &option)) {
- r = -ENODEV;
- goto exit;
- }
- omapfb_setup(option);
- }
+ if (fb_get_options("omapfb", &option))
+ return -ENODEV;
+ omapfb_setup(option);
#endif
/* Register the driver with LDM */
if (platform_driver_register(&omapfb_driver)) {
- pr_err("failed to register omapfb driver\n");
- r = -ENODEV;
- goto exit;
+ pr_debug("failed to register omapfb driver\n");
+ return -ENODEV;
}
-exit:
- DBGLEAVE(1);
- return r;
+ return 0;
}
static void __exit omapfb_cleanup(void)
{
- DBGENTER(1);
-
platform_driver_unregister(&omapfb_driver);
-
- DBGLEAVE(1);
}
module_param_named(accel, def_accel, uint, 0664);
-module_param_named(vram, def_vram, ulong, 0664);
+module_param_array_named(vram, def_vram, ulong, &def_vram_cnt, 0664);
module_param_named(vxres, def_vxres, long, 0664);
module_param_named(vyres, def_vyres, long, 0664);
module_param_named(rotate, def_rotate, uint, 0664);
projects / linux-2.6-omap-h63xx.git / blobdiff