@@ -1391,9 +1391,6 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
size = PAGE_ALIGN(size);
- WARN_ONCE(paddr,
- "reserving memory at predefined address not supported\n");
-
dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);
if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
@@ -1521,6 +1518,9 @@ static int omapfb_parse_vram_param(const char *param, int max_entries,
}
+ WARN_ONCE(paddr,
+ "reserving memory at predefined address not supported\n");
+
paddrs[fbnum] = paddr;
sizes[fbnum] = size;
omapfb gives a WARN_ONCE if a predefined physical address is given for allocating the framebuffer memory, as this is not currently supported. However, the same warning happens if omapfb fails to allocate memory during runtime, as when the allocation has failed, omapfb tries to re-allocate the old memory with the physical address of the old memory area. Remove the warning from omapfb_alloc_fbmem, as it serves no purpose on the failure case above, and move it to omapfb_parse_vram_param, so that we only warn if physical address is given via omapfb module parameters. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/video/omap2/omapfb/omapfb-main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)