From: michael.h.nguyen@intel.com
To: intel-gfx@lists.freedesktop.org
Cc: Brad Volkin <bradley.d.volkin@intel.com>
Subject: [PATCH v7 4/5] drm/i915: Mark shadow batch buffers as purgeable
Date: Thu, 11 Dec 2014 12:13:11 -0800 [thread overview]
Message-ID: <1418328792-28072-5-git-send-email-michael.h.nguyen@intel.com> (raw)
In-Reply-To: <1418328792-28072-1-git-send-email-michael.h.nguyen@intel.com>
From: Brad Volkin <bradley.d.volkin@intel.com>
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>
---
drivers/gpu/drm/i915/i915_gem_batch_pool.c | 2 ++
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_batch_pool.c b/drivers/gpu/drm/i915/i915_gem_batch_pool.c
index 6016125..c690170 100644
--- a/drivers/gpu/drm/i915/i915_gem_batch_pool.c
+++ b/drivers/gpu/drm/i915/i915_gem_batch_pool.c
@@ -131,5 +131,7 @@ i915_gem_batch_pool_get(struct i915_gem_batch_pool *pool,
/* Keep list in LRU order */
list_move_tail(&obj->batch_pool_list, &pool->cache_list);
+ obj->madv = I915_MADV_WILLNEED;
+
return obj;
}
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index fccfff5..9af4053 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -37,6 +37,7 @@
#define __EXEC_OBJECT_HAS_FENCE (1<<30)
#define __EXEC_OBJECT_NEEDS_MAP (1<<29)
#define __EXEC_OBJECT_NEEDS_BIAS (1<<28)
+#define __EXEC_OBJECT_PURGEABLE (1<<27)
#define BATCH_OFFSET_BIAS (256*1024)
@@ -226,7 +227,12 @@ i915_gem_execbuffer_unreserve_vma(struct i915_vma *vma)
if (entry->flags & __EXEC_OBJECT_HAS_PIN)
vma->pin_count--;
- entry->flags &= ~(__EXEC_OBJECT_HAS_FENCE | __EXEC_OBJECT_HAS_PIN);
+ if (entry->flags & __EXEC_OBJECT_PURGEABLE)
+ obj->madv = I915_MADV_DONTNEED;
+
+ entry->flags &= ~(__EXEC_OBJECT_HAS_FENCE |
+ __EXEC_OBJECT_HAS_PIN |
+ __EXEC_OBJECT_PURGEABLE);
}
static void eb_destroy(struct eb_vmas *eb)
@@ -1433,6 +1439,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
vma = i915_gem_obj_to_ggtt(shadow_batch_obj);
vma->exec_entry = &shadow_exec_entry;
+ vma->exec_entry->flags = __EXEC_OBJECT_PURGEABLE;
drm_gem_object_reference(&shadow_batch_obj->base);
list_add_tail(&vma->exec_list, &eb->vmas);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2014-12-11 20:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-11 20:13 [PATCH v7 0/5] Command parser batch buffer copy michael.h.nguyen
2014-12-11 20:13 ` [PATCH v7 1/5] drm/i915: Implement a framework for batch buffer pools michael.h.nguyen
2014-12-12 9:00 ` Bloomfield, Jon
2014-12-11 20:13 ` [PATCH v7 2/5] drm/i915: Use batch pools with the command parser michael.h.nguyen
2014-12-12 9:05 ` Bloomfield, Jon
2014-12-11 20:13 ` [PATCH v7 3/5] drm/i915: Use batch length instead of object size in " michael.h.nguyen
2014-12-12 9:13 ` Bloomfield, Jon
2014-12-11 20:13 ` michael.h.nguyen [this message]
2014-12-12 9:18 ` [PATCH v7 4/5] drm/i915: Mark shadow batch buffers as purgeable Bloomfield, Jon
2014-12-11 20:13 ` [PATCH v7 5/5] drm/i915: Tidy up execbuffer command parsing code michael.h.nguyen
2014-12-12 9:26 ` Bloomfield, Jon
2014-12-15 14:55 ` Daniel Vetter
2014-12-13 12:23 ` shuang.he
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1418328792-28072-5-git-send-email-michael.h.nguyen@intel.com \
--to=michael.h.nguyen@intel.com \
--cc=bradley.d.volkin@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox