Skip to content

Commit 2793c1d

Browse files
santhameena13danvet
authored andcommitted
drm/qxl: Replace drm_gem_object_reference/unreference() with _get/put()
Replace drm_gem_object_reference/unreference function with *_get/put() suffixes, because it is shorter and consistent with the kernel kref_get/put() functions. The following Coccinelle script was used: @@ expression e; @@ ( -drm_gem_object_reference(e); +drm_gem_object_get(e); | -drm_gem_object_unreference(e); +drm_gem_object_put(e); | -drm_gem_object_unreference_unlocked(e); +drm_gem_object_put_unlocked(e); ) Signed-off-by: Santha Meena Ramamoorthy <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent acaa3f1 commit 2793c1d

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

drivers/gpu/drm/qxl/qxl_display.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ void qxl_user_framebuffer_destroy(struct drm_framebuffer *fb)
309309
struct qxl_bo *bo = gem_to_qxl_bo(qxl_fb->obj);
310310

311311
WARN_ON(bo->shadow);
312-
drm_gem_object_unreference_unlocked(qxl_fb->obj);
312+
drm_gem_object_put_unlocked(qxl_fb->obj);
313313
drm_framebuffer_cleanup(fb);
314314
kfree(qxl_fb);
315315
}
@@ -1215,7 +1215,7 @@ qxl_user_framebuffer_create(struct drm_device *dev,
12151215
ret = qxl_framebuffer_init(dev, qxl_fb, mode_cmd, obj, &qxl_fb_funcs);
12161216
if (ret) {
12171217
kfree(qxl_fb);
1218-
drm_gem_object_unreference_unlocked(obj);
1218+
drm_gem_object_put_unlocked(obj);
12191219
return NULL;
12201220
}
12211221

drivers/gpu/drm/qxl/qxl_dumb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@ int qxl_mode_dumb_mmap(struct drm_file *file_priv,
8282
return -ENOENT;
8383
qobj = gem_to_qxl_bo(gobj);
8484
*offset_p = qxl_bo_mmap_offset(qobj);
85-
drm_gem_object_unreference_unlocked(gobj);
85+
drm_gem_object_put_unlocked(gobj);
8686
return 0;
8787
}

drivers/gpu/drm/qxl/qxl_fb.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static void qxlfb_destroy_pinned_object(struct drm_gem_object *gobj)
9595
qxl_bo_kunmap(qbo);
9696
qxl_bo_unpin(qbo);
9797

98-
drm_gem_object_unreference_unlocked(gobj);
98+
drm_gem_object_put_unlocked(gobj);
9999
}
100100

101101
int qxl_get_handle_for_primary_fb(struct qxl_device *qdev,
@@ -316,11 +316,11 @@ static int qxlfb_create(struct qxl_fbdev *qfbdev,
316316
qxl_bo_unpin(qbo);
317317
}
318318
if (fb && ret) {
319-
drm_gem_object_unreference_unlocked(gobj);
319+
drm_gem_object_put_unlocked(gobj);
320320
drm_framebuffer_cleanup(fb);
321321
kfree(fb);
322322
}
323-
drm_gem_object_unreference_unlocked(gobj);
323+
drm_gem_object_put_unlocked(gobj);
324324
return ret;
325325
}
326326

drivers/gpu/drm/qxl/qxl_gem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ int qxl_gem_object_create_with_handle(struct qxl_device *qdev,
9898
return r;
9999
/* drop reference from allocate - handle holds it now */
100100
*qobj = gem_to_qxl_bo(gobj);
101-
drm_gem_object_unreference_unlocked(gobj);
101+
drm_gem_object_put_unlocked(gobj);
102102
return 0;
103103
}
104104

drivers/gpu/drm/qxl/qxl_ioctl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ static int qxlhw_handle_to_bo(struct drm_file *file_priv, uint64_t handle,
121121
qobj = gem_to_qxl_bo(gobj);
122122

123123
ret = qxl_release_list_add(release, qobj);
124-
drm_gem_object_unreference_unlocked(gobj);
124+
drm_gem_object_put_unlocked(gobj);
125125
if (ret)
126126
return ret;
127127

@@ -343,7 +343,7 @@ static int qxl_update_area_ioctl(struct drm_device *dev, void *data,
343343
qxl_bo_unreserve(qobj);
344344

345345
out:
346-
drm_gem_object_unreference_unlocked(gobj);
346+
drm_gem_object_put_unlocked(gobj);
347347
return ret;
348348
}
349349

drivers/gpu/drm/qxl/qxl_object.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,13 +211,13 @@ void qxl_bo_unref(struct qxl_bo **bo)
211211
if ((*bo) == NULL)
212212
return;
213213

214-
drm_gem_object_unreference_unlocked(&(*bo)->gem_base);
214+
drm_gem_object_put_unlocked(&(*bo)->gem_base);
215215
*bo = NULL;
216216
}
217217

218218
struct qxl_bo *qxl_bo_ref(struct qxl_bo *bo)
219219
{
220-
drm_gem_object_reference(&bo->gem_base);
220+
drm_gem_object_get(&bo->gem_base);
221221
return bo;
222222
}
223223

@@ -318,7 +318,7 @@ void qxl_bo_force_delete(struct qxl_device *qdev)
318318
list_del_init(&bo->list);
319319
mutex_unlock(&qdev->gem.mutex);
320320
/* this should unref the ttm bo */
321-
drm_gem_object_unreference_unlocked(&bo->gem_base);
321+
drm_gem_object_put_unlocked(&bo->gem_base);
322322
}
323323
}
324324

0 commit comments

Comments
 (0)