diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-06-19 11:58:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-06-19 11:58:39 +1000 |
| commit | fcee3c73a2c51982057b93fe599b7c68e16d0636 (patch) | |
| tree | e0f3890063192f05727f4749573bf22ac268cbcb /drivers | |
| parent | 031fea43670c265a55aa5037dd08f8d5a10d2803 (diff) | |
| parent | 245ec9d85696c3e539b23e210f248698b478379c (diff) | |
| download | linux-fcee3c73a2c51982057b93fe599b7c68e16d0636.tar.bz2 | |
Merge tag 'drm-intel-fixes-2015-06-18' of git://anongit.freedesktop.org/drm-intel into drm-fixes
one fix, one revert
* tag 'drm-intel-fixes-2015-06-18' of git://anongit.freedesktop.org/drm-intel:
Revert "drm/i915: Don't skip request retirement if the active list is empty"
drm/i915: Always reset vma->ggtt_view.pages cache on unbinding
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 851b585987f9..2d0995e7afc3 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2656,6 +2656,9 @@ void i915_gem_reset(struct drm_device *dev) void i915_gem_retire_requests_ring(struct intel_engine_cs *ring) { + if (list_empty(&ring->request_list)) + return; + WARN_ON(i915_verify_lists(ring->dev)); /* Retire requests first as we use it above for the early return. @@ -3000,8 +3003,8 @@ int i915_vma_unbind(struct i915_vma *vma) } else if (vma->ggtt_view.pages) { sg_free_table(vma->ggtt_view.pages); kfree(vma->ggtt_view.pages); - vma->ggtt_view.pages = NULL; } + vma->ggtt_view.pages = NULL; } drm_mm_remove_node(&vma->node); |