From: Robert Beckett <bob.beckett@collabora.com> To: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, "Jani Nikula" <jani.nikula@linux.intel.com>, "Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>, "Rodrigo Vivi" <rodrigo.vivi@intel.com>, "Tvrtko Ursulin" <tvrtko.ursulin@linux.intel.com>, "David Airlie" <airlied@linux.ie>, "Daniel Vetter" <daniel@ffwll.ch> Cc: Matthew Auld <matthew.auld@intel.com>, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/4] drm/i915: allow volatile buffers to use ttm pool allocator Date: Mon, 23 May 2022 16:53:26 +0100 [thread overview] Message-ID: <f42a3dc9-2a6f-2467-b2ff-b6487669ae48@collabora.com> (raw) In-Reply-To: <3ce81c514959e43f5afd7e74489dd5b89b1cd633.camel@linux.intel.com> On 11/05/2022 13:42, Thomas Hellström wrote: > Hi, Bob, > > On Tue, 2022-05-03 at 19:13 +0000, Robert Beckett wrote: >> internal buffers should be shmem backed. >> if a volatile buffer is requested, allow ttm to use the pool >> allocator >> to provide volatile pages as backing >> >> Signed-off-by: Robert Beckett <bob.beckett@collabora.com> >> --- >> 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 4c25d9b2f138..fdb3a1c18cb6 100644 >> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c >> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c >> @@ -309,7 +309,8 @@ static struct ttm_tt *i915_ttm_tt_create(struct >> ttm_buffer_object *bo, >> page_flags |= TTM_TT_FLAG_ZERO_ALLOC; >> >> caching = i915_ttm_select_tt_caching(obj); >> - if (i915_gem_object_is_shrinkable(obj) && caching == >> ttm_cached) { >> + if (i915_gem_object_is_shrinkable(obj) && caching == >> ttm_cached && >> + !i915_gem_object_is_volatile(obj)) { >> page_flags |= TTM_TT_FLAG_EXTERNAL | >> TTM_TT_FLAG_EXTERNAL_MAPPABLE; >> i915_tt->is_shmem = true; > > While this is ok, I think it also needs adjustment in the i915_ttm > shrink callback. If someone creates a volatile smem object which then > hits the shrinker, I think we might hit asserts that it's a is_shem > ttm? > > In this case, the shrink callback should just i915_ttm_purge(). agreed. nice catch. I'll fix for v2 looks like we could maybe do with some extra shrinker testing too? looks like nothing caught this during CI testing > > /Thomas > >
WARNING: multiple messages have this Message-ID (diff)
From: Robert Beckett <bob.beckett@collabora.com> To: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, "Jani Nikula" <jani.nikula@linux.intel.com>, "Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>, "Rodrigo Vivi" <rodrigo.vivi@intel.com>, "Tvrtko Ursulin" <tvrtko.ursulin@linux.intel.com>, "David Airlie" <airlied@linux.ie>, "Daniel Vetter" <daniel@ffwll.ch> Cc: Matthew Auld <matthew.auld@intel.com>, linux-kernel@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH 3/4] drm/i915: allow volatile buffers to use ttm pool allocator Date: Mon, 23 May 2022 16:53:26 +0100 [thread overview] Message-ID: <f42a3dc9-2a6f-2467-b2ff-b6487669ae48@collabora.com> (raw) In-Reply-To: <3ce81c514959e43f5afd7e74489dd5b89b1cd633.camel@linux.intel.com> On 11/05/2022 13:42, Thomas Hellström wrote: > Hi, Bob, > > On Tue, 2022-05-03 at 19:13 +0000, Robert Beckett wrote: >> internal buffers should be shmem backed. >> if a volatile buffer is requested, allow ttm to use the pool >> allocator >> to provide volatile pages as backing >> >> Signed-off-by: Robert Beckett <bob.beckett@collabora.com> >> --- >> 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 4c25d9b2f138..fdb3a1c18cb6 100644 >> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c >> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c >> @@ -309,7 +309,8 @@ static struct ttm_tt *i915_ttm_tt_create(struct >> ttm_buffer_object *bo, >> page_flags |= TTM_TT_FLAG_ZERO_ALLOC; >> >> caching = i915_ttm_select_tt_caching(obj); >> - if (i915_gem_object_is_shrinkable(obj) && caching == >> ttm_cached) { >> + if (i915_gem_object_is_shrinkable(obj) && caching == >> ttm_cached && >> + !i915_gem_object_is_volatile(obj)) { >> page_flags |= TTM_TT_FLAG_EXTERNAL | >> TTM_TT_FLAG_EXTERNAL_MAPPABLE; >> i915_tt->is_shmem = true; > > While this is ok, I think it also needs adjustment in the i915_ttm > shrink callback. If someone creates a volatile smem object which then > hits the shrinker, I think we might hit asserts that it's a is_shem > ttm? > > In this case, the shrink callback should just i915_ttm_purge(). agreed. nice catch. I'll fix for v2 looks like we could maybe do with some extra shrinker testing too? looks like nothing caught this during CI testing > > /Thomas > >
next prev parent reply other threads:[~2022-05-23 15:54 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-03 19:13 [PATCH 0/4] ttm for internal Robert Beckett 2022-05-03 19:13 ` [Intel-gfx] " Robert Beckett 2022-05-03 19:13 ` [PATCH 1/4] drm/i915: add gen6 ppgtt dummy creation function Robert Beckett 2022-05-03 19:13 ` [Intel-gfx] " Robert Beckett 2022-05-03 19:13 ` Robert Beckett 2022-05-11 10:13 ` Thomas Hellström 2022-05-11 10:13 ` [Intel-gfx] " Thomas Hellström 2022-05-23 15:52 ` Robert Beckett 2022-05-23 15:52 ` [Intel-gfx] " Robert Beckett 2022-05-03 19:13 ` [PATCH 2/4] drm/i915: setup ggtt scratch page after memory regions Robert Beckett 2022-05-03 19:13 ` [Intel-gfx] " Robert Beckett 2022-05-03 19:13 ` Robert Beckett 2022-05-11 11:24 ` Thomas Hellström 2022-05-11 11:24 ` [Intel-gfx] " Thomas Hellström 2022-05-03 19:13 ` [PATCH 3/4] drm/i915: allow volatile buffers to use ttm pool allocator Robert Beckett 2022-05-03 19:13 ` [Intel-gfx] " Robert Beckett 2022-05-03 19:13 ` Robert Beckett 2022-05-11 12:42 ` Thomas Hellström 2022-05-11 12:42 ` [Intel-gfx] " Thomas Hellström 2022-05-23 15:53 ` Robert Beckett [this message] 2022-05-23 15:53 ` Robert Beckett 2022-05-03 19:13 ` [PATCH 4/4] drm/i915: internal buffers use ttm backend Robert Beckett 2022-05-03 19:13 ` [Intel-gfx] " Robert Beckett 2022-05-03 19:13 ` Robert Beckett 2022-05-11 14:14 ` Thomas Hellström 2022-05-11 14:14 ` [Intel-gfx] " Thomas Hellström 2022-05-23 15:52 ` Robert Beckett 2022-05-23 15:52 ` [Intel-gfx] " Robert Beckett 2022-05-03 19:52 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for ttm for internal Patchwork 2022-05-06 3:44 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for ttm for internal (rev2) Patchwork 2022-05-10 21:26 ` [Intel-gfx] ✓ Fi.CI.BAT: success for ttm for internal (rev3) Patchwork 2022-05-11 2:28 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
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=f42a3dc9-2a6f-2467-b2ff-b6487669ae48@collabora.com \ --to=bob.beckett@collabora.com \ --cc=airlied@linux.ie \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@linux.intel.com \ --cc=joonas.lahtinen@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=matthew.auld@intel.com \ --cc=rodrigo.vivi@intel.com \ --cc=thomas.hellstrom@linux.intel.com \ --cc=tvrtko.ursulin@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.