From: Jason Ekstrand <jason@jlekstrand.net> To: Matthew Auld <matthew.william.auld@gmail.com> Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>, ML dri-devel <dri-devel@lists.freedesktop.org> Subject: Re: [PATCH 3/7] drm/i915/gem: Unify user object creation Date: Fri, 16 Jul 2021 09:02:22 -0500 [thread overview] Message-ID: <CAOFGe97h+XsCD4-tVGoZr7D6Nmi-VUmfrTMr41Wj3XfQBar7BA@mail.gmail.com> (raw) In-Reply-To: <CAM0jSHMU82eH15qC_dpYRkMm9dh+KRrCaJh6Y07nG+==6S4AQA@mail.gmail.com> On Fri, Jul 16, 2021 at 6:21 AM Matthew Auld <matthew.william.auld@gmail.com> wrote: > > On Thu, 15 Jul 2021 at 23:39, Jason Ekstrand <jason@jlekstrand.net> wrote: > > > > Instead of hand-rolling the same three calls in each function, pull them > > into an i915_gem_object_create_user helper. Apart from re-ordering of > > the placements array ENOMEM check, the only functional change here > > should be that i915_gem_dumb_create now calls i915_gem_flush_free_objects > > which it probably should have been calling all along. > > > > Signed-off-by: Jason Ekstrand <jason@jlekstrand.net> > > --- > > drivers/gpu/drm/i915/gem/i915_gem_create.c | 106 +++++++++------------ > > 1 file changed, 43 insertions(+), 63 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_create.c b/drivers/gpu/drm/i915/gem/i915_gem_create.c > > index 391c8c4a12172..69bf9ec777642 100644 > > --- a/drivers/gpu/drm/i915/gem/i915_gem_create.c > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_create.c > > @@ -11,13 +11,14 @@ > > #include "i915_trace.h" > > #include "i915_user_extensions.h" > > > > -static u32 object_max_page_size(struct drm_i915_gem_object *obj) > > +static u32 object_max_page_size(struct intel_memory_region **placements, > > + unsigned int n_placements) > > { > > u32 max_page_size = 0; > > int i; > > > > - for (i = 0; i < obj->mm.n_placements; i++) { > > - struct intel_memory_region *mr = obj->mm.placements[i]; > > + for (i = 0; i < n_placements; i++) { > > + struct intel_memory_region *mr = placements[i]; > > > > GEM_BUG_ON(!is_power_of_2(mr->min_page_size)); > > max_page_size = max_t(u32, max_page_size, mr->min_page_size); > > @@ -81,22 +82,35 @@ static int i915_gem_publish(struct drm_i915_gem_object *obj, > > return 0; > > } > > > > -static int > > -i915_gem_setup(struct drm_i915_gem_object *obj, u64 size) > > +static struct drm_i915_gem_object * > > +i915_gem_object_create_user(struct drm_i915_private *i915, u64 size, > > create_user sounds nice. > > > + struct intel_memory_region **placements, > > + unsigned int n_placements) > > { > > - struct intel_memory_region *mr = obj->mm.placements[0]; > > + struct intel_memory_region *mr = placements[0]; > > + struct drm_i915_gem_object *obj; > > unsigned int flags; > > int ret; > > > > - size = round_up(size, object_max_page_size(obj)); > > + i915_gem_flush_free_objects(i915); > > Needs to be a separate patch. Done. > > + > > + obj = i915_gem_object_alloc(); > > + if (!obj) > > + return ERR_PTR(-ENOMEM); > > Should move this way down, so we don't accidently leak it. Done. --Jason
WARNING: multiple messages have this Message-ID (diff)
From: Jason Ekstrand <jason@jlekstrand.net> To: Matthew Auld <matthew.william.auld@gmail.com> Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>, ML dri-devel <dri-devel@lists.freedesktop.org> Subject: Re: [Intel-gfx] [PATCH 3/7] drm/i915/gem: Unify user object creation Date: Fri, 16 Jul 2021 09:02:22 -0500 [thread overview] Message-ID: <CAOFGe97h+XsCD4-tVGoZr7D6Nmi-VUmfrTMr41Wj3XfQBar7BA@mail.gmail.com> (raw) In-Reply-To: <CAM0jSHMU82eH15qC_dpYRkMm9dh+KRrCaJh6Y07nG+==6S4AQA@mail.gmail.com> On Fri, Jul 16, 2021 at 6:21 AM Matthew Auld <matthew.william.auld@gmail.com> wrote: > > On Thu, 15 Jul 2021 at 23:39, Jason Ekstrand <jason@jlekstrand.net> wrote: > > > > Instead of hand-rolling the same three calls in each function, pull them > > into an i915_gem_object_create_user helper. Apart from re-ordering of > > the placements array ENOMEM check, the only functional change here > > should be that i915_gem_dumb_create now calls i915_gem_flush_free_objects > > which it probably should have been calling all along. > > > > Signed-off-by: Jason Ekstrand <jason@jlekstrand.net> > > --- > > drivers/gpu/drm/i915/gem/i915_gem_create.c | 106 +++++++++------------ > > 1 file changed, 43 insertions(+), 63 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_create.c b/drivers/gpu/drm/i915/gem/i915_gem_create.c > > index 391c8c4a12172..69bf9ec777642 100644 > > --- a/drivers/gpu/drm/i915/gem/i915_gem_create.c > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_create.c > > @@ -11,13 +11,14 @@ > > #include "i915_trace.h" > > #include "i915_user_extensions.h" > > > > -static u32 object_max_page_size(struct drm_i915_gem_object *obj) > > +static u32 object_max_page_size(struct intel_memory_region **placements, > > + unsigned int n_placements) > > { > > u32 max_page_size = 0; > > int i; > > > > - for (i = 0; i < obj->mm.n_placements; i++) { > > - struct intel_memory_region *mr = obj->mm.placements[i]; > > + for (i = 0; i < n_placements; i++) { > > + struct intel_memory_region *mr = placements[i]; > > > > GEM_BUG_ON(!is_power_of_2(mr->min_page_size)); > > max_page_size = max_t(u32, max_page_size, mr->min_page_size); > > @@ -81,22 +82,35 @@ static int i915_gem_publish(struct drm_i915_gem_object *obj, > > return 0; > > } > > > > -static int > > -i915_gem_setup(struct drm_i915_gem_object *obj, u64 size) > > +static struct drm_i915_gem_object * > > +i915_gem_object_create_user(struct drm_i915_private *i915, u64 size, > > create_user sounds nice. > > > + struct intel_memory_region **placements, > > + unsigned int n_placements) > > { > > - struct intel_memory_region *mr = obj->mm.placements[0]; > > + struct intel_memory_region *mr = placements[0]; > > + struct drm_i915_gem_object *obj; > > unsigned int flags; > > int ret; > > > > - size = round_up(size, object_max_page_size(obj)); > > + i915_gem_flush_free_objects(i915); > > Needs to be a separate patch. Done. > > + > > + obj = i915_gem_object_alloc(); > > + if (!obj) > > + return ERR_PTR(-ENOMEM); > > Should move this way down, so we don't accidently leak it. Done. --Jason _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-07-16 14:02 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 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 ` [Intel-gfx] " Jason Ekstrand 2021-07-15 22:38 ` [PATCH 1/7] drm/i915/gem: Check object_can_migrate from object_migrate Jason Ekstrand 2021-07-15 22:38 ` [Intel-gfx] " Jason Ekstrand 2021-07-15 22:38 ` [PATCH 2/7] drm/i915/gem: Refactor placement setup for i915_gem_object_create* Jason Ekstrand 2021-07-15 22:38 ` [Intel-gfx] " Jason Ekstrand 2021-07-16 11:12 ` Matthew Auld 2021-07-16 11:12 ` Matthew Auld 2021-07-16 13:52 ` Jason Ekstrand 2021-07-16 13:52 ` Jason Ekstrand 2021-07-15 22:38 ` [PATCH 3/7] drm/i915/gem: Unify user object creation Jason Ekstrand 2021-07-15 22:38 ` [Intel-gfx] " Jason Ekstrand 2021-07-16 11:20 ` Matthew Auld 2021-07-16 11:20 ` [Intel-gfx] " Matthew Auld 2021-07-16 14:02 ` Jason Ekstrand [this message] 2021-07-16 14:02 ` Jason Ekstrand 2021-07-20 9:34 ` Matthew Auld 2021-07-20 9:34 ` [Intel-gfx] " Matthew Auld 2021-07-20 22:04 ` Jason Ekstrand 2021-07-20 22:04 ` [Intel-gfx] " Jason Ekstrand 2021-07-21 8:24 ` Matthew Auld 2021-07-21 8:24 ` [Intel-gfx] " Matthew Auld 2021-07-21 15:47 ` Jason Ekstrand 2021-07-21 15:47 ` [Intel-gfx] " Jason Ekstrand 2021-07-21 16:29 ` Matthew Auld 2021-07-21 16:29 ` [Intel-gfx] " Matthew Auld 2021-07-15 22:38 ` [PATCH 4/7] drm/i915/gem/ttm: Place new BOs in the requested region Jason Ekstrand 2021-07-15 22:38 ` [Intel-gfx] " Jason Ekstrand 2021-07-16 13:17 ` Matthew Auld 2021-07-16 13:17 ` [Intel-gfx] " Matthew Auld 2021-07-16 13:46 ` Jason Ekstrand 2021-07-16 13:46 ` [Intel-gfx] " Jason Ekstrand 2021-08-04 6:49 ` Thomas Hellström 2021-08-04 6:49 ` [Intel-gfx] " Thomas Hellström 2021-08-04 6:52 ` Thomas Hellström 2021-08-04 6:52 ` [Intel-gfx] " Thomas Hellström 2021-07-15 22:38 ` [PATCH 5/7] drm/i915/gem/ttm: Respect the objection region in placement_from_obj Jason Ekstrand 2021-07-15 22:38 ` [Intel-gfx] " Jason Ekstrand 2021-07-16 13:54 ` Matthew Auld 2021-07-16 13:54 ` [Intel-gfx] " Matthew Auld 2021-07-16 14:10 ` Jason Ekstrand 2021-07-16 14:10 ` [Intel-gfx] " Jason Ekstrand 2021-07-16 15:52 ` Matthew Auld 2021-07-16 15:52 ` [Intel-gfx] " Matthew Auld 2021-07-16 16:00 ` Matthew Auld 2021-07-16 16:00 ` [Intel-gfx] " Matthew Auld 2021-07-16 17:38 ` Jason Ekstrand 2021-07-16 17:38 ` [Intel-gfx] " Jason Ekstrand 2021-07-16 18:44 ` Matthew Auld 2021-07-16 18:44 ` [Intel-gfx] " Matthew Auld 2021-07-16 19:49 ` Jason Ekstrand 2021-07-16 19:49 ` [Intel-gfx] " Jason Ekstrand 2021-07-19 13:34 ` Matthew Auld 2021-07-19 13:34 ` [Intel-gfx] " Matthew Auld 2021-07-21 20:11 ` Jason Ekstrand 2021-07-21 20:11 ` [Intel-gfx] " Jason Ekstrand 2021-07-21 20:32 ` Daniel Vetter 2021-07-21 20:32 ` Daniel Vetter 2021-07-22 9:49 ` Matthew Auld 2021-07-22 9:49 ` [Intel-gfx] " Matthew Auld 2021-07-22 9:59 ` Matthew Auld 2021-07-22 9:59 ` [Intel-gfx] " Matthew Auld 2021-08-04 8:00 ` Thomas Hellström 2021-08-04 8:00 ` [Intel-gfx] " Thomas Hellström 2021-08-04 14:35 ` Daniel Vetter 2021-08-04 14:35 ` [Intel-gfx] " Daniel Vetter 2021-07-15 22:38 ` [PATCH 6/7] drm/i915/gem: Correct the locking and pin pattern for dma-buf (v6) Jason Ekstrand 2021-07-15 22:38 ` [Intel-gfx] " Jason Ekstrand 2021-07-15 22:39 ` [PATCH 7/7] drm/i915/gem: Migrate to system at dma-buf attach time (v6) Jason Ekstrand 2021-07-15 22:39 ` [Intel-gfx] " Jason Ekstrand
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=CAOFGe97h+XsCD4-tVGoZr7D6Nmi-VUmfrTMr41Wj3XfQBar7BA@mail.gmail.com \ --to=jason@jlekstrand.net \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=matthew.william.auld@gmail.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.