Merge airlied/drm-next into drm-misc-next

[linux.git] / drivers / gpu / drm / qxl / qxl_object.c

diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c
index af62824ed4ccb5bee68cc4cd28f8dc139b979097..6a30196e9d6c1a371c0b74071b4369b5c237cc4f 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_object.c
+++ b/drivers/gpu/drm/qxl/qxl_object.c
@@ -211,13 +211,13 @@ void qxl_bo_unref(struct qxl_bo **bo)
        if ((*bo) == NULL)
                return;
 
-       drm_gem_object_unreference_unlocked(&(*bo)->gem_base);
+       drm_gem_object_put_unlocked(&(*bo)->gem_base);
        *bo = NULL;
 }
 
 struct qxl_bo *qxl_bo_ref(struct qxl_bo *bo)
 {
-       drm_gem_object_reference(&bo->gem_base);
+       drm_gem_object_get(&bo->gem_base);
        return bo;
 }
 
@@ -318,7 +318,7 @@ void qxl_bo_force_delete(struct qxl_device *qdev)
                list_del_init(&bo->list);
                mutex_unlock(&qdev->gem.mutex);
                /* this should unref the ttm bo */
-               drm_gem_object_unreference_unlocked(&bo->gem_base);
+               drm_gem_object_put_unlocked(&bo->gem_base);
        }
 }