diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-06-17 21:52:49 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-17 15:26:24 -0700 |
| commit | d78b47b9a527bf46cb6081555847facd6efd5f81 (patch) | |
| tree | dee4127eda7743ee2370057394418e6a2d742a2d /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 76cff81ad1cfa3bd8b52b5e4510702ce2ed28335 (diff) | |
| download | op-kernel-dev-d78b47b9a527bf46cb6081555847facd6efd5f81.zip op-kernel-dev-d78b47b9a527bf46cb6081555847facd6efd5f81.tar.gz | |
drm/i915: detach/attach get/put pages symmetry
After performing an operation over the page list for a buffer retrieved by
i915_gem_object_get_pages() the pages need to be returned with
i915_gem_object_put_pages(). This was not being observed for the phys
objects which were thus leaking references to their backing pages.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
CC: Dave Airlie <airlied@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index c0ae6bb..a5f95ad 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4312,6 +4312,8 @@ void i915_gem_detach_phys_object(struct drm_device *dev, } drm_clflush_pages(obj_priv->pages, page_count); drm_agp_chipset_flush(dev); + + i915_gem_object_put_pages(obj); out: obj_priv->phys_obj->cur_obj = NULL; obj_priv->phys_obj = NULL; @@ -4369,6 +4371,8 @@ i915_gem_attach_phys_object(struct drm_device *dev, kunmap_atomic(src, KM_USER0); } + i915_gem_object_put_pages(obj); + return 0; out: return ret; |
