Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: gma500: frame buffer locking

Browse Source 
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 printing lock).

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

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2011-09-22 13:20:57 +01:00 committed by Greg Kroah-Hartman
parent 30eb82f05d
commit c7e285bedb
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/staging/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,7 +359,7 @@ 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/staging/gma500/psb_drv.c
View File

@ -228,7 +228,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/staging/gma500/psb_drv.h
View File

@ -612,7 +612,7 @@ struct drm_psb_private {
void (*exit_idle)(struct drm_device *dev, u32 update_src); void (*exit_idle)(struct drm_device *dev, u32 update_src);
/* 2D acceleration */ /* 2D acceleration */
struct mutex mutex_2d; spinlock_t lock_2d;
/* FIXME: Arrays anyone ? */ /* FIXME: Arrays anyone ? */
struct mdfld_dsi_encoder *encoder0; struct mdfld_dsi_encoder *encoder0;