git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-23 14:02:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge drm-upstream/drm-next into drm-intel-next-queued

Browse Source 
Catch up with upstream while it's easy.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula
2017-09-04 21:40:34 +03:00
parent afe722bee4 7846b12fe0
commit d149d6ae17
1221 changed files with 23061 additions and 24856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_gem_execbuffer.c
View File

@@ -2141,9 +2141,7 @@ await_fence_array(struct i915_execbuffer *eb,
if (!(flags & I915_EXEC_FENCE_WAIT))
continue;
rcu_read_lock();
fence = dma_fence_get_rcu_safe(&syncobj->fence);
rcu_read_unlock();
fence = drm_syncobj_fence_get(syncobj);
if (!fence)
return -EINVAL;