OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: xgifb: move pseudo_palette into xgifb_video_info 

pseudo_palette should be dynamically allocated for each fb.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Aaro Koskinen 2011-10-11 21:47:24 +03:00 committed by Greg Kroah-Hartman
parent 5aa55d9f97
commit 76cabaa428
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/xgifb/XGI_main.h
View File

@ -160,8 +160,6 @@ static struct fb_fix_screeninfo XGIfb_fix = {
.xpanstep = 1,
.ypanstep = 1,
};
static u32 pseudo_palette[17];
/* display status */
static int XGIfb_crt1off;

2
drivers/staging/xgifb/XGI_main_26.c
View File

@ -2390,7 +2390,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
fb_info->screen_base = xgifb_info->video_vbase;
fb_info->fbops = &XGIfb_ops;
XGIfb_get_fix(&fb_info->fix, -1, fb_info);
fb_info->pseudo_palette = pseudo_palette;
fb_info->pseudo_palette = xgifb_info->pseudo_palette;
fb_alloc_cmap(&fb_info->cmap, 256 , 0);

2
drivers/staging/xgifb/XGIfb.h
View File

@ -61,6 +61,8 @@ struct xgifb_video_info {
int mode_idx;
int rate_idx;
u32 pseudo_palette[17];
int chip_id;
unsigned int video_size;
unsigned long video_base;