[PATCH 08/10] Revert "drm/i915/gem/ttm: Respect the objection region in placement_from_obj"

Jason Ekstrand jason at jlekstrand.net
Thu Jul 22 15:46:56 UTC 2021


This reverts commit 9cd19e8b4cd596cadce355c1a8d43d95635e393c.
---
 drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index b76bdd978a5cc..f253b11e9e367 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -150,7 +150,8 @@ i915_ttm_placement_from_obj(const struct drm_i915_gem_object *obj,
 	unsigned int i;
 
 	placement->num_placement = 1;
-	i915_ttm_place_from_region(obj->mm.region, requested, flags);
+	i915_ttm_place_from_region(num_allowed ? obj->mm.placements[0] :
+				   obj->mm.region, requested, flags);
 
 	/* Cache this on object? */
 	placement->num_busy_placement = num_allowed;
-- 
2.31.1



More information about the Intel-gfx-trybot mailing list