54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
From 07482193cccdfe9ede1f47d72790dfbe54343505 Mon Sep 17 00:00:00 2001
|
|
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
|
|
Date: Wed, 22 Apr 2009 10:26:06 +0300
|
|
Subject: [PATCH] DSS2: OMAPFB: remove fb clearing code
|
|
|
|
VRAM manager does the clearing now when the area is allocated.
|
|
---
|
|
drivers/video/omap2/omapfb/omapfb-main.c | 8 --------
|
|
1 files changed, 0 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
|
|
index cd63740..76e7c6c 100644
|
|
--- a/drivers/video/omap2/omapfb/omapfb-main.c
|
|
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
|
|
@@ -1174,7 +1174,6 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
|
|
struct omapfb2_mem_region *rg;
|
|
void __iomem *vaddr;
|
|
int r;
|
|
- int clear = 0;
|
|
|
|
rg = &ofbi->region;
|
|
memset(rg, 0, sizeof(*rg));
|
|
@@ -1184,7 +1183,6 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
|
|
if (!paddr) {
|
|
DBG("allocating %lu bytes for fb %d\n", size, ofbi->id);
|
|
r = omap_vram_alloc(OMAPFB_MEMTYPE_SDRAM, size, &paddr);
|
|
- clear = 1;
|
|
} else {
|
|
DBG("reserving %lu bytes at %lx for fb %d\n", size, paddr,
|
|
ofbi->id);
|
|
@@ -1206,9 +1204,6 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
|
|
}
|
|
|
|
DBG("allocated VRAM paddr %lx, vaddr %p\n", paddr, vaddr);
|
|
-
|
|
- if (clear)
|
|
- memset_io(vaddr, 0, size);
|
|
} else {
|
|
void __iomem *va;
|
|
|
|
@@ -1232,9 +1227,6 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
|
|
rg->vrfb.vaddr[0] = va;
|
|
|
|
vaddr = NULL;
|
|
-
|
|
- if (clear)
|
|
- memset_io(va, 0, size);
|
|
}
|
|
|
|
rg->paddr = paddr;
|
|
--
|
|
1.5.6.5
|
|
|