public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH 1/3] drm/i915: Assert we do not try to expand VMA for hugepage inside GGTT
@ 2017-10-08 13:43 Chris Wilson
  2017-10-08 13:43 ` [PATCH 2/3] drm/i915: Retire after wait-for-idle on evict Chris Wilson
                   ` (7 more replies)
  0 siblings, 8 replies; 13+ messages in thread
From: Chris Wilson @ 2017-10-08 13:43 UTC (permalink / raw)
  To: intel-gfx

We only apply the hugepage PD redirection inside the ppGTT, so during
i915_vma_insert() we want to exclude the GGTT from the additional
alignment constraints (thereby avoiding the extra GTT pressure from
fragmentation). Add an assert to document that intention alongside the
comment.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.william.auld@gmail.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_vma.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 72e86b32ab41..2d27027eaf85 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -513,6 +513,8 @@ i915_vma_insert(struct i915_vma *vma, u64 size, u64 alignment, u64 flags)
 				rounddown_pow_of_two(vma->page_sizes.sg |
 						     I915_GTT_PAGE_SIZE_2M);
 
+			GEM_BUG_ON((flags & PIN_USER) == 0); /* No GGTT! */
+
 			alignment = max(alignment, page_alignment);
 
 			if (vma->page_sizes.sg & I915_GTT_PAGE_SIZE_64K)
-- 
2.14.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2017-10-09 13:03 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-08 13:43 [PATCH 1/3] drm/i915: Assert we do not try to expand VMA for hugepage inside GGTT Chris Wilson
2017-10-08 13:43 ` [PATCH 2/3] drm/i915: Retire after wait-for-idle on evict Chris Wilson
2017-10-08 13:56   ` Chris Wilson
2017-10-08 13:43 ` [PATCH 3/3] drm/i915: Replace manual checking for idleness with active_requests counter Chris Wilson
2017-10-09  8:37   ` Chris Wilson
2017-10-08 14:06 ` ✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915: Assert we do not try to expand VMA for hugepage inside GGTT Patchwork
2017-10-08 15:01 ` [PATCH 1/3] " Matthew Auld
2017-10-09  8:17   ` Chris Wilson
2017-10-08 15:07 ` ✓ Fi.CI.IGT: success for series starting with [1/3] " Patchwork
2017-10-09  9:20 ` [PATCH v2] " Chris Wilson
2017-10-09 13:03   ` Joonas Lahtinen
2017-10-09  9:44 ` ✓ Fi.CI.BAT: success for series starting with [v2] drm/i915: Assert we do not try to expand VMA for hugepage inside GGTT (rev2) Patchwork
2017-10-09 11:05 ` ✓ Fi.CI.IGT: " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox