diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-11-29 22:27:10 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-06 09:55:38 +0000 |
| commit | 9242fe23d2ebab9c61dbc50d65f30cfa20a856ae (patch) | |
| tree | e41e980dc788a75488e1fbfdadef47e250b0d902 /drivers/gpu/drm/gma500/psb_drv.c | |
| parent | 1f0d0b5183c8dd4d58678e8ba35553cabaf87390 (diff) | |
| download | op-kernel-dev-9242fe23d2ebab9c61dbc50d65f30cfa20a856ae.zip op-kernel-dev-9242fe23d2ebab9c61dbc50d65f30cfa20a856ae.tar.gz | |
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>
Diffstat (limited to 'drivers/gpu/drm/gma500/psb_drv.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/psb_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 862bb81..add3156 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -186,7 +186,7 @@ static int psb_do_init(struct drm_device *dev) 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_BANK1); |
