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

Merge tag 'drm-intel-fixes-2015-06-18' of git://anongit.freedesktop.org/drm-intel into drm-fixes

Browse source 
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
This commit is contained in:
Dave Airlie 2015-06-19 11:58:39 +10:00
commit fcee3c73a2
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2656,6 +2656,9 @@ void i915_gem_reset(struct drm_device *dev)
void void
i915_gem_retire_requests_ring(struct intel_engine_cs *ring) i915_gem_retire_requests_ring(struct intel_engine_cs *ring)
{ {
if (list_empty(&ring->request_list))
return;
WARN_ON(i915_verify_lists(ring->dev)); WARN_ON(i915_verify_lists(ring->dev));
/* Retire requests first as we use it above for the early return. /* 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) { } else if (vma->ggtt_view.pages) {
sg_free_table(vma->ggtt_view.pages); sg_free_table(vma->ggtt_view.pages);
kfree(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); drm_mm_remove_node(&vma->node);