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

Commit 73c273eb authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: simplify context_idr_cleanup 



The idr code already passes us the pointer associated with that id, so
no need to look it up again. Also, we'll kill the idr right away, so
there's no issue with leaving these dangling pointers behind - the
current code does the same.

v2: Also drop the file argument, spotted by Ben Widawsky.

Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6f4c45c1

drivers/gpu/drm/i915/i915_gem_context.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -289,14 +289,9 @@ void i915_gem_context_fini(struct drm_device *dev) 




static int context_idr_cleanup(int id, void *p, void *data)

static int context_idr_cleanup(int id, void *p, void *data)

{

{

	struct drm_file *file = (struct drm_file *)data;

	struct i915_hw_context *ctx = p;

	struct drm_i915_file_private *file_priv = file->driver_priv;

	struct i915_hw_context *ctx;





	BUG_ON(id == DEFAULT_CONTEXT_ID);

	BUG_ON(id == DEFAULT_CONTEXT_ID);

	ctx = i915_gem_context_get(file_priv, id);

	if (WARN_ON(ctx == NULL))

		return -ENXIO;





	do_destroy(ctx);

	do_destroy(ctx);
@@ -308,7 +303,7 @@ void i915_gem_context_close(struct drm_device *dev, struct drm_file *file) 
	struct drm_i915_file_private *file_priv = file->driver_priv;

	struct drm_i915_file_private *file_priv = file->driver_priv;





	mutex_lock(&dev->struct_mutex);

	mutex_lock(&dev->struct_mutex);

	idr_for_each(&file_priv->context_idr, context_idr_cleanup, file);

	idr_for_each(&file_priv->context_idr, context_idr_cleanup, NULL);

	idr_destroy(&file_priv->context_idr);

	idr_destroy(&file_priv->context_idr);

	mutex_unlock(&dev->struct_mutex);

	mutex_unlock(&dev->struct_mutex);

}

}