From 5776838f47b503677edd8f9fb55cb706d9122fed Mon Sep 17 00:00:00 2001 From: Andy Green Date: Wed, 19 Nov 2008 17:11:17 +0000 Subject: fix-glamo-resume-dont-restuff-regs-do-reinit-in-framebuffer-resume.patch Signed-off-by: Andy Green --- drivers/mfd/glamo/glamo-fb.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'drivers/mfd/glamo/glamo-fb.c') diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index 7bfd539972f..66462672f52 100644 --- a/drivers/mfd/glamo/glamo-fb.c +++ b/drivers/mfd/glamo/glamo-fb.c @@ -959,13 +959,24 @@ static int glamofb_suspend(struct platform_device *pdev, pm_message_t state) static int glamofb_resume(struct platform_device *pdev) { - struct glamofb_handle *gfb = platform_get_drvdata(pdev); + struct glamofb_handle *glamofb = platform_get_drvdata(pdev); + struct glamofb_platform_data *mach_info = pdev->dev.platform_data; /* OK let's allow framebuffer ops again */ // gfb->fb->screen_base = ioremap(gfb->fb_res->start, // RESSIZE(gfb->fb_res)); + glamo_engine_enable(mach_info->glamo, GLAMO_ENGINE_LCD); + glamo_engine_reset(mach_info->glamo, GLAMO_ENGINE_LCD); + + printk(KERN_ERR"spin_lock_init\n"); + spin_lock_init(&glamofb->lock_cmd); + glamofb_init_regs(glamofb); +#ifdef CONFIG_MFD_GLAMO_HWACCEL + glamofb_cursor_onoff(glamofb, 1); +#endif + - fb_set_suspend(gfb->fb, 0); + fb_set_suspend(glamofb->fb, 0); // fb_blank(gfb->fb, FB_BLANK_UNBLANK); return 0; -- cgit v1.2.3