tmiofb: fix compilation with ACCEL disabled
PATCH 1/1 tmiofb: fix compilation with ACCEL disabled
Restore support for compiling tmiofb with acceleration disabled.
Signed-off-by Dmitry Baryshkov <[email protected]>
--- drivers/video/tmiofb.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
drivers/video/tmiofb.c +7 -3
@@ -222,6 +222,9 @@ static irqreturn_t tmiofb_irq(int irq, void *__info)unsigned int bbisc =tmio_ioread16 (par->lcr +LCR_BBISC ); +tmio_iowrite16 (bbisc, par->lcr +LCR_BBISC ); + +#ifdef CONFIG_FB_TMIO_ACCELL /* * We were in polling mode and now we got correct irq. * Switch back to IRQ-based sync of command FIFO
@@ -231,9 +234,6 @@ static irqreturn_t tmiofb_irq(int irq, void *__info) par->use_polling = false; } -tmio_iowrite16 (bbisc, par->lcr +LCR_BBISC ); - -#ifdef CONFIG_FB_TMIO_ACCELL if (bbisc &1 )wake_up (&par->wait_acc);#endif
@@ -938,7 +938,9 @@ static void tmiofb_dump_regs(struct platform_device *dev)static int tmiofb_suspend (struct platform_device *dev,pm_message_t state) {struct fb_info *info =platform_get_drvdata (dev); +#ifdef CONFIG_FB_TMIO_ACCELL struct tmiofb_par *par = info->par; +#endif struct mfd_cell *cell = dev->dev.platform_data;int retval =0 ;
@@ -950,12 +952,14 @@ static int tmiofb_suspend(struct platform_device *dev, pm_message_t state) info->fbops->fb_sync (info); +#ifdef CONFIG_FB_TMIO_ACCELL /* * The fb should be usable even if interrupts are disabled (and they are * during suspend/resume). Switch temporary to forced polling. */ printk (KERN_INFO "tmiofb: switching to polling\n" ); par->use_polling = true; +#endif tmiofb_hw_stop (dev);if (cell->suspend)
Signature · 8 lines
1.5.6.5 ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/
Quoted 6 lines · Dmitry Baryshkov
Restore support for compiling tmiofb with acceleration disabled.
Signed-off-by Dmitry Baryshkov <[email protected]>--- drivers/video/tmiofb.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
What about this patch? Can it be merged either in 2.6.28 in the tree for the next 2.6.29?
Quoted 53 lines
drivers/video/tmiofb.c +7
-3@@ -222,6 +222,9 @@ static irqreturn_t tmiofb_irq(int irq, void *__info)unsigned int bbisc =tmio_ioread16 (par->lcr +LCR_BBISC ); +tmio_iowrite16 (bbisc, par->lcr +LCR_BBISC ); + +#ifdef CONFIG_FB_TMIO_ACCELL /* * We were in polling mode and now we got correct irq. * Switch back to IRQ-based sync of command FIFO @@ -231,9 +234,6 @@ static irqreturn_t tmiofb_irq(int irq, void *__info) par->use_polling = false; } -tmio_iowrite16 (bbisc, par->lcr +LCR_BBISC ); - -#ifdef CONFIG_FB_TMIO_ACCELL if (bbisc &1 )wake_up (&par->wait_acc);#endif @@ -938,7 +938,9 @@ static void tmiofb_dump_regs(struct platform_device *dev)static int tmiofb_suspend (struct platform_device *dev,pm_message_t state) {struct fb_info *info =platform_get_drvdata (dev); +#ifdef CONFIG_FB_TMIO_ACCELL struct tmiofb_par *par = info->par; +#endif struct mfd_cell *cell = dev->dev.platform_data;int retval =0 ;@@ -950,12 +952,14 @@ static int tmiofb_suspend(struct platform_device *dev, pm_message_t state) info->fbops->fb_sync (info); +#ifdef CONFIG_FB_TMIO_ACCELL /* * The fb should be usable even if interrupts are disabled (and they are * during suspend/resume). Switch temporary to forced polling. */ printk (KERN_INFO "tmiofb: switching to polling\n" ); par->use_polling = true; +#endif tmiofb_hw_stop (dev);if (cell->suspend)Signature · 1 line
1.5.6.5
Signature · 9 lines
With best wishes Dmitry ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/
Quoted 6 lines · Dmitry Baryshkov
Restore support for compiling tmiofb with acceleration disabled.
Signed-off-by Dmitry Baryshkov <[email protected]>--- drivers/video/tmiofb.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
What about this patch? Can it be merged either in 2.6.28 in the tree for the next 2.6.29?
Quoted 53 lines
drivers/video/tmiofb.c +7
-3@@ -222,6 +222,9 @@ static irqreturn_t tmiofb_irq(int irq, void *__info)unsigned int bbisc =tmio_ioread16 (par->lcr +LCR_BBISC ); +tmio_iowrite16 (bbisc, par->lcr +LCR_BBISC ); + +#ifdef CONFIG_FB_TMIO_ACCELL /* * We were in polling mode and now we got correct irq. * Switch back to IRQ-based sync of command FIFO @@ -231,9 +234,6 @@ static irqreturn_t tmiofb_irq(int irq, void *__info) par->use_polling = false; } -tmio_iowrite16 (bbisc, par->lcr +LCR_BBISC ); - -#ifdef CONFIG_FB_TMIO_ACCELL if (bbisc &1 )wake_up (&par->wait_acc);#endif @@ -938,7 +938,9 @@ static void tmiofb_dump_regs(struct platform_device *dev)static int tmiofb_suspend (struct platform_device *dev,pm_message_t state) {struct fb_info *info =platform_get_drvdata (dev); +#ifdef CONFIG_FB_TMIO_ACCELL struct tmiofb_par *par = info->par; +#endif struct mfd_cell *cell = dev->dev.platform_data;int retval =0 ;@@ -950,12 +952,14 @@ static int tmiofb_suspend(struct platform_device *dev, pm_message_t state) info->fbops->fb_sync (info); +#ifdef CONFIG_FB_TMIO_ACCELL /* * The fb should be usable even if interrupts are disabled (and they are * during suspend/resume). Switch temporary to forced polling. */ printk (KERN_INFO "tmiofb: switching to polling\n" ); par->use_polling = true; +#endif tmiofb_hw_stop (dev);if (cell->suspend)Signature · 1 line
1.5.6.5
Signature · 9 lines
With best wishes Dmitry ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/