Commit cdc194ce authored by Emil Velikov's avatar Emil Velikov Committed by Emil Velikov
Browse files

drm/nouveau: 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: Ben Skeggs <bskeggs@redhat.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-26-emil.l.velikov@gmail.com
parent f7d33950

drivers/gpu/drm/nouveau/dispnv04/crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ nv04_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, 
	nv_crtc->cursor.set_offset(nv_crtc, nv_crtc->cursor.offset);

	nv_crtc->cursor.show(nv_crtc, true);

out:

	drm_gem_object_put_unlocked(gem);

	drm_gem_object_put(gem);

	return ret;

}

drivers/gpu/drm/nouveau/nouveau_abi16.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16, 
	if (chan->ntfy) {

		nouveau_vma_del(&chan->ntfy_vma);

		nouveau_bo_unpin(chan->ntfy);

		drm_gem_object_put_unlocked(&chan->ntfy->bo.base);

		drm_gem_object_put(&chan->ntfy->bo.base);

	}



	if (chan->heap.block_size)

drivers/gpu/drm/nouveau/nouveau_display.c

+4 −4
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ nouveau_user_framebuffer_destroy(struct drm_framebuffer *drm_fb) 
	struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb);



	if (fb->nvbo)

		drm_gem_object_put_unlocked(&fb->nvbo->bo.base);

		drm_gem_object_put(&fb->nvbo->bo.base);



	drm_framebuffer_cleanup(drm_fb);

	kfree(fb);
@@ -267,7 +267,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev, 
	if (ret == 0)

		return &fb->base;



	drm_gem_object_put_unlocked(gem);

	drm_gem_object_put(gem);

	return ERR_PTR(ret);

}
@@ -648,7 +648,7 @@ nouveau_display_dumb_create(struct drm_file *file_priv, struct drm_device *dev, 
		return ret;



	ret = drm_gem_handle_create(file_priv, &bo->bo.base, &args->handle);

	drm_gem_object_put_unlocked(&bo->bo.base);

	drm_gem_object_put(&bo->bo.base);

	return ret;

}
@@ -663,7 +663,7 @@ nouveau_display_dumb_map_offset(struct drm_file *file_priv, 
	if (gem) {

		struct nouveau_bo *bo = nouveau_gem_object(gem);

		*poffset = drm_vma_node_offset_addr(&bo->bo.base.vma_node);

		drm_gem_object_put_unlocked(gem);

		drm_gem_object_put(gem);

		return 0;

	}

drivers/gpu/drm/nouveau/nouveau_gem.c

+7 −7
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data, 
	}



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

	drm_gem_object_put_unlocked(&nvbo->bo.base);

	drm_gem_object_put(&nvbo->bo.base);

	return ret;

}
@@ -358,7 +358,7 @@ validate_fini_no_ticket(struct validate_op *op, struct nouveau_channel *chan, 
		list_del(&nvbo->entry);

		nvbo->reserved_by = NULL;

		ttm_bo_unreserve(&nvbo->bo);

		drm_gem_object_put_unlocked(&nvbo->bo.base);

		drm_gem_object_put(&nvbo->bo.base);

	}

}
@@ -405,14 +405,14 @@ retry: 
		nvbo = nouveau_gem_object(gem);

		if (nvbo == res_bo) {

			res_bo = NULL;

			drm_gem_object_put_unlocked(gem);

			drm_gem_object_put(gem);

			continue;

		}



		if (nvbo->reserved_by && nvbo->reserved_by == file_priv) {

			NV_PRINTK(err, cli, "multiple instances of buffer %d on "

				      "validation list\n", b->handle);

			drm_gem_object_put_unlocked(gem);

			drm_gem_object_put(gem);

			ret = -EINVAL;

			break;

		}
@@ -929,7 +929,7 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data, 
		ret = lret;



	nouveau_bo_sync_for_cpu(nvbo);

	drm_gem_object_put_unlocked(gem);

	drm_gem_object_put(gem);



	return ret;

}
@@ -948,7 +948,7 @@ nouveau_gem_ioctl_cpu_fini(struct drm_device *dev, void *data, 
	nvbo = nouveau_gem_object(gem);



	nouveau_bo_sync_for_device(nvbo);

	drm_gem_object_put_unlocked(gem);

	drm_gem_object_put(gem);

	return 0;

}
@@ -965,7 +965,7 @@ nouveau_gem_ioctl_info(struct drm_device *dev, void *data, 
		return -ENOENT;



	ret = nouveau_gem_info(file_priv, gem, req);

	drm_gem_object_put_unlocked(gem);

	drm_gem_object_put(gem);

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE