GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 08:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Chris Wilson 2017-03-17 19:46:47 +00:00
parent 51a575d957
commit ce8ff099c4
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_gem.c
View file

@ -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); GEM_BUG_ON(obj->base.write_domain != I915_GEM_DOMAIN_CPU);
if (ret)
goto fail;
ret = i915_gem_object_pin_pages(obj); ret = i915_gem_object_pin_pages(obj);
if (ret) if (ret)

2
drivers/gpu/drm/i915/intel_uc.c
View file

@ -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;