diff options
| author | Chris Wilson | 2014-06-06 11:22:54 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-06-13 15:17:36 +0200 |
| commit | ef0cf27c4d0209d0c38c2ddf8f2c529706912861 (patch) | |
| tree | 9bbb979b92b8b19211c9b7a985b29a5c2f49df85 /drivers/gpu/drm/i915/i915_gem_stolen.c | |
| parent | drm/i915: Only wait one vblank when disabling crc if the pipe is on (diff) | |
| download | kernel-qcow2-linux-ef0cf27c4d0209d0c38c2ddf8f2c529706912861.tar.gz kernel-qcow2-linux-ef0cf27c4d0209d0c38c2ddf8f2c529706912861.tar.xz kernel-qcow2-linux-ef0cf27c4d0209d0c38c2ddf8f2c529706912861.zip | |
drm/i915: Use the .release hook to drop the stolen drm_mm tracking
Now that we have a release hook into i915_gem_object_free, we can move
the explicit call to the internal stolen function and hook it up
throught the callback instead.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_stolen.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_stolen.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 62ef55ba061c..644117855e01 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -292,9 +292,20 @@ static void i915_gem_object_put_pages_stolen(struct drm_i915_gem_object *obj) kfree(obj->pages); } + +static void +i915_gem_object_release_stolen(struct drm_i915_gem_object *obj) +{ + if (obj->stolen) { + drm_mm_remove_node(obj->stolen); + kfree(obj->stolen); + obj->stolen = NULL; + } +} static const struct drm_i915_gem_object_ops i915_gem_object_stolen_ops = { .get_pages = i915_gem_object_get_pages_stolen, .put_pages = i915_gem_object_put_pages_stolen, + .release = i915_gem_object_release_stolen, }; static struct drm_i915_gem_object * @@ -452,13 +463,3 @@ err_out: drm_gem_object_unreference(&obj->base); return NULL; } - -void -i915_gem_object_release_stolen(struct drm_i915_gem_object *obj) -{ - if (obj->stolen) { - drm_mm_remove_node(obj->stolen); - kfree(obj->stolen); - obj->stolen = NULL; - } -} |