mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
From: Jean-Francois Moine <moinejf@free.fr>
|
|
Date: Thu Nov 15 18:14:43 CET 2012
|
|
|
|
Stop the dovefb irq's after video display
|
|
|
|
This patch is to be applied to René van Dorst's linux kernel
|
|
|
|
git://github.com/vDorst/linux.git
|
|
|
|
branch
|
|
CuBox-v3.5.7-Patched
|
|
|
|
diff --git a/drivers/video/dovefb/dovefb_ovly.c b/drivers/video/dovefb/dovefb_ovly.c
|
|
index 68cfdd2..d640ac7 100644
|
|
--- a/drivers/video/dovefb/dovefb_ovly.c
|
|
+++ b/drivers/video/dovefb/dovefb_ovly.c
|
|
@@ -322,7 +322,7 @@ static int dovefb_ovly_ioctl(struct fb_info *fi, unsigned int cmd,
|
|
{
|
|
void __user *argp = (void __user *)arg;
|
|
struct dovefb_layer_info *dfli = fi->par;
|
|
- u32 x;
|
|
+ u32 x, irq_ena;
|
|
int vmode = 0;
|
|
int gfx_on = 1;
|
|
int vid_on = 1;
|
|
@@ -528,19 +528,19 @@ static int dovefb_ovly_ioctl(struct fb_info *fi, unsigned int cmd,
|
|
case DOVEFB_IOCTL_SWITCH_VID_OVLY:
|
|
if (copy_from_user(&vid_on, argp, sizeof(int)))
|
|
return -EFAULT;
|
|
+ x = readl(dfli->reg_base + LCD_SPU_DMA_CTRL0);
|
|
+ irq_ena = readl(dfli->reg_base + SPU_IRQ_ENA);
|
|
if (0 == vid_on) {
|
|
- x = readl(dfli->reg_base + LCD_SPU_DMA_CTRL0) &
|
|
- ~CFG_DMA_ENA_MASK;
|
|
- writel(x, dfli->reg_base + LCD_SPU_DMA_CTRL0);
|
|
+ x &= ~CFG_DMA_ENA_MASK;
|
|
+ irq_ena &= ~(DOVEFB_VID_INT_MASK | DOVEFB_VSYNC_INT_MASK);
|
|
} else {
|
|
- x = readl(dfli->reg_base + LCD_SPU_DMA_CTRL0) |
|
|
- CFG_DMA_ENA(0x1);
|
|
- writel(x, dfli->reg_base + LCD_SPU_DMA_CTRL0);
|
|
+ x |= CFG_DMA_ENA(0x1);
|
|
+
|
|
/* Enable VID & VSync. */
|
|
- x = readl(dfli->reg_base + SPU_IRQ_ENA) |
|
|
- DOVEFB_VID_INT_MASK | DOVEFB_VSYNC_INT_MASK;
|
|
- writel(x, dfli->reg_base + SPU_IRQ_ENA);
|
|
+ irq_ena |= DOVEFB_VID_INT_MASK | DOVEFB_VSYNC_INT_MASK;
|
|
}
|
|
+ writel(x, dfli->reg_base + LCD_SPU_DMA_CTRL0);
|
|
+ writel(irq_ena, dfli->reg_base + SPU_IRQ_ENA);
|
|
break;
|
|
case DOVEFB_IOCTL_SWITCH_GRA_OVLY:
|
|
if (copy_from_user(&gfx_on, argp, sizeof(int)))
|