diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2013-05-21 11:12:18 +0530 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2013-05-21 13:42:45 +0530 |
| commit | aac8e32ba7052c2d82f785075a4ca1d102915c97 (patch) | |
| tree | e3b117e4961461937d6fd9d787a3aeca5aca3f62 | |
| parent | 511bca93d6cd70d22afadc119f91f299b5f2734b (diff) | |
CONFIG: ARNDALE: ANDROID: Enable CMA supportsamsung-lt-v3.9-2
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-arndale.dts | 7 | ||||
| -rw-r--r-- | arch/arm/configs/arndale_android_defconfig | 2 | ||||
| -rw-r--r-- | drivers/video/s3c-fb.c | 8 |
3 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index 89e8e191413..a524bfdac59 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -466,6 +466,13 @@ samsung,fimd-win-res = <1024 600>; samsung,fimd-win-vres = <1024 600>; }; + + window2 { + samsung,fimd-win-id = <2>; + samsung,fimd-win-bpp = <32 24>; + samsung,fimd-win-res = <1024 600>; + samsung,fimd-win-vres = <1024 600>; + }; }; gpio_keys { diff --git a/arch/arm/configs/arndale_android_defconfig b/arch/arm/configs/arndale_android_defconfig index 173109e5535..f3a87ce563f 100644 --- a/arch/arm/configs/arndale_android_defconfig +++ b/arch/arm/configs/arndale_android_defconfig @@ -42,6 +42,8 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_IPV6_SIT=m CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_CMA=y +CONFIG_CMA_SIZE_MBYTES=64 CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c index 1b6b0194068..97d0de7e332 100644 --- a/drivers/video/s3c-fb.c +++ b/drivers/video/s3c-fb.c @@ -253,6 +253,7 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var, struct s3c_fb *sfb = win->parent; dev_dbg(sfb->dev, "checking parameters\n"); + printk("trb: %s() called\n", __func__); var->xres_virtual = max(var->xres_virtual, var->xres); var->yres_virtual = max(var->yres_virtual, var->yres); @@ -505,6 +506,7 @@ static int s3c_fb_set_par(struct fb_info *info) u32 pagewidth; dev_dbg(sfb->dev, "setting framebuffer parameters\n"); + printk("trb: %s() called\n", __func__); pm_runtime_get_sync(sfb->dev); @@ -758,6 +760,7 @@ static int s3c_fb_setcolreg(unsigned regno, __func__, win->index, regno, red, green, blue); pm_runtime_get_sync(sfb->dev); + printk("trb: %s() called\n", __func__); switch (info->fix.visual) { case FB_VISUAL_TRUECOLOR: @@ -810,6 +813,7 @@ static int s3c_fb_blank(int blank_mode, struct fb_info *info) u32 output_on = sfb->output_on; dev_dbg(sfb->dev, "blank mode %d\n", blank_mode); + printk("trb: %s() called\n", __func__); pm_runtime_get_sync(sfb->dev); @@ -879,6 +883,7 @@ static int s3c_fb_pan_display(struct fb_var_screeninfo *var, void __iomem *buf = sfb->regs + win->index * 8; unsigned int start_boff, end_boff; + printk("trb: %s() called\n", __func__); pm_runtime_get_sync(sfb->dev); /* Offset in bytes to the start of the displayed area */ @@ -1056,6 +1061,7 @@ static int s3c_fb_ioctl(struct fb_info *info, unsigned int cmd, int ret; u32 crtc; + printk("trb: %s() called, cmd = %x\n", __func__, cmd); switch (cmd) { case FBIO_WAITFORVSYNC: if (get_user(crtc, (u32 __user *)arg)) { @@ -1077,6 +1083,7 @@ static int s3c_fb_ioctl(struct fb_info *info, unsigned int cmd, int s3c_fb_open(struct fb_info *info, int user) { + printk("trb: %s() called\n", __func__); s3c_fb_set_par(info); return 0; } @@ -1088,6 +1095,7 @@ int s3c_fb_release(struct fb_info *info, int user) void __iomem *regs = sfb->regs; int win_no = win->index; + printk("trb: %s() called\n", __func__); if (win_no != 2) { printk(KERN_DEBUG"Releasing window %d\n", win_no); writel(0, regs + WINCON(win_no)); |