diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-03 09:35:04 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-10-03 09:35:04 +1000 |
| commit | ebec44a2456fbe5fe18aae88f6010f6878f0cb4a (patch) | |
| tree | 427734722bdf3e807333329f33a6dbd6e95ec747 /drivers/gpu/drm/etnaviv/etnaviv_gem.c | |
| parent | 659333de48268550b5f09fcd45f76459d737b946 (diff) | |
| parent | 9e66317d3c92ddaab330c125dfe9d06eee268aff (diff) | |
BackMerge tag 'v4.14-rc3' into drm-next
Linux 4.14-rc3
Requested by Daniel for the tracing build fix in fixes.
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_gem.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gem.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index 5a634594a6ce..57881167ccd2 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -551,12 +551,15 @@ static const struct etnaviv_gem_ops etnaviv_gem_shmem_ops = { void etnaviv_gem_free_object(struct drm_gem_object *obj) { struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj); + struct etnaviv_drm_private *priv = obj->dev->dev_private; struct etnaviv_vram_mapping *mapping, *tmp; /* object should not be active */ WARN_ON(is_active(etnaviv_obj)); + mutex_lock(&priv->gem_lock); list_del(&etnaviv_obj->gem_node); + mutex_unlock(&priv->gem_lock); list_for_each_entry_safe(mapping, tmp, &etnaviv_obj->vram_list, obj_node) { |