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

Commit 34911fd3 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Rename drm_gem_object_unreference_unlocked in preparation for lockless free 



Whilst this ultimately wraps kref_put_mutex(), our goal here is the
lockless variant, so keep the _unlocked() suffix until we need it no
more.

s/drm_gem_object_unreference_unlocked/i915_gem_object_put_unlocked/

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1469005202-9659-7-git-send-email-chris@chris-wilson.co.uk


Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1469017917-15134-6-git-send-email-chris@chris-wilson.co.uk
parent f8c417cd

drivers/gpu/drm/i915/i915_drv.h

+10 −0
Original line number Diff line number Diff line
@@ -2327,6 +2327,16 @@ i915_gem_object_put(struct drm_i915_gem_object *obj) 
__deprecated

extern void drm_gem_object_unreference(struct drm_gem_object *);



__attribute__((nonnull))

static inline void

i915_gem_object_put_unlocked(struct drm_i915_gem_object *obj)

{

	drm_gem_object_unreference_unlocked(&obj->base);

}



__deprecated

extern void drm_gem_object_unreference_unlocked(struct drm_gem_object *);



static inline bool

i915_gem_object_has_struct_page(const struct drm_i915_gem_object *obj)

{

drivers/gpu/drm/i915/i915_gem.c

+5 −5
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ i915_gem_create(struct drm_file *file, 


	ret = drm_gem_handle_create(file, &obj->base, &handle);

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

	drm_gem_object_unreference_unlocked(&obj->base);

	i915_gem_object_put_unlocked(obj);

	if (ret)

		return ret;
@@ -1604,7 +1604,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 
	 * pages from.

	 */

	if (!obj->base.filp) {

		drm_gem_object_unreference_unlocked(&obj->base);

		i915_gem_object_put_unlocked(obj);

		return -EINVAL;

	}
@@ -1616,7 +1616,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 
		struct vm_area_struct *vma;



		if (down_write_killable(&mm->mmap_sem)) {

			drm_gem_object_unreference_unlocked(&obj->base);

			i915_gem_object_put_unlocked(obj);

			return -EINTR;

		}

		vma = find_vma(mm, addr);
@@ -1630,7 +1630,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 
		/* This may race, but that's ok, it only gets set */

		WRITE_ONCE(obj->has_wc_mmap, true);

	}

	drm_gem_object_unreference_unlocked(&obj->base);

	i915_gem_object_put_unlocked(obj);

	if (IS_ERR((void *)addr))

		return addr;
@@ -3615,7 +3615,7 @@ int i915_gem_get_caching_ioctl(struct drm_device *dev, void *data, 
		break;

	}



	drm_gem_object_unreference_unlocked(&obj->base);

	i915_gem_object_put_unlocked(obj);

	return 0;

}

drivers/gpu/drm/i915/i915_gem_tiling.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, 


	if (!i915_tiling_ok(dev,

			    args->stride, obj->base.size, args->tiling_mode)) {

		drm_gem_object_unreference_unlocked(&obj->base);

		i915_gem_object_put_unlocked(obj);

		return -EINVAL;

	}

drivers/gpu/drm/i915/i915_gem_userptr.c

+1 −1
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ i915_gem_userptr_ioctl(struct drm_device *dev, void *data, struct drm_file *file 
		ret = drm_gem_handle_create(file, &obj->base, &handle);



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

	drm_gem_object_unreference_unlocked(&obj->base);

	i915_gem_object_put_unlocked(obj);

	if (ret)

		return ret;

drivers/gpu/drm/i915/intel_display.c

+3 −3
Original line number Diff line number Diff line
@@ -10442,7 +10442,7 @@ intel_framebuffer_create_for_mode(struct drm_device *dev, 


	fb = intel_framebuffer_create(dev, &mode_cmd, obj);

	if (IS_ERR(fb))

		drm_gem_object_unreference_unlocked(&obj->base);

		i915_gem_object_put_unlocked(obj);



	return fb;

}
@@ -11756,7 +11756,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, 
	crtc->primary->fb = old_fb;

	update_state_fb(crtc->primary);



	drm_gem_object_unreference_unlocked(&obj->base);

	i915_gem_object_put_unlocked(obj);

	drm_framebuffer_unreference(work->old_fb);



	spin_lock_irq(&dev->event_lock);
@@ -15094,7 +15094,7 @@ intel_user_framebuffer_create(struct drm_device *dev, 


	fb = intel_framebuffer_create(dev, &mode_cmd, obj);

	if (IS_ERR(fb))

		drm_gem_object_unreference_unlocked(&obj->base);

		i915_gem_object_put_unlocked(obj);



	return fb;

}