diff options
| author | Wu Guoxing <b02248@freescale.com> | 2010-04-09 16:57:55 +0800 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-25 11:20:23 +0200 |
| commit | 87c17002508c548d2aeb308eb3d9536ac78927c0 (patch) | |
| tree | 4c2fa8f2fd428f274ed023e403b66031b93d489a /drivers/video/mxc/mxc_ipuv3_fb.c | |
| parent | 157f4e812d6a7ee38de3c47fd0df346ce3e4c2f4 (diff) | |
ENGR00122151 reserve gpu memory in kernel
add a new kernel command "gpu_memory" to reserve gpu memory in kernel
Signed-off-by:Wu Guoxing <b02248@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers/video/mxc/mxc_ipuv3_fb.c')
| -rw-r--r-- | drivers/video/mxc/mxc_ipuv3_fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c index 150e59329fb7..3d6202507d30 100644 --- a/drivers/video/mxc/mxc_ipuv3_fb.c +++ b/drivers/video/mxc/mxc_ipuv3_fb.c @@ -1557,7 +1557,7 @@ static int mxcfb_probe(struct platform_device *pdev) ipu_disable_irq(mxcfbi->ipu_ch_irq); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (res) { + if (res && res->end) { fbi->fix.smem_len = res->end - res->start + 1; fbi->fix.smem_start = res->start; fbi->screen_base = ioremap(fbi->fix.smem_start, fbi->fix.smem_len); @@ -1589,7 +1589,7 @@ static int mxcfb_probe(struct platform_device *pdev) mxcfb_set_fix(fbi); /* alocate fb first */ - if (!res) + if (!res || !res->end) if (mxcfb_map_video_memory(fbi) < 0) return -ENOMEM; |