diff options
| author | Erik Gilling <konkers@android.com> | 2011-02-22 15:44:22 -0800 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2011-03-04 16:14:07 -0800 |
| commit | 6c4316045e2d95a9555c35c6223374fca1470e39 (patch) | |
| tree | 984533bec16757e206f3a9eabea306c4a13f32ac | |
| parent | 152b72f4f2bd60699f306554875236632e3b9a3b (diff) | |
| download | experimental-6c4316045e2d95a9555c35c6223374fca1470e39.tar.gz | |
konk:hacks
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 13 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/core.c | 2 | ||||
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 8 |
3 files changed, 19 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 0deb0dfe879..44ebc16afed 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -592,11 +592,24 @@ static struct omap_board_mux board_mux[] __initdata = { extern void __init omap4_panda_android_init(void); +void sr32(u32 addr, u32 start_bit, u32 num_bits, u32 value) +{ + u32 tmp, msk = 0; + msk = 1 << num_bits; + --msk; + tmp = omap_readl(addr) & ~(msk << start_bit); + tmp |= value << start_bit; + omap_writel(tmp, addr); +} + static void __init omap4_panda_init(void) { int package = OMAP_PACKAGE_CBS; int err; + sr32(0x4a009100, 0, 2, 0x2); + sr32(0x4a009120, 0, 12, 0x702); + if (omap_rev() == OMAP4430_REV_ES1_0) package = OMAP_PACKAGE_CBL; omap4_mux_init(board_mux, package); diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index c2f930bf284..3f3958d978b 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -50,7 +50,7 @@ module_param_named(def_disp, def_disp_name, charp, 0); MODULE_PARM_DESC(def_disp, "default display name"); #ifdef DEBUG -unsigned int dss_debug; +unsigned int dss_debug = 1; module_param_named(debug, dss_debug, bool, 0644); #endif diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 505ec667204..bb2ca517de3 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -48,7 +48,7 @@ static int def_rotate; static int def_mirror; #ifdef DEBUG -unsigned int omapfb_debug; +unsigned int omapfb_debug = 1; module_param_named(debug, omapfb_debug, bool, 0644); static unsigned int omapfb_test_pattern; module_param_named(test, omapfb_test_pattern, bool, 0644); @@ -1012,8 +1012,10 @@ int omapfb_apply_changes(struct fb_info *fbi, int init) if (r) goto err; - if (!init && ovl->manager) + if (!init && ovl->manager) { ovl->manager->apply(ovl->manager); + ovl->manager->wait_for_vsync(ovl->manager); + } } return 0; err: @@ -1822,7 +1824,7 @@ static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi) } var->xres_virtual = var->xres; - var->yres_virtual = var->yres; + var->yres_virtual = var->yres * 2; if (!var->bits_per_pixel) { switch (omapfb_get_recommended_bpp(fbdev, display)) { |