Explorar o código

drm/i915: i915_gem_object_create_from_data() doesn't require struct_mutex

Both object creation and backing storage page allocation do not require
struct_mutex, so do not require the caller to take it.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170317194648.12468-1-chris@chris-wilson.co.uk
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Chris Wilson %!s(int64=8) %!d(string=hai) anos
pai
achega
ce8ff099c4
Modificáronse 2 ficheiros con 1 adicións e 5 borrados
  1. 1 3
      drivers/gpu/drm/i915/i915_gem.c
  2. 0 2
      drivers/gpu/drm/i915/intel_uc.c

+ 1 - 3
drivers/gpu/drm/i915/i915_gem.c

@@ -4961,9 +4961,7 @@ i915_gem_object_create_from_data(struct drm_i915_private *dev_priv,
 	if (IS_ERR(obj))
 	if (IS_ERR(obj))
 		return obj;
 		return obj;
 
 
-	ret = i915_gem_object_set_to_cpu_domain(obj, true);
-	if (ret)
-		goto fail;
+	GEM_BUG_ON(obj->base.write_domain != I915_GEM_DOMAIN_CPU);
 
 
 	ret = i915_gem_object_pin_pages(obj);
 	ret = i915_gem_object_pin_pages(obj);
 	if (ret)
 	if (ret)

+ 0 - 2
drivers/gpu/drm/i915/intel_uc.c

@@ -376,9 +376,7 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv,
 			uc_fw->major_ver_found, uc_fw->minor_ver_found,
 			uc_fw->major_ver_found, uc_fw->minor_ver_found,
 			uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);
 			uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);
 
 
-	mutex_lock(&dev_priv->drm.struct_mutex);
 	obj = i915_gem_object_create_from_data(dev_priv, fw->data, fw->size);
 	obj = i915_gem_object_create_from_data(dev_priv, fw->data, fw->size);
-	mutex_unlock(&dev_priv->drm.struct_mutex);
 	if (IS_ERR_OR_NULL(obj)) {
 	if (IS_ERR_OR_NULL(obj)) {
 		err = obj ? PTR_ERR(obj) : -ENOMEM;
 		err = obj ? PTR_ERR(obj) : -ENOMEM;
 		goto fail;
 		goto fail;