Skip to contentSkip to conversation

lxfb: properly alloc cmap in all cases and don't leak the memory

PATCH New Andres Salomon 1 participant 1 message Jan 29, 2009 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 lxfb: properly alloc cmap in all cases and don't leak the memory

Hi Andrew,

Can you please replace Marco's patch with this one? Marco, can you please verify that this fixes your DirectFB issues? Linux-fb folks, can you please verify that we should always have a cmap allocated (if so, there are other drivers that need fixing as well)?

From: Marco La Porta <[email protected]>

We weren't properly allocating the cmap for depths greater than 8bpp, which caused pain for things like DirectFB. Also, we never freed the cmap memory upon module unload..

[[email protected]: dropped unnecessary code and clean up patch] [[email protected]: add error checking and handling]

---
 drivers/video/geode/lxfb_core.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
drivers/video/geode/lxfb_core.c +11 -6
index b965ecd..889cbe3 100644
@@ -278,13 +278,10 @@ static int lxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
 static int lxfb_set_par(struct fb_info *info)
 {
-	if (info->var.bits_per_pixel > 8) {
+	if (info->var.bits_per_pixel > 8)
 		info->fix.visual = FB_VISUAL_TRUECOLOR;
-		fb_dealloc_cmap(&info->cmap);
-	} else {
+	else
 		info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
-		fb_alloc_cmap(&info->cmap, 1<<info->var.bits_per_pixel, 0);
-	}
 
 	info->fix.line_length = lx_get_pitch(info->var.xres,
 		info->var.bits_per_pixel);
@@ -451,6 +448,11 @@ static struct fb_info * __init lxfb_init_fbinfo(struct device *dev)
 
 	info->pseudo_palette	= (void *)par + sizeof(struct lxfb_par);
 
+	if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
+		framebuffer_release(info);
+		return NULL;
+	}
+
 	info->var.grayscale	= 0;
 
 	return info;
@@ -579,8 +581,10 @@ err:
 		pci_release_region(pdev, 3);
 	}
 
-	if (info)
+	if (info) {
+		fb_dealloc_cmap(&info->cmap);
 		framebuffer_release(info);
+	}
 
 	return ret;
 }
@@ -604,6 +608,7 @@ static void lxfb_remove(struct pci_dev *pdev)
 	iounmap(par->vp_regs);
 	pci_release_region(pdev, 3);
 
+	fb_dealloc_cmap(&info->cmap);
 	pci_set_drvdata(pdev, NULL);
 	framebuffer_release(info);
 }
Signature · 1 line
1.5.6.5