From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> To: Robert Beckett <bob.beckett@collabora.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 v2 3/5] drm/i915: ttm move/clear logic fix Date: Thu, 14 Apr 2022 16:00:06 +0200 [thread overview] Message-ID: <8f25394fb9fa71eeec2f6184ea854a391b415d22.camel@linux.intel.com> (raw) In-Reply-To: <20220412151838.1298956-4-bob.beckett@collabora.com> On Tue, 2022-04-12 at 15:18 +0000, Robert Beckett wrote: > ttm managed buffers start off with system resource definitions and > ttm_tt > tracking structures allocated (though unpopulated). > currently this prevents clearing of buffers on first move to desired > placements. > > The desired behaviour is to clear user allocated buffers and any > kernel > buffers that specifically requests it only. > Make the logic match the desired behaviour. > > Signed-off-by: Robert Beckett <bob.beckett@collabora.com> Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> > --- > drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 22 > +++++++++++++++++++- > 1 file changed, 21 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c > b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c > index 9fe8132de3b2..9cf85f91edb5 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c > @@ -3,6 +3,7 @@ > * Copyright © 2021 Intel Corporation > */ > > +#include "drm/ttm/ttm_tt.h" > #include <drm/ttm/ttm_bo_driver.h> > > #include "i915_deps.h" > @@ -470,6 +471,25 @@ __i915_ttm_move(struct ttm_buffer_object *bo, > return fence; > } > > +static bool > +allow_clear(struct drm_i915_gem_object *obj, struct ttm_tt *ttm, > struct ttm_resource *dst_mem) > +{ > + /* never clear stolen */ > + if (dst_mem->mem_type == I915_PL_STOLEN) > + return false; > + /* > + * we want to clear user buffers and any kernel buffers > + * that specifically request clearing. > + */ > + if (obj->flags & I915_BO_ALLOC_USER) > + return true; > + > + if (ttm && ttm->page_flags & TTM_TT_FLAG_ZERO_ALLOC) > + return true; > + > + return false; > +} > + > /** > * i915_ttm_move - The TTM move callback used by i915. > * @bo: The buffer object. > @@ -520,7 +540,7 @@ int i915_ttm_move(struct ttm_buffer_object *bo, > bool evict, > return PTR_ERR(dst_rsgt); > > clear = !i915_ttm_cpu_maps_iomem(bo->resource) && (!ttm || > !ttm_tt_is_populated(ttm)); > - if (!(clear && ttm && !(ttm->page_flags & > TTM_TT_FLAG_ZERO_ALLOC))) { > + if (!clear || allow_clear(obj, ttm, dst_mem)) { > struct i915_deps deps; > > i915_deps_init(&deps, GFP_KERNEL | __GFP_NORETRY | > __GFP_NOWARN);
WARNING: multiple messages have this Message-ID (diff)
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> To: Robert Beckett <bob.beckett@collabora.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 v2 3/5] drm/i915: ttm move/clear logic fix Date: Thu, 14 Apr 2022 16:00:06 +0200 [thread overview] Message-ID: <8f25394fb9fa71eeec2f6184ea854a391b415d22.camel@linux.intel.com> (raw) In-Reply-To: <20220412151838.1298956-4-bob.beckett@collabora.com> On Tue, 2022-04-12 at 15:18 +0000, Robert Beckett wrote: > ttm managed buffers start off with system resource definitions and > ttm_tt > tracking structures allocated (though unpopulated). > currently this prevents clearing of buffers on first move to desired > placements. > > The desired behaviour is to clear user allocated buffers and any > kernel > buffers that specifically requests it only. > Make the logic match the desired behaviour. > > Signed-off-by: Robert Beckett <bob.beckett@collabora.com> Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> > --- > drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 22 > +++++++++++++++++++- > 1 file changed, 21 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c > b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c > index 9fe8132de3b2..9cf85f91edb5 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c > @@ -3,6 +3,7 @@ > * Copyright © 2021 Intel Corporation > */ > > +#include "drm/ttm/ttm_tt.h" > #include <drm/ttm/ttm_bo_driver.h> > > #include "i915_deps.h" > @@ -470,6 +471,25 @@ __i915_ttm_move(struct ttm_buffer_object *bo, > return fence; > } > > +static bool > +allow_clear(struct drm_i915_gem_object *obj, struct ttm_tt *ttm, > struct ttm_resource *dst_mem) > +{ > + /* never clear stolen */ > + if (dst_mem->mem_type == I915_PL_STOLEN) > + return false; > + /* > + * we want to clear user buffers and any kernel buffers > + * that specifically request clearing. > + */ > + if (obj->flags & I915_BO_ALLOC_USER) > + return true; > + > + if (ttm && ttm->page_flags & TTM_TT_FLAG_ZERO_ALLOC) > + return true; > + > + return false; > +} > + > /** > * i915_ttm_move - The TTM move callback used by i915. > * @bo: The buffer object. > @@ -520,7 +540,7 @@ int i915_ttm_move(struct ttm_buffer_object *bo, > bool evict, > return PTR_ERR(dst_rsgt); > > clear = !i915_ttm_cpu_maps_iomem(bo->resource) && (!ttm || > !ttm_tt_is_populated(ttm)); > - if (!(clear && ttm && !(ttm->page_flags & > TTM_TT_FLAG_ZERO_ALLOC))) { > + if (!clear || allow_clear(obj, ttm, dst_mem)) { > struct i915_deps deps; > > i915_deps_init(&deps, GFP_KERNEL | __GFP_NORETRY | > __GFP_NOWARN);
next prev parent reply other threads:[~2022-04-14 15:24 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-12 15:18 [PATCH v2 0/5] drm/i915: ttm for stolen region Robert Beckett 2022-04-12 15:18 ` [Intel-gfx] " Robert Beckett 2022-04-12 15:18 ` [PATCH v2 1/5] drm/i915: instantiate ttm ranger manager for stolen memory Robert Beckett 2022-04-12 15:18 ` [Intel-gfx] " Robert Beckett 2022-04-12 15:18 ` Robert Beckett 2022-04-12 15:18 ` [PATCH v2 2/5] drm/i915: sanitize mem_flags for stolen buffers Robert Beckett 2022-04-12 15:18 ` [Intel-gfx] " Robert Beckett 2022-04-12 15:18 ` Robert Beckett 2022-04-14 13:58 ` Thomas Hellström 2022-04-14 13:58 ` [Intel-gfx] " Thomas Hellström 2022-04-12 15:18 ` [PATCH v2 3/5] drm/i915: ttm move/clear logic fix Robert Beckett 2022-04-12 15:18 ` [Intel-gfx] " Robert Beckett 2022-04-12 15:18 ` Robert Beckett 2022-04-14 14:00 ` Thomas Hellström [this message] 2022-04-14 14:00 ` [Intel-gfx] " Thomas Hellström 2022-04-12 15:18 ` [PATCH v2 4/5] drm/i915: ttm backend dont provide mmap_offset for kernel buffers Robert Beckett 2022-04-12 15:18 ` [Intel-gfx] " Robert Beckett 2022-04-12 15:18 ` Robert Beckett 2022-04-14 14:05 ` Thomas Hellström 2022-04-14 14:05 ` [Intel-gfx] " Thomas Hellström 2022-04-14 16:13 ` Robert Beckett 2022-04-14 16:13 ` [Intel-gfx] " Robert Beckett 2022-04-27 10:14 ` Thomas Hellström 2022-04-27 10:14 ` [Intel-gfx] " Thomas Hellström 2022-04-12 15:18 ` [PATCH v2 5/5] drm/i915: stolen memory use ttm backend Robert Beckett 2022-04-12 15:18 ` [Intel-gfx] " Robert Beckett 2022-04-12 15:18 ` Robert Beckett 2022-04-12 15:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: ttm for stolen region (rev2) Patchwork 2022-04-12 15:48 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " 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=8f25394fb9fa71eeec2f6184ea854a391b415d22.camel@linux.intel.com \ --to=thomas.hellstrom@linux.intel.com \ --cc=airlied@linux.ie \ --cc=bob.beckett@collabora.com \ --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=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.