diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-05 08:36:59 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-06 03:07:59 -0500 |
commit | 7838a63a53f69c4cdfd450b60f0d58ed6641076e (patch) | |
tree | 169109808426f5e82a9b66722eb378eafa6e8271 | |
parent | 944115934436b1ff6cf773a9e9123858ea9ef3da (diff) |
drm/i915: Include i915_gem_evict.c kerneldoc into the drm docbook
I've written these long before we've had a reasonable docbook
structure, and naturally they've gone stale. Fix this up asap.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
-rw-r--r-- | Documentation/DocBook/drm.tmpl | 11 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_evict.c | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index bd1456ad8460..38f7ef3933c4 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl | |||
@@ -4048,6 +4048,17 @@ int num_ioctls;</synopsis> | |||
4048 | !Pdrivers/gpu/drm/i915/i915_gem_gtt.c Global GTT views | 4048 | !Pdrivers/gpu/drm/i915/i915_gem_gtt.c Global GTT views |
4049 | !Idrivers/gpu/drm/i915/i915_gem_gtt.c | 4049 | !Idrivers/gpu/drm/i915/i915_gem_gtt.c |
4050 | </sect2> | 4050 | </sect2> |
4051 | <sect2> | ||
4052 | <title>Buffer Object Eviction</title> | ||
4053 | <para> | ||
4054 | This section documents the interface function for evicting buffer | ||
4055 | objects to make space available in the virtual gpu address spaces. | ||
4056 | Note that this is mostly orthogonal to shrinking buffer objects | ||
4057 | caches, which has the goal to make main memory (shared with the gpu | ||
4058 | through the unified memory architecture) available. | ||
4059 | </para> | ||
4060 | !Idrivers/gpu/drm/i915/i915_gem_evict.c | ||
4061 | </sect2> | ||
4051 | </sect1> | 4062 | </sect1> |
4052 | 4063 | ||
4053 | <sect1> | 4064 | <sect1> |
diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c index 886ff2ee7a28..d104c9120c4d 100644 --- a/drivers/gpu/drm/i915/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/i915_gem_evict.c | |||
@@ -50,11 +50,12 @@ mark_free(struct i915_vma *vma, struct list_head *unwind) | |||
50 | * i915_gem_evict_something - Evict vmas to make room for binding a new one | 50 | * i915_gem_evict_something - Evict vmas to make room for binding a new one |
51 | * @dev: drm_device | 51 | * @dev: drm_device |
52 | * @vm: address space to evict from | 52 | * @vm: address space to evict from |
53 | * @size: size of the desired free space | 53 | * @min_size: size of the desired free space |
54 | * @alignment: alignment constraint of the desired free space | 54 | * @alignment: alignment constraint of the desired free space |
55 | * @cache_level: cache_level for the desired space | 55 | * @cache_level: cache_level for the desired space |
56 | * @mappable: whether the free space must be mappable | 56 | * @start: start (inclusive) of the range from which to evict objects |
57 | * @nonblocking: whether evicting active objects is allowed or not | 57 | * @end: end (exclusive) of the range from which to evict objects |
58 | * @flags: additional flags to control the eviction algorithm | ||
58 | * | 59 | * |
59 | * This function will try to evict vmas until a free space satisfying the | 60 | * This function will try to evict vmas until a free space satisfying the |
60 | * requirements is found. Callers must check first whether any such hole exists | 61 | * requirements is found. Callers must check first whether any such hole exists |
@@ -196,7 +197,6 @@ found: | |||
196 | 197 | ||
197 | /** | 198 | /** |
198 | * i915_gem_evict_vm - Evict all idle vmas from a vm | 199 | * i915_gem_evict_vm - Evict all idle vmas from a vm |
199 | * | ||
200 | * @vm: Address space to cleanse | 200 | * @vm: Address space to cleanse |
201 | * @do_idle: Boolean directing whether to idle first. | 201 | * @do_idle: Boolean directing whether to idle first. |
202 | * | 202 | * |