From: "Ruhl, Michael J" <michael.j.ruhl@intel.com> To: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>, "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org> Cc: "Auld, Matthew" <matthew.auld@intel.com> Subject: RE: [PATCH v3 5/5] drm/i915/gem: Migrate to system at dma-buf map time Date: Mon, 28 Jun 2021 19:45:35 +0000 [thread overview] Message-ID: <1e17b84df802428197e348afa460cdb7@intel.com> (raw) In-Reply-To: <20210628144626.76126-6-thomas.hellstrom@linux.intel.com> >-----Original Message----- >From: dri-devel <dri-devel-bounces@lists.freedesktop.org> On Behalf Of >Thomas Hellström >Sent: Monday, June 28, 2021 10:46 AM >To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org >Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>; Auld, Matthew ><matthew.auld@intel.com> >Subject: [PATCH v3 5/5] drm/i915/gem: Migrate to system at dma-buf map >time > >Until we support p2p dma or as a complement to that, migrate data >to system memory at dma-buf map time if possible. > >v2: >- Rebase on dynamic exporter. Update the igt_dmabuf_import_same_driver > selftest to migrate if we are LMEM capable. > >Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> >--- > drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 7 ++++++- > drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 4 +++- > 2 files changed, 9 insertions(+), 2 deletions(-) > >diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >index 1d1eeb167d28..5207aa3af009 100644 >--- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >+++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >@@ -29,7 +29,12 @@ static struct sg_table *i915_gem_map_dma_buf(struct >dma_buf_attachment *attachme > > assert_object_held(obj); > >- ret = i915_gem_object_pin_pages(obj); >+ if (!i915_gem_object_can_migrate(obj, INTEL_REGION_SMEM)) >+ return ERR_PTR(-EOPNOTSUPP); >+ >+ ret = i915_gem_object_migrate(obj, NULL, INTEL_REGION_SMEM); >+ if (!ret) >+ ret = i915_gem_object_pin_pages(obj); > if (ret) > goto err; With the caveats of the previous patches this looks good. Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com> Mike >diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c >b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c >index 24735d6c12a2..b6278dba98d0 100644 >--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c >+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c >@@ -94,7 +94,9 @@ static int igt_dmabuf_import_same_driver(void *arg) > int err; > > force_different_devices = true; >- obj = i915_gem_object_create_shmem(i915, PAGE_SIZE); >+ obj = i915_gem_object_create_lmem(i915, PAGE_SIZE, 0); >+ if (IS_ERR(obj)) >+ obj = i915_gem_object_create_shmem(i915, PAGE_SIZE); > if (IS_ERR(obj)) > goto out_ret; > >-- >2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: "Ruhl, Michael J" <michael.j.ruhl@intel.com> To: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>, "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org> Cc: "Auld, Matthew" <matthew.auld@intel.com> Subject: Re: [Intel-gfx] [PATCH v3 5/5] drm/i915/gem: Migrate to system at dma-buf map time Date: Mon, 28 Jun 2021 19:45:35 +0000 [thread overview] Message-ID: <1e17b84df802428197e348afa460cdb7@intel.com> (raw) In-Reply-To: <20210628144626.76126-6-thomas.hellstrom@linux.intel.com> >-----Original Message----- >From: dri-devel <dri-devel-bounces@lists.freedesktop.org> On Behalf Of >Thomas Hellström >Sent: Monday, June 28, 2021 10:46 AM >To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org >Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>; Auld, Matthew ><matthew.auld@intel.com> >Subject: [PATCH v3 5/5] drm/i915/gem: Migrate to system at dma-buf map >time > >Until we support p2p dma or as a complement to that, migrate data >to system memory at dma-buf map time if possible. > >v2: >- Rebase on dynamic exporter. Update the igt_dmabuf_import_same_driver > selftest to migrate if we are LMEM capable. > >Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> >--- > drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 7 ++++++- > drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 4 +++- > 2 files changed, 9 insertions(+), 2 deletions(-) > >diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >index 1d1eeb167d28..5207aa3af009 100644 >--- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >+++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >@@ -29,7 +29,12 @@ static struct sg_table *i915_gem_map_dma_buf(struct >dma_buf_attachment *attachme > > assert_object_held(obj); > >- ret = i915_gem_object_pin_pages(obj); >+ if (!i915_gem_object_can_migrate(obj, INTEL_REGION_SMEM)) >+ return ERR_PTR(-EOPNOTSUPP); >+ >+ ret = i915_gem_object_migrate(obj, NULL, INTEL_REGION_SMEM); >+ if (!ret) >+ ret = i915_gem_object_pin_pages(obj); > if (ret) > goto err; With the caveats of the previous patches this looks good. Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com> Mike >diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c >b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c >index 24735d6c12a2..b6278dba98d0 100644 >--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c >+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c >@@ -94,7 +94,9 @@ static int igt_dmabuf_import_same_driver(void *arg) > int err; > > force_different_devices = true; >- obj = i915_gem_object_create_shmem(i915, PAGE_SIZE); >+ obj = i915_gem_object_create_lmem(i915, PAGE_SIZE, 0); >+ if (IS_ERR(obj)) >+ obj = i915_gem_object_create_shmem(i915, PAGE_SIZE); > if (IS_ERR(obj)) > goto out_ret; > >-- >2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-06-28 19:45 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-28 14:46 [PATCH v3 0/5] drm/i915/gem: Introduce a migrate interface Thomas Hellström 2021-06-28 14:46 ` [Intel-gfx] " Thomas Hellström 2021-06-28 14:46 ` [PATCH v3 1/5] drm/i915/gem: Implement object migration Thomas Hellström 2021-06-28 14:46 ` [Intel-gfx] " Thomas Hellström 2021-06-28 16:28 ` Matthew Auld 2021-06-28 16:28 ` [Intel-gfx] " Matthew Auld 2021-06-28 17:34 ` Thomas Hellström 2021-06-28 17:34 ` [Intel-gfx] " Thomas Hellström 2021-06-28 18:11 ` Ruhl, Michael J 2021-06-28 18:11 ` [Intel-gfx] " Ruhl, Michael J 2021-06-28 19:02 ` Thomas Hellström 2021-06-28 19:02 ` [Intel-gfx] " Thomas Hellström 2021-06-28 19:50 ` Ruhl, Michael J 2021-06-28 19:50 ` [Intel-gfx] " Ruhl, Michael J 2021-06-28 19:54 ` Thomas Hellström 2021-06-28 19:54 ` [Intel-gfx] " Thomas Hellström 2021-06-28 20:13 ` Ruhl, Michael J 2021-06-28 20:13 ` [Intel-gfx] " Ruhl, Michael J 2021-06-29 8:47 ` Daniel Vetter 2021-06-29 8:47 ` Daniel Vetter 2021-06-28 14:46 ` [PATCH v3 2/5] drm/i915/gem: Introduce a selftest for the gem object migrate functionality Thomas Hellström 2021-06-28 14:46 ` [Intel-gfx] " Thomas Hellström 2021-06-28 15:51 ` Matthew Auld 2021-06-28 15:51 ` [Intel-gfx] " Matthew Auld 2021-06-28 18:53 ` Ruhl, Michael J 2021-06-28 18:53 ` Ruhl, Michael J 2021-06-28 19:14 ` Thomas Hellström 2021-06-28 19:14 ` Thomas Hellström 2021-06-28 19:27 ` Ruhl, Michael J 2021-06-28 19:27 ` Ruhl, Michael J 2021-06-28 19:32 ` Thomas Hellström 2021-06-28 19:32 ` Thomas Hellström 2021-06-28 14:46 ` [PATCH v3 3/5] drm/i915/display: Migrate objects to LMEM if possible for display Thomas Hellström 2021-06-28 14:46 ` [Intel-gfx] " Thomas Hellström 2021-06-28 15:20 ` Matthew Auld 2021-06-28 15:20 ` [Intel-gfx] " Matthew Auld 2021-06-28 14:46 ` [PATCH v3 4/5] drm/i915/gem: Fix same-driver-another-instance dma-buf export Thomas Hellström 2021-06-28 14:46 ` [Intel-gfx] " Thomas Hellström 2021-06-28 19:45 ` Ruhl, Michael J 2021-06-28 19:45 ` [Intel-gfx] " Ruhl, Michael J 2021-06-29 8:43 ` Daniel Vetter 2021-06-29 8:43 ` [Intel-gfx] " Daniel Vetter 2021-06-29 9:36 ` Thomas Hellström 2021-06-29 9:36 ` [Intel-gfx] " Thomas Hellström 2021-06-28 14:46 ` [PATCH v3 5/5] drm/i915/gem: Migrate to system at dma-buf map time Thomas Hellström 2021-06-28 14:46 ` [Intel-gfx] " Thomas Hellström 2021-06-28 19:45 ` Ruhl, Michael J [this message] 2021-06-28 19:45 ` Ruhl, Michael J 2021-06-28 19:51 ` Thomas Hellström 2021-06-28 19:51 ` [Intel-gfx] " Thomas Hellström 2021-06-28 16:57 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gem: Introduce a migrate interface (rev3) Patchwork 2021-06-28 16:58 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-06-28 17:27 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-06-28 20:57 ` [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=1e17b84df802428197e348afa460cdb7@intel.com \ --to=michael.j.ruhl@intel.com \ --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: 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.