UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

gma500: frame buffer locking 

If we are the console then a printk can hit us with a spin lock held (and
in fact the kernel will do its best to take the console printing lock).

In that case we cannot politely sleep when synching after an accelerated op
but must behave obnoxiously to be sure of getting the bits out.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Alan Cox 2011-11-29 22:27:10 +00:00 committed by Dave Airlie
parent 1f0d0b5183
commit 9242fe23d2
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/gma500/accel_2d.c
View File

@ -111,8 +111,9 @@ static int psbfb_2d_submit(struct drm_psb_private *dev_priv, uint32_t *cmdbuf,
int ret = 0; int ret = 0;
int i; int i;
unsigned submit_size; unsigned submit_size;
unsigned long flags;
mutex_lock(&dev_priv->mutex_2d); spin_lock_irqsave(&dev_priv->lock_2d, flags);
while (size > 0) { while (size > 0) {
submit_size = (size < 0x60) ? size : 0x60; submit_size = (size < 0x60) ? size : 0x60;
size -= submit_size; size -= submit_size;
@ -127,7 +128,7 @@ static int psbfb_2d_submit(struct drm_psb_private *dev_priv, uint32_t *cmdbuf,
(void)PSB_RSGX32(PSB_SGX_2D_SLAVE_PORT + i - 4); (void)PSB_RSGX32(PSB_SGX_2D_SLAVE_PORT + i - 4);
} }
mutex_unlock(&dev_priv->mutex_2d); spin_unlock_irqrestore(&dev_priv->lock_2d, flags);
return ret; return ret;
} }
@ -327,8 +328,9 @@ int psbfb_sync(struct fb_info *info)
struct drm_psb_private *dev_priv = dev->dev_private; struct drm_psb_private *dev_priv = dev->dev_private;
unsigned long _end = jiffies + DRM_HZ; unsigned long _end = jiffies + DRM_HZ;
int busy = 0; int busy = 0;
unsigned long flags;
mutex_lock(&dev_priv->mutex_2d); spin_lock_irqsave(&dev_priv->lock_2d, flags);
/* /*
* First idle the 2D engine. * First idle the 2D engine.
*/ */
@ -357,6 +359,6 @@ int psbfb_sync(struct fb_info *info)
_PSB_C2B_STATUS_BUSY) != 0); _PSB_C2B_STATUS_BUSY) != 0);
out: out:
mutex_unlock(&dev_priv->mutex_2d); spin_unlock_irqrestore(&dev_priv->lock_2d, flags);
return (busy) ? -EBUSY : 0; return (busy) ? -EBUSY : 0;
} }

2
drivers/gpu/drm/gma500/psb_drv.c
View File

@ -186,7 +186,7 @@ static int psb_do_init(struct drm_device *dev)
spin_lock_init(&dev_priv->irqmask_lock); spin_lock_init(&dev_priv->irqmask_lock);
mutex_init(&dev_priv->mutex_2d); spin_lock_init(&dev_priv->lock_2d);
PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK0); PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK0);
PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK1); PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK1);

2
drivers/gpu/drm/gma500/psb_drv.h
View File

@ -606,7 +606,7 @@ struct drm_psb_private {
void *fbdev; void *fbdev;
/* 2D acceleration */ /* 2D acceleration */
struct mutex mutex_2d; spinlock_t lock_2d;
}; };