diff options
author | Brad Volkin <bradley.d.volkin@intel.com> | 2014-12-11 15:13:11 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-12-16 04:39:09 -0500 |
commit | 0079a7df3a47bfd0b64dc6e6ef47a651263760dc (patch) | |
tree | 0b883212e4550a4a64fd29cb1e6878d8a798fdb0 /drivers/gpu/drm/i915/i915_gem_execbuffer.c | |
parent | b9ffd80ed659c559152c042e74741f4f60cac691 (diff) |
drm/i915: Mark shadow batch buffers as purgeable
By adding a new exec_entry flag, we cleanly mark the shadow objects
as purgeable after they are on the active list.
v2:
- Move 'shadow_batch_obj->madv = I915_MADV_WILLNEED' inside _get
fnc (danvet, from v4 6/7 feedback)
v3:
- Remove duplicate 'madv = I915_MADV_WILLNEED' (danvet, from v6 4/5)
Issue: VIZ-4719
Signed-off-by: Brad Volkin <bradley.d.volkin@intel.com>
Reviewed-By: Jon Bloomfield <jon.bloomfield@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_execbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 5973e2005e89..86de3720527b 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #define __EXEC_OBJECT_HAS_FENCE (1<<30) | 37 | #define __EXEC_OBJECT_HAS_FENCE (1<<30) |
38 | #define __EXEC_OBJECT_NEEDS_MAP (1<<29) | 38 | #define __EXEC_OBJECT_NEEDS_MAP (1<<29) |
39 | #define __EXEC_OBJECT_NEEDS_BIAS (1<<28) | 39 | #define __EXEC_OBJECT_NEEDS_BIAS (1<<28) |
40 | #define __EXEC_OBJECT_PURGEABLE (1<<27) | ||
40 | 41 | ||
41 | #define BATCH_OFFSET_BIAS (256*1024) | 42 | #define BATCH_OFFSET_BIAS (256*1024) |
42 | 43 | ||
@@ -226,7 +227,12 @@ i915_gem_execbuffer_unreserve_vma(struct i915_vma *vma) | |||
226 | if (entry->flags & __EXEC_OBJECT_HAS_PIN) | 227 | if (entry->flags & __EXEC_OBJECT_HAS_PIN) |
227 | vma->pin_count--; | 228 | vma->pin_count--; |
228 | 229 | ||
229 | entry->flags &= ~(__EXEC_OBJECT_HAS_FENCE | __EXEC_OBJECT_HAS_PIN); | 230 | if (entry->flags & __EXEC_OBJECT_PURGEABLE) |
231 | obj->madv = I915_MADV_DONTNEED; | ||
232 | |||
233 | entry->flags &= ~(__EXEC_OBJECT_HAS_FENCE | | ||
234 | __EXEC_OBJECT_HAS_PIN | | ||
235 | __EXEC_OBJECT_PURGEABLE); | ||
230 | } | 236 | } |
231 | 237 | ||
232 | static void eb_destroy(struct eb_vmas *eb) | 238 | static void eb_destroy(struct eb_vmas *eb) |
@@ -1436,6 +1442,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, | |||
1436 | 1442 | ||
1437 | vma = i915_gem_obj_to_ggtt(shadow_batch_obj); | 1443 | vma = i915_gem_obj_to_ggtt(shadow_batch_obj); |
1438 | vma->exec_entry = &shadow_exec_entry; | 1444 | vma->exec_entry = &shadow_exec_entry; |
1445 | vma->exec_entry->flags = __EXEC_OBJECT_PURGEABLE; | ||
1439 | drm_gem_object_reference(&shadow_batch_obj->base); | 1446 | drm_gem_object_reference(&shadow_batch_obj->base); |
1440 | list_add_tail(&vma->exec_list, &eb->vmas); | 1447 | list_add_tail(&vma->exec_list, &eb->vmas); |
1441 | 1448 | ||