Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / etnaviv / etnaviv_gem.c

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index 670eaaf..f06e19e 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -244,7 +244,7 @@ void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping)
        mapping->use -= 1;
        mutex_unlock(&etnaviv_obj->lock);
 
-       drm_gem_object_put_unlocked(&etnaviv_obj->base);
+       drm_gem_object_put(&etnaviv_obj->base);
 }
 
 struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
@@ -633,7 +633,7 @@ int etnaviv_gem_new_handle(struct drm_device *dev, struct drm_file *file,
 
        /* drop reference from allocate - handle holds it now */
 fail:
-       drm_gem_object_put_unlocked(obj);
+       drm_gem_object_put(obj);
 
        return ret;
 }
@@ -742,6 +742,6 @@ int etnaviv_gem_new_userptr(struct drm_device *dev, struct drm_file *file,
        ret = drm_gem_handle_create(file, &etnaviv_obj->base, handle);
 
        /* drop reference from allocate - handle holds it now */
-       drm_gem_object_put_unlocked(&etnaviv_obj->base);
+       drm_gem_object_put(&etnaviv_obj->base);
        return ret;
 }