Commit ad41b439 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

atyfb: atyfb: Unshare pseudo_palette

atyfb: Move the pseudo palette into the card-specific atyfb_par, so it's no
longer shared among multiple cards
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 93613b9f
...@@ -126,6 +126,7 @@ union aty_pll { ...@@ -126,6 +126,7 @@ union aty_pll {
*/ */
struct atyfb_par { struct atyfb_par {
u32 pseudo_palette[16];
struct { u8 red, green, blue; } palette[256]; struct { u8 red, green, blue; } palette[256];
const struct aty_dac_ops *dac_ops; const struct aty_dac_ops *dac_ops;
const struct aty_pll_ops *pll_ops; const struct aty_pll_ops *pll_ops;
......
...@@ -541,8 +541,6 @@ static char ram_off[] __devinitdata = "OFF"; ...@@ -541,8 +541,6 @@ static char ram_off[] __devinitdata = "OFF";
#endif /* CONFIG_FB_ATY_CT */ #endif /* CONFIG_FB_ATY_CT */
static u32 pseudo_palette[16];
#ifdef CONFIG_FB_ATY_GX #ifdef CONFIG_FB_ATY_GX
static char *aty_gx_ram[8] __devinitdata = { static char *aty_gx_ram[8] __devinitdata = {
ram_dram, ram_vram, ram_vram, ram_dram, ram_dram, ram_vram, ram_vram, ram_dram,
...@@ -2577,7 +2575,7 @@ static int __devinit aty_init(struct fb_info *info) ...@@ -2577,7 +2575,7 @@ static int __devinit aty_init(struct fb_info *info)
#endif #endif
info->fbops = &atyfb_ops; info->fbops = &atyfb_ops;
info->pseudo_palette = pseudo_palette; info->pseudo_palette = par->pseudo_palette;
info->flags = FBINFO_DEFAULT | info->flags = FBINFO_DEFAULT |
FBINFO_HWACCEL_IMAGEBLIT | FBINFO_HWACCEL_IMAGEBLIT |
FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_FILLRECT |
......
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