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

Commit d65415df authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Do an unlocked wait before set-cache-level ioctl 



Since a change in cache level is likely to trigger an unbind, avoid
waiting under the mutex by preemptively doing an unlocked wait.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170119082211.21257-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
parent 3139b4a3

drivers/gpu/drm/i915/i915_gem.c

+19 −10
Original line number Diff line number Diff line
@@ -3397,7 +3397,7 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data, 
	struct drm_i915_gem_caching *args = data;

	struct drm_i915_gem_object *obj;

	enum i915_cache_level level;

	int ret;

	int ret = 0;



	switch (args->caching) {

	case I915_CACHING_NONE:
@@ -3422,20 +3422,29 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data, 
		return -EINVAL;

	}



	ret = i915_mutex_lock_interruptible(dev);

	obj = i915_gem_object_lookup(file, args->handle);

	if (!obj)

		return -ENOENT;



	if (obj->cache_level == level)

		goto out;



	ret = i915_gem_object_wait(obj,

				   I915_WAIT_INTERRUPTIBLE,

				   MAX_SCHEDULE_TIMEOUT,

				   to_rps_client(file));

	if (ret)

		return ret;

		goto out;



	obj = i915_gem_object_lookup(file, args->handle);

	if (!obj) {

		ret = -ENOENT;

		goto unlock;

	}

	ret = i915_mutex_lock_interruptible(dev);

	if (ret)

		goto out;



	ret = i915_gem_object_set_cache_level(obj, level);

	i915_gem_object_put(obj);

unlock:

	mutex_unlock(&dev->struct_mutex);



out:

	i915_gem_object_put(obj);

	return ret;

}