diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-12-04 16:26:09 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-12-07 16:55:03 +0200 |
| commit | 09a8c45cbb872f5e861c4385d6967d0aa7f637f1 (patch) | |
| tree | ae7e1585ceb7437bc11428f63923ba1011930131 /drivers/video | |
| parent | b41deecbda70067b26a3a7704fdf967a7940935b (diff) | |
| download | talos-op-linux-09a8c45cbb872f5e861c4385d6967d0aa7f637f1.tar.gz talos-op-linux-09a8c45cbb872f5e861c4385d6967d0aa7f637f1.zip | |
OMAPFB: remove warning when trying to alloc at certain paddress
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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 708f2cf90204..c2dbfb832a07 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -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; |
