Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2793c1d7 authored by Santha Meena Ramamoorthy's avatar Santha Meena Ramamoorthy Committed by Daniel Vetter
Browse files

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: default avatarSantha Meena Ramamoorthy <santhameena13@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/1521570567-22519-1-git-send-email-santhameena13@gmail.com
parent acaa3f13

drivers/gpu/drm/qxl/qxl_display.c

+2 −2
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ void qxl_user_framebuffer_destroy(struct drm_framebuffer *fb) 
	struct qxl_bo *bo = gem_to_qxl_bo(qxl_fb->obj);



	WARN_ON(bo->shadow);

	drm_gem_object_unreference_unlocked(qxl_fb->obj);

	drm_gem_object_put_unlocked(qxl_fb->obj);

	drm_framebuffer_cleanup(fb);

	kfree(qxl_fb);

}
@@ -1215,7 +1215,7 @@ qxl_user_framebuffer_create(struct drm_device *dev, 
	ret = qxl_framebuffer_init(dev, qxl_fb, mode_cmd, obj, &qxl_fb_funcs);

	if (ret) {

		kfree(qxl_fb);

		drm_gem_object_unreference_unlocked(obj);

		drm_gem_object_put_unlocked(obj);

		return NULL;

	}

drivers/gpu/drm/qxl/qxl_dumb.c

+1 −1
Original line number Diff line number Diff line
@@ -82,6 +82,6 @@ int qxl_mode_dumb_mmap(struct drm_file *file_priv, 
		return -ENOENT;

	qobj = gem_to_qxl_bo(gobj);

	*offset_p = qxl_bo_mmap_offset(qobj);

	drm_gem_object_unreference_unlocked(gobj);

	drm_gem_object_put_unlocked(gobj);

	return 0;

}

drivers/gpu/drm/qxl/qxl_fb.c

+3 −3
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static void qxlfb_destroy_pinned_object(struct drm_gem_object *gobj) 
	qxl_bo_kunmap(qbo);

	qxl_bo_unpin(qbo);



	drm_gem_object_unreference_unlocked(gobj);

	drm_gem_object_put_unlocked(gobj);

}



int qxl_get_handle_for_primary_fb(struct qxl_device *qdev,
@@ -316,11 +316,11 @@ static int qxlfb_create(struct qxl_fbdev *qfbdev, 
		qxl_bo_unpin(qbo);

	}

	if (fb && ret) {

		drm_gem_object_unreference_unlocked(gobj);

		drm_gem_object_put_unlocked(gobj);

		drm_framebuffer_cleanup(fb);

		kfree(fb);

	}

	drm_gem_object_unreference_unlocked(gobj);

	drm_gem_object_put_unlocked(gobj);

	return ret;

}

drivers/gpu/drm/qxl/qxl_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int qxl_gem_object_create_with_handle(struct qxl_device *qdev, 
		return r;

	/* drop reference from allocate - handle holds it now */

	*qobj = gem_to_qxl_bo(gobj);

	drm_gem_object_unreference_unlocked(gobj);

	drm_gem_object_put_unlocked(gobj);

	return 0;

}

drivers/gpu/drm/qxl/qxl_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int qxlhw_handle_to_bo(struct drm_file *file_priv, uint64_t handle, 
	qobj = gem_to_qxl_bo(gobj);



	ret = qxl_release_list_add(release, qobj);

	drm_gem_object_unreference_unlocked(gobj);

	drm_gem_object_put_unlocked(gobj);

	if (ret)

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



out:

	drm_gem_object_unreference_unlocked(gobj);

	drm_gem_object_put_unlocked(gobj);

	return ret;

}