Skip to contentSkip to conversation

atyfb: atyfb: Unshare pseudo_palette

PATCH In review Antonino A. Daplas 1 participant 1 message Aug 26, 2007 Framebuffer layer

lore
Share & tools
lore

Antonino A. Daplas

author
#0 lore raw

PATCH 2/20 atyfb: atyfb: Unshare pseudo_palette

From: Geert Uytterhoeven <[email protected]>

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 <[email protected]>
Signed-off-by Antonino Daplas <[email protected]>

---

 drivers/video/aty/atyfb.h      |    1 +
 drivers/video/aty/atyfb_base.c |    4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/video/aty/atyfb.h +1 -0
index dc62f8e..7691e73 100644
@@ -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
index bc6f009..b537151 100644
@@ -541,8 +541,6 @@ static char ram_off[] __devinitdata = "O
 #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 @@ #ifdef CONFIG_MTRR
 #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  |

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/