From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> Subject: [PATCH v6 05/15] drm/i915/ttm: Embed a ttm buffer object in the i915 gem object Date: Fri, 28 May 2021 12:57:34 +0200 [thread overview] Message-ID: <20210528105744.58271-6-thomas.hellstrom@linux.intel.com> (raw) In-Reply-To: <20210528105744.58271-1-thomas.hellstrom@linux.intel.com> Embed a struct ttm_buffer_object into the i915 gem object, making sure we alias the gem object part. It's a bit unfortunate that the struct ttm_buffer_ojbect embeds a gem object since we otherwise could make the TTM part private to the TTM backend, and use the usual i915 gem object for the other backends. To make this a bit more storage efficient for the other backends, we'd have to use a pointer for the gem object which would require a lot of changes in the driver. We postpone that for later. Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_object.c | 7 +++++++ drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 12 +++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c index 2be6109d0093..5706d471692d 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c @@ -62,6 +62,13 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj, const struct drm_i915_gem_object_ops *ops, struct lock_class_key *key, unsigned flags) { + /* + * A gem object is embedded both in a struct ttm_buffer_object :/ and + * in a drm_i915_gem_object. Make sure they are aliased. + */ + BUILD_BUG_ON(offsetof(typeof(*obj), base) != + offsetof(typeof(*obj), __do_not_access.base)); + spin_lock_init(&obj->vma.lock); INIT_LIST_HEAD(&obj->vma.list); diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h index f5b46d11e6e6..d047ea126029 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h @@ -10,6 +10,7 @@ #include <linux/mmu_notifier.h> #include <drm/drm_gem.h> +#include <drm/ttm/ttm_bo_api.h> #include <uapi/drm/i915_drm.h> #include "i915_active.h" @@ -99,7 +100,16 @@ struct i915_gem_object_page_iter { }; struct drm_i915_gem_object { - struct drm_gem_object base; + /* + * We might have reason to revisit the below since it wastes + * a lot of space for non-ttm gem objects. + * In any case, always use the accessors for the ttm_buffer_object + * when accessing it. + */ + union { + struct drm_gem_object base; + struct ttm_buffer_object __do_not_access; + }; const struct drm_i915_gem_object_ops *ops; -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> Subject: [Intel-gfx] [PATCH v6 05/15] drm/i915/ttm: Embed a ttm buffer object in the i915 gem object Date: Fri, 28 May 2021 12:57:34 +0200 [thread overview] Message-ID: <20210528105744.58271-6-thomas.hellstrom@linux.intel.com> (raw) In-Reply-To: <20210528105744.58271-1-thomas.hellstrom@linux.intel.com> Embed a struct ttm_buffer_object into the i915 gem object, making sure we alias the gem object part. It's a bit unfortunate that the struct ttm_buffer_ojbect embeds a gem object since we otherwise could make the TTM part private to the TTM backend, and use the usual i915 gem object for the other backends. To make this a bit more storage efficient for the other backends, we'd have to use a pointer for the gem object which would require a lot of changes in the driver. We postpone that for later. Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_object.c | 7 +++++++ drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 12 +++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c index 2be6109d0093..5706d471692d 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c @@ -62,6 +62,13 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj, const struct drm_i915_gem_object_ops *ops, struct lock_class_key *key, unsigned flags) { + /* + * A gem object is embedded both in a struct ttm_buffer_object :/ and + * in a drm_i915_gem_object. Make sure they are aliased. + */ + BUILD_BUG_ON(offsetof(typeof(*obj), base) != + offsetof(typeof(*obj), __do_not_access.base)); + spin_lock_init(&obj->vma.lock); INIT_LIST_HEAD(&obj->vma.list); diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h index f5b46d11e6e6..d047ea126029 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h @@ -10,6 +10,7 @@ #include <linux/mmu_notifier.h> #include <drm/drm_gem.h> +#include <drm/ttm/ttm_bo_api.h> #include <uapi/drm/i915_drm.h> #include "i915_active.h" @@ -99,7 +100,16 @@ struct i915_gem_object_page_iter { }; struct drm_i915_gem_object { - struct drm_gem_object base; + /* + * We might have reason to revisit the below since it wastes + * a lot of space for non-ttm gem objects. + * In any case, always use the accessors for the ttm_buffer_object + * when accessing it. + */ + union { + struct drm_gem_object base; + struct ttm_buffer_object __do_not_access; + }; const struct drm_i915_gem_object_ops *ops; -- 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-05-28 10:58 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-28 10:57 [PATCH v6 00/15] Move LMEM (VRAM) management over to TTM Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 10:57 ` [PATCH v6 01/15] drm/i915: Untangle the vma pages_mutex Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 10:57 ` [PATCH v6 02/15] drm/i915: Don't free shared locks while shared Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 10:57 ` [PATCH v6 03/15] drm/i915: Fix i915_sg_page_sizes to record dma segments rather than physical pages Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 10:57 ` [PATCH v6 04/15] drm/i915/ttm Initialize the ttm device and memory managers Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 10:57 ` Thomas Hellström [this message] 2021-05-28 10:57 ` [Intel-gfx] [PATCH v6 05/15] drm/i915/ttm: Embed a ttm buffer object in the i915 gem object Thomas Hellström 2021-05-28 10:57 ` [PATCH v6 06/15] drm/ttm: Add a generic TTM memcpy move for page-based iomem Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 10:57 ` [PATCH v6 07/15] drm: Add a prefetching memcpy_from_wc Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-29 19:49 ` kernel test robot 2021-05-29 21:54 ` kernel test robot 2021-05-28 10:57 ` [PATCH v6 08/15] drm/ttm: Use drm_memcpy_from_wc for TTM bo moves Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 10:57 ` [PATCH v6 09/15] drm/ttm: Document and optimize ttm_bo_pipeline_gutting() Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 10:57 ` [PATCH v6 10/15] drm/ttm, drm/amdgpu: Allow the driver some control over swapping Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 10:57 ` [PATCH v6 11/15] drm/i915/ttm: Introduce a TTM i915 gem object backend Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 10:57 ` [PATCH v6 12/15] drm/i915/lmem: Verify checks for lmem residency Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 10:57 ` [PATCH v6 13/15] drm/i915: Disable mmap ioctl for gen12+ Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 10:57 ` [PATCH v6 14/15] drm/vma: Add a driver_private member to vma_node Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 10:57 ` [PATCH v6 15/15] drm/i915: Use ttm mmap handling for ttm bo's Thomas Hellström 2021-05-28 10:57 ` [Intel-gfx] " Thomas Hellström 2021-05-28 17:10 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Move LMEM (VRAM) management over to TTM (rev2) Patchwork 2021-05-28 17:12 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-05-28 17:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-05-29 5:43 ` [Intel-gfx] ✗ Fi.CI.IGT: 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=20210528105744.58271-6-thomas.hellstrom@linux.intel.com \ --to=thomas.hellstrom@linux.intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /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.