diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 11:42:46 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 11:42:46 +0200 |
| commit | dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8 (patch) | |
| tree | fb198f6a52f4790ea2468a421fc8c91a3b3648c8 /arch/arm/plat-omap/fb.c | |
| parent | 3c3dd225819112e56554162c6b37e61a31924e0c (diff) | |
| parent | 966458f89d84ef5792893a01e2b7a5218c7b311d (diff) | |
| download | op-kernel-dev-dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8.zip op-kernel-dev-dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8.tar.gz | |
Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux
Conflicts:
drivers/video/omap2/dss/Kconfig
drivers/video/omap2/omapfb/omapfb-ioctl.c
drivers/video/omap2/omapfb/omapfb-main.c
Merge changes to make omapfb use common dma_alloc, and remove omap's
custom vram allocator.
Diffstat (limited to 'arch/arm/plat-omap/fb.c')
| -rw-r--r-- | arch/arm/plat-omap/fb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index f868cae..6df0c21 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c @@ -29,6 +29,7 @@ #include <linux/memblock.h> #include <linux/io.h> #include <linux/omapfb.h> +#include <linux/dma-mapping.h> #include <mach/hardware.h> #include <asm/mach/map.h> @@ -106,7 +107,7 @@ static struct platform_device omap_fb_device = { .id = -1, .dev = { .dma_mask = &omap_fb_dma_mask, - .coherent_dma_mask = ~(u32)0, + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = &omapfb_config, }, .num_resources = 0, @@ -142,7 +143,7 @@ static struct platform_device omap_fb_device = { .id = -1, .dev = { .dma_mask = &omap_fb_dma_mask, - .coherent_dma_mask = ~(u32)0, + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = &omapfb_config, }, .num_resources = 0, |
