diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-06-28 17:07:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-06-28 17:07:15 +1000 |
| commit | 9ff1beb1d19ffe2b26bf9cd2d33e6073d4f4b5fe (patch) | |
| tree | 0d154cdf42dfeeb1afa11ee05395f5c16e5fa0f0 /drivers/gpu/drm/i915/i915_vma.c | |
| parent | 5193c08c7e82248cb6b1e5d672d261c4da6bb47b (diff) | |
| parent | 611cdf3695a307fdca3ff3779a1e6cca935e2d31 (diff) | |
| download | linux-9ff1beb1d19ffe2b26bf9cd2d33e6073d4f4b5fe.tar.gz linux-9ff1beb1d19ffe2b26bf9cd2d33e6073d4f4b5fe.tar.bz2 linux-9ff1beb1d19ffe2b26bf9cd2d33e6073d4f4b5fe.zip | |
Merge tag 'drm-intel-fixes-2017-06-27' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes
Just a few minor fixes. Important one is the execbuf async fix (aka
ANDROID_native_sync). There was another patch for a display coherency
corner case on APL, but we've random-walked in that space too much,
and the cherry-pick looked really invasive.
* tag 'drm-intel-fixes-2017-06-27' of git://anongit.freedesktop.org/git/drm-intel:
drm/i915: Disable EXEC_OBJECT_ASYNC when doing relocations
drm/i915: Hold struct_mutex for per-file stats in debugfs/i915_gem_object
drm/i915: Retire the VMA's fence tracker before unbinding
Diffstat (limited to 'drivers/gpu/drm/i915/i915_vma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_vma.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index 1aba47024656..f066e2d785f5 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -650,6 +650,11 @@ int i915_vma_unbind(struct i915_vma *vma) break; } + if (!ret) { + ret = i915_gem_active_retire(&vma->last_fence, + &vma->vm->i915->drm.struct_mutex); + } + __i915_vma_unpin(vma); if (ret) return ret; |