Commit 9c86fb18 authored by Emil Velikov's avatar Emil Velikov Committed by Emil Velikov
Browse files

drm/qxl: remove _unlocked suffix in drm_gem_object_put_unlocked 



Spelling out _unlocked for each and every driver is a annoying.
Especially if we consider how many drivers, do not know (or need to)
about the horror stories involving struct_mutex.

Just drop the suffix. It makes the API cleaner.

Done via the following script:

__from=drm_gem_object_put_unlocked
__to=drm_gem_object_put
for __file in $(git grep --name-only $__from); do
  sed -i  "s/$__from/$__to/g" $__file;
done

Cc: Dave Airlie <airlied@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-29-emil.l.velikov@gmail.com
parent 496d0cc6

drivers/gpu/drm/qxl/qxl_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ void qxl_io_destroy_primary(struct qxl_device *qdev) 
{

	wait_for_io_cmd(qdev, 0, QXL_IO_DESTROY_PRIMARY_ASYNC);

	qdev->primary_bo->is_primary = false;

	drm_gem_object_put_unlocked(&qdev->primary_bo->tbo.base);

	drm_gem_object_put(&qdev->primary_bo->tbo.base);

	qdev->primary_bo = NULL;

}

drivers/gpu/drm/qxl/qxl_display.c

+3 −3
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ static int qxl_plane_prepare_fb(struct drm_plane *plane, 
		    qdev->dumb_shadow_bo->surf.width  != surf.width ||

		    qdev->dumb_shadow_bo->surf.height != surf.height) {

			if (qdev->dumb_shadow_bo) {

				drm_gem_object_put_unlocked

				drm_gem_object_put

					(&qdev->dumb_shadow_bo->tbo.base);

				qdev->dumb_shadow_bo = NULL;

			}
@@ -793,7 +793,7 @@ static int qxl_plane_prepare_fb(struct drm_plane *plane, 
		}

		if (user_bo->shadow != qdev->dumb_shadow_bo) {

			if (user_bo->shadow) {

				drm_gem_object_put_unlocked

				drm_gem_object_put

					(&user_bo->shadow->tbo.base);

				user_bo->shadow = NULL;

			}
@@ -828,7 +828,7 @@ static void qxl_plane_cleanup_fb(struct drm_plane *plane, 
	qxl_bo_unpin(user_bo);



	if (old_state->fb != plane->state->fb && user_bo->shadow) {

		drm_gem_object_put_unlocked(&user_bo->shadow->tbo.base);

		drm_gem_object_put(&user_bo->shadow->tbo.base);

		user_bo->shadow = NULL;

	}

}

drivers/gpu/drm/qxl/qxl_dumb.c

+1 −1
Original line number Diff line number Diff line
@@ -83,6 +83,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_put_unlocked(gobj);

	drm_gem_object_put(gobj);

	return 0;

}

drivers/gpu/drm/qxl/qxl_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,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_put_unlocked(gobj);

	drm_gem_object_put(gobj);

	return 0;

}

drivers/gpu/drm/qxl/qxl_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,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_put_unlocked(gobj);

	drm_gem_object_put(gobj);

	if (ret)

		return ret;
@@ -347,7 +347,7 @@ out2: 
	qxl_bo_unreserve(qobj);



out:

	drm_gem_object_put_unlocked(gobj);

	drm_gem_object_put(gobj);

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE