diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-12-23 09:19:58 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-23 09:19:58 +1000 |
| commit | f884a507e631a1d8b270c8bfd95dbde813a0f447 (patch) | |
| tree | 5c96624dfd93b4b64d153c9b75cc0dd8decdba10 /drivers/gpu/drm/armada/armada_drv.c | |
| parent | 0239c75978a9b9bdadfe07cdc60d40bdedb93a07 (diff) | |
| parent | 0b8ebeacf5ef43a467c7ec5400ccc1ffc3fbdfba (diff) | |
Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next
These are the patches from Daniel Vetter, getting rid of struct_mutex
from the Armada DRM driver.
* 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
drm/armada: use a private mutex to protect priv->linear
drm/armada: drop struct_mutex from cursor paths
drm/armada: don't grab dev->struct_mutex for in mmap offset ioctl
drm/armada: plug leak in dumb_map_offset
drm/armada: use unlocked gem unreferencing
Diffstat (limited to 'drivers/gpu/drm/armada/armada_drv.c')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index 77ab93d60125..3bd7e1cde99e 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -102,6 +102,7 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags) dev->mode_config.preferred_depth = 24; dev->mode_config.funcs = &armada_drm_mode_config_funcs; drm_mm_init(&priv->linear, mem->start, resource_size(mem)); + mutex_init(&priv->linear_lock); ret = component_bind_all(dev->dev, dev); if (ret) |