From: Jason Ekstrand <jason@jlekstrand.net>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
"Matthew Auld" <matthew.auld@intel.com>,
"Jason Ekstrand" <jason@jlekstrand.net>
Subject: [PATCH 5/7] drm/i915/gem/ttm: Respect the objection region in placement_from_obj
Date: Fri, 16 Jul 2021 09:14:24 -0500 [thread overview]
Message-ID: <20210716141426.1904528-6-jason@jlekstrand.net> (raw)
In-Reply-To: <20210716141426.1904528-1-jason@jlekstrand.net>
Whenever we had a user object (n_placements > 0), we were ignoring
obj->mm.region and always putting obj->placements[0] as the requested
region. For LMEM+SMEM objects, this was causing them to get shoved into
LMEM on every i915_ttm_get_pages() even when SMEM was requested by, say,
i915_gem_object_migrate().
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index 6589411396d3f..8eeb73c7c401c 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -150,8 +150,7 @@ i915_ttm_placement_from_obj(const struct drm_i915_gem_object *obj,
unsigned int i;
placement->num_placement = 1;
- i915_ttm_place_from_region(num_allowed ? obj->mm.placements[0] :
- obj->mm.region, requested, flags);
+ i915_ttm_place_from_region(obj->mm.region, requested, flags);
/* Cache this on object? */
placement->num_busy_placement = num_allowed;
--
2.31.1
next prev parent reply other threads:[~2021-07-16 14:14 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-16 14:14 [PATCH 0/7] drm/i915: Migrate memory to SMEM when imported cross-device (v7) Jason Ekstrand
2021-07-16 14:14 ` [PATCH 1/7] drm/i915/gem: Check object_can_migrate from object_migrate Jason Ekstrand
2021-07-16 14:14 ` [PATCH 2/7] drm/i915/gem: Refactor placement setup for i915_gem_object_create* (v2) Jason Ekstrand
2021-07-16 19:18 ` Matthew Auld
2021-07-19 8:17 ` Matthew Auld
2021-07-20 22:06 ` Jason Ekstrand
2021-07-21 8:31 ` Matthew Auld
2021-07-21 18:22 ` Jason Ekstrand
2021-07-16 14:14 ` [PATCH 3/7] drm/i915/gem: Call i915_gem_flush_free_objects() in i915_gem_dumb_create() Jason Ekstrand
2021-07-16 19:19 ` Matthew Auld
2021-07-16 14:14 ` [PATCH 4/7] drm/i915/gem: Unify user object creation (v2) Jason Ekstrand
2021-07-16 19:21 ` [Intel-gfx] " Matthew Auld
2021-07-19 8:12 ` Matthew Auld
2021-07-16 14:14 ` Jason Ekstrand [this message]
2021-07-16 19:23 ` [Intel-gfx] [PATCH 5/7] drm/i915/gem/ttm: Respect the objection region in placement_from_obj Matthew Auld
2021-07-16 14:14 ` [PATCH 6/7] drm/i915/gem: Correct the locking and pin pattern for dma-buf (v6) Jason Ekstrand
2021-07-20 9:07 ` Matthew Auld
2021-07-20 21:55 ` Jason Ekstrand
2021-07-16 14:14 ` [PATCH 7/7] drm/i915/gem: Migrate to system at dma-buf attach time (v6) Jason Ekstrand
2021-07-20 10:53 ` [Intel-gfx] " Matthew Auld
2021-07-20 21:40 ` Jason Ekstrand
-- strict thread matches above, loose matches on Subject: below --
2021-07-21 20:13 [PATCH 0/7] drm/i915: Migrate memory to SMEM when imported cross-device (v8) Jason Ekstrand
2021-07-21 20:13 ` [PATCH 5/7] drm/i915/gem/ttm: Respect the objection region in placement_from_obj Jason Ekstrand
2021-07-15 22:38 [PATCH 0/7] drm/i915: Migrate memory to SMEM when imported cross-device Jason Ekstrand
2021-07-15 22:38 ` [PATCH 5/7] drm/i915/gem/ttm: Respect the objection region in placement_from_obj Jason Ekstrand
2021-07-16 13:54 ` Matthew Auld
2021-07-16 14:10 ` Jason Ekstrand
2021-07-16 15:52 ` Matthew Auld
2021-07-16 16:00 ` Matthew Auld
2021-07-16 17:38 ` Jason Ekstrand
2021-07-16 18:44 ` Matthew Auld
2021-07-16 19:49 ` Jason Ekstrand
2021-07-19 13:34 ` Matthew Auld
2021-07-21 20:11 ` Jason Ekstrand
2021-07-22 9:49 ` Matthew Auld
2021-07-22 9:59 ` Matthew Auld
2021-08-04 8:00 ` Thomas Hellström
2021-08-04 14:35 ` Daniel Vetter
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=20210716141426.1904528-6-jason@jlekstrand.net \
--to=jason@jlekstrand.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.auld@intel.com \
--cc=thomas.hellstrom@linux.intel.com \
/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;
as well as URLs for NNTP newsgroup(s).