diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-12-03 11:49:00 +0000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-12-03 17:22:16 +0100 |
| commit | a2165e312381f35b8abd7dcb8a8ab955bc60d867 (patch) | |
| tree | 204f81ca8c75aeaadc6c425959ad96247a56958a /drivers/gpu | |
| parent | 7b01e260a6cad9152eefb44ce64f3a2073af1e6b (diff) | |
| download | linux-stable-a2165e312381f35b8abd7dcb8a8ab955bc60d867.tar.gz linux-stable-a2165e312381f35b8abd7dcb8a8ab955bc60d867.tar.bz2 linux-stable-a2165e312381f35b8abd7dcb8a8ab955bc60d867.zip | |
drm/i915: Decouple the object from the unbound list before freeing pages
As we may actually allocate in order to save the physical swizzling bits
during the free, we have to be careful not to trigger the shrinker on
the same object.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
[danvet: Added a small comment in the code to really drive the
scariness of this patch home.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 4ef8b5714337..c1f691958f89 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1696,10 +1696,14 @@ i915_gem_object_put_pages(struct drm_i915_gem_object *obj) if (obj->pages_pin_count) return -EBUSY; + /* ->put_pages might need to allocate memory for the bit17 swizzle + * array, hence protect them from being reaped by removing them from gtt + * lists early. */ + list_del(&obj->gtt_list); + ops->put_pages(obj); obj->pages = NULL; - list_del(&obj->gtt_list); if (i915_gem_object_is_purgeable(obj)) i915_gem_object_truncate(obj); |