|
@@ -265,7 +265,7 @@ int armada_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
|
|
|
/* drop reference from allocate - handle holds it now */
|
|
|
DRM_DEBUG_DRIVER("obj %p size %zu handle %#x\n", dobj, size, handle);
|
|
|
err:
|
|
|
- drm_gem_object_unreference_unlocked(&dobj->obj);
|
|
|
+ drm_gem_object_put_unlocked(&dobj->obj);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -297,7 +297,7 @@ int armada_gem_create_ioctl(struct drm_device *dev, void *data,
|
|
|
/* drop reference from allocate - handle holds it now */
|
|
|
DRM_DEBUG_DRIVER("obj %p size %zu handle %#x\n", dobj, size, handle);
|
|
|
err:
|
|
|
- drm_gem_object_unreference_unlocked(&dobj->obj);
|
|
|
+ drm_gem_object_put_unlocked(&dobj->obj);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -314,13 +314,13 @@ int armada_gem_mmap_ioctl(struct drm_device *dev, void *data,
|
|
|
return -ENOENT;
|
|
|
|
|
|
if (!dobj->obj.filp) {
|
|
|
- drm_gem_object_unreference_unlocked(&dobj->obj);
|
|
|
+ drm_gem_object_put_unlocked(&dobj->obj);
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
addr = vm_mmap(dobj->obj.filp, 0, args->size, PROT_READ | PROT_WRITE,
|
|
|
MAP_SHARED, args->offset);
|
|
|
- drm_gem_object_unreference_unlocked(&dobj->obj);
|
|
|
+ drm_gem_object_put_unlocked(&dobj->obj);
|
|
|
if (IS_ERR_VALUE(addr))
|
|
|
return addr;
|
|
|
|
|
@@ -375,7 +375,7 @@ int armada_gem_pwrite_ioctl(struct drm_device *dev, void *data,
|
|
|
}
|
|
|
|
|
|
unref:
|
|
|
- drm_gem_object_unreference_unlocked(&dobj->obj);
|
|
|
+ drm_gem_object_put_unlocked(&dobj->obj);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -524,7 +524,7 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf)
|
|
|
* Importing our own dmabuf(s) increases the
|
|
|
* refcount on the gem object itself.
|
|
|
*/
|
|
|
- drm_gem_object_reference(obj);
|
|
|
+ drm_gem_object_get(obj);
|
|
|
return obj;
|
|
|
}
|
|
|
}
|