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

Commit bc9025bd authored by Luca Barbieri's avatar Luca Barbieri Committed by Dave Airlie
Browse files

Use drm_gem_object_[handle_]unreference_unlocked where possible 



Mostly obvious simplifications.

The i915 pread/pwrite ioctls, intel_overlay_put_image and
nouveau_gem_new were incorrectly using the locked versions
without locking: this is also fixed in this patch.

Signed-off-by: default avatarLuca Barbieri <luca@luca-barbieri.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent c3ae90c0

drivers/gpu/drm/drm_gem.c

+5 −16
Original line number Diff line number Diff line
@@ -192,9 +192,7 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle) 
	idr_remove(&filp->object_idr, handle);

	spin_unlock(&filp->table_lock);



	mutex_lock(&dev->struct_mutex);

	drm_gem_object_handle_unreference(obj);

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_handle_unreference_unlocked(obj);



	return 0;

}
@@ -325,9 +323,7 @@ again: 
	}



err:

	mutex_lock(&dev->struct_mutex);

	drm_gem_object_unreference(obj);

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_unreference_unlocked(obj);

	return ret;

}
@@ -358,9 +354,7 @@ drm_gem_open_ioctl(struct drm_device *dev, void *data, 
		return -ENOENT;



	ret = drm_gem_handle_create(file_priv, obj, &handle);

	mutex_lock(&dev->struct_mutex);

	drm_gem_object_unreference(obj);

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_unreference_unlocked(obj);

	if (ret)

		return ret;
@@ -390,7 +384,7 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) 
{

	struct drm_gem_object *obj = ptr;



	drm_gem_object_handle_unreference(obj);

	drm_gem_object_handle_unreference_unlocked(obj);



	return 0;

}
@@ -403,12 +397,10 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) 
void

drm_gem_release(struct drm_device *dev, struct drm_file *file_private)

{

	mutex_lock(&dev->struct_mutex);

	idr_for_each(&file_private->object_idr,

		     &drm_gem_object_release_handle, NULL);



	idr_destroy(&file_private->object_idr);

	mutex_unlock(&dev->struct_mutex);

}



static void
@@ -516,11 +508,8 @@ EXPORT_SYMBOL(drm_gem_vm_open); 
void drm_gem_vm_close(struct vm_area_struct *vma)

{

	struct drm_gem_object *obj = vma->vm_private_data;

	struct drm_device *dev = obj->dev;



	mutex_lock(&dev->struct_mutex);

	drm_gem_object_unreference(obj);

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_unreference_unlocked(obj);

}

EXPORT_SYMBOL(drm_gem_vm_close);

drivers/gpu/drm/i915/i915_gem.c

+6 −10
Original line number Diff line number Diff line
@@ -128,9 +128,7 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data, 
		return -ENOMEM;



	ret = drm_gem_handle_create(file_priv, obj, &handle);

	mutex_lock(&dev->struct_mutex);

	drm_gem_object_handle_unreference(obj);

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_handle_unreference_unlocked(obj);



	if (ret)

		return ret;
@@ -488,7 +486,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data, 
	 */

	if (args->offset > obj->size || args->size > obj->size ||

	    args->offset + args->size > obj->size) {

		drm_gem_object_unreference(obj);

		drm_gem_object_unreference_unlocked(obj);

		return -EINVAL;

	}
@@ -501,7 +499,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data, 
							file_priv);

	}



	drm_gem_object_unreference(obj);

	drm_gem_object_unreference_unlocked(obj);



	return ret;

}
@@ -961,7 +959,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, 
	 */

	if (args->offset > obj->size || args->size > obj->size ||

	    args->offset + args->size > obj->size) {

		drm_gem_object_unreference(obj);

		drm_gem_object_unreference_unlocked(obj);

		return -EINVAL;

	}
@@ -995,7 +993,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, 
		DRM_INFO("pwrite failed %d\n", ret);

#endif



	drm_gem_object_unreference(obj);

	drm_gem_object_unreference_unlocked(obj);



	return ret;

}
@@ -1138,9 +1136,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 
		       PROT_READ | PROT_WRITE, MAP_SHARED,

		       args->offset);

	up_write(&current->mm->mmap_sem);

	mutex_lock(&dev->struct_mutex);

	drm_gem_object_unreference(obj);

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_unreference_unlocked(obj);

	if (IS_ERR((void *)addr))

		return addr;

drivers/gpu/drm/i915/i915_gem_tiling.c

+1 −3
Original line number Diff line number Diff line
@@ -438,9 +438,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, 
	obj_priv = obj->driver_private;



	if (!i915_tiling_ok(dev, args->stride, obj->size, args->tiling_mode)) {

		mutex_lock(&dev->struct_mutex);

		drm_gem_object_unreference(obj);

		mutex_unlock(&dev->struct_mutex);

		drm_gem_object_unreference_unlocked(obj);

		return -EINVAL;

	}

drivers/gpu/drm/i915/intel_display.c

+4 −9
Original line number Diff line number Diff line
@@ -3434,11 +3434,10 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc, 
	intel_crtc->cursor_bo = bo;



	return 0;

fail:

	mutex_lock(&dev->struct_mutex);

fail_locked:

	drm_gem_object_unreference(bo);

	mutex_unlock(&dev->struct_mutex);

fail:

	drm_gem_object_unreference_unlocked(bo);

	return ret;

}
@@ -4351,9 +4350,7 @@ static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb) 
		intelfb_remove(dev, fb);



	drm_framebuffer_cleanup(fb);

	mutex_lock(&dev->struct_mutex);

	drm_gem_object_unreference(intel_fb->obj);

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_unreference_unlocked(intel_fb->obj);



	kfree(intel_fb);

}
@@ -4416,9 +4413,7 @@ intel_user_framebuffer_create(struct drm_device *dev, 


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

	if (ret) {

		mutex_lock(&dev->struct_mutex);

		drm_gem_object_unreference(obj);

		mutex_unlock(&dev->struct_mutex);

		drm_gem_object_unreference_unlocked(obj);

		return NULL;

	}

drivers/gpu/drm/i915/intel_overlay.c

+1 −1
Original line number Diff line number Diff line
@@ -1179,7 +1179,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data, 
out_unlock:

	mutex_unlock(&dev->struct_mutex);

	mutex_unlock(&dev->mode_config.mutex);

	drm_gem_object_unreference(new_bo);

	drm_gem_object_unreference_unlocked(new_bo);

	kfree(params);



	return ret;