diff options
| author | Lee Jones <lee.jones@linaro.org> | 2011-06-13 16:38:28 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2011-08-24 18:09:22 +0100 |
| commit | 29277c868b76c685fb8e7590921e9b53f01c9b15 (patch) | |
| tree | 270dd32466feffc485c0d94a55975b406e40ce62 | |
| parent | 800e123ca1b23e15b362fbe5459e533b28e15893 (diff) | |
DELTA: LINARO: Enable Ubuntu desktop graphics for the u8500
Fix FBIOPUTCMAP errors (CMAP not supported on u8500)
Enable screen auto-refreshing
Enable Avoid MCDE re-allocing
Enable DRM
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | debian.linaro/config/config.common.ubuntu | 10 | ||||
| -rw-r--r-- | drivers/video/fbmem.c | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu index c53ab540a8a..23b67d40072 100644 --- a/debian.linaro/config/config.common.ubuntu +++ b/debian.linaro/config/config.common.ubuntu @@ -505,7 +505,7 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_DISPLAY_AV8100_TERTIARY=y # CONFIG_DISPLAY_AV8100_TRIPPLE_BUFFER is not set CONFIG_DISPLAY_GENERIC_DSI_PRIMARY=y -# CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_AUTO_SYNC is not set +CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_AUTO_SYNC=y # CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_0 is not set # CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_180 is not set # CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_270 is not set @@ -533,7 +533,8 @@ CONFIG_DMA_ENGINE=y # CONFIG_DNET is not set CONFIG_DNOTIFY=y # CONFIG_DNS_RESOLVER is not set -# CONFIG_DRM is not set +CONFIG_DRM=y +# CONFIG_DRM_OMAP is not set # CONFIG_DS1682 is not set # CONFIG_DUMMY is not set CONFIG_DUMMY_CONSOLE=y @@ -632,7 +633,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_FPE_NWFPE=y # CONFIG_FPE_NWFPE_XP is not set CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set CONFIG_FRAME_WARN=1024 CONFIG_FREEZER=y @@ -801,6 +802,7 @@ CONFIG_HW_RANDOM_NOMADIK=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set CONFIG_HZ=100 CONFIG_I2C=y +CONFIG_I2C_ALGOBIT=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_COMPAT=y @@ -1116,7 +1118,7 @@ CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE=y # CONFIG_MCDE_DISPLAY_PRIMARY_16BPP is not set CONFIG_MCDE_DISPLAY_PRIMARY_32BPP=y # CONFIG_MCDE_DISPLAY_SONY_SY35560_DSI is not set -# CONFIG_MCDE_FB_AVOID_REALLOC is not set +CONFIG_MCDE_FB_AVOID_REALLOC=y # CONFIG_MCS_FIR is not set CONFIG_MD=y # CONFIG_MDIO_BITBANG is not set diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index e2bf95370e4..d2cf00d848d 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -1054,6 +1054,9 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, ret = copy_to_user(argp, &fix, sizeof(fix)) ? -EFAULT : 0; break; case FBIOPUTCMAP: +#if defined(CONFIG_ARCH_U8500) + return 0; +#endif if (copy_from_user(&cmap, argp, sizeof(cmap))) return -EFAULT; ret = fb_set_user_cmap(&cmap, info); @@ -1288,6 +1291,9 @@ static long fb_compat_ioctl(struct file *file, unsigned int cmd, case FBIOGETCMAP: case FBIOPUTCMAP: +#if defined(CONFIG_ARCH_U8500) + return 0; +#endif ret = fb_getput_cmap(info, cmd, arg); break; |