Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad41b439 authored Oct 16, 2007 by Geert Uytterhoeven Committed by Linus Torvalds Oct 16, 2007

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: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 93613b9f

drivers/video/aty/atyfb.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ union aty_pll {
		*/

		struct atyfb_par {
		u32 pseudo_palette[16];
		struct { u8 red, green, blue; } palette[256];
		const struct aty_dac_ops *dac_ops;
		const struct aty_pll_ops *pll_ops;

drivers/video/aty/atyfb_base.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -541,8 +541,6 @@ static char ram_off[] __devinitdata = "OFF";
		#endif /* CONFIG_FB_ATY_CT */


		static u32 pseudo_palette[16];

		#ifdef CONFIG_FB_ATY_GX
		static char *aty_gx_ram[8] __devinitdata = {
		ram_dram, ram_vram, ram_vram, ram_dram,
		@@ -2577,7 +2575,7 @@ static int __devinit aty_init(struct fb_info *info)
		#endif

		info->fbops = &atyfb_ops;
		info->pseudo_palette = pseudo_palette;
		info->pseudo_palette = par->pseudo_palette;
		info->flags = FBINFO_DEFAULT \|
		FBINFO_HWACCEL_IMAGEBLIT \|
		FBINFO_HWACCEL_FILLRECT \|