Commit 76cabaa4 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

staging: xgifb: move pseudo_palette into xgifb_video_info

pseudo_palette should be dynamically allocated for each fb.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5aa55d9f
...@@ -160,8 +160,6 @@ static struct fb_fix_screeninfo XGIfb_fix = { ...@@ -160,8 +160,6 @@ static struct fb_fix_screeninfo XGIfb_fix = {
.xpanstep = 1, .xpanstep = 1,
.ypanstep = 1, .ypanstep = 1,
}; };
static u32 pseudo_palette[17];
/* display status */ /* display status */
static int XGIfb_crt1off; static int XGIfb_crt1off;
......
...@@ -2390,7 +2390,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, ...@@ -2390,7 +2390,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
fb_info->screen_base = xgifb_info->video_vbase; fb_info->screen_base = xgifb_info->video_vbase;
fb_info->fbops = &XGIfb_ops; fb_info->fbops = &XGIfb_ops;
XGIfb_get_fix(&fb_info->fix, -1, fb_info); 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); fb_alloc_cmap(&fb_info->cmap, 256 , 0);
......
...@@ -61,6 +61,8 @@ struct xgifb_video_info { ...@@ -61,6 +61,8 @@ struct xgifb_video_info {
int mode_idx; int mode_idx;
int rate_idx; int rate_idx;
u32 pseudo_palette[17];
int chip_id; int chip_id;
unsigned int video_size; unsigned int video_size;
unsigned long video_base; unsigned long video_base;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment