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 v4 14/15] drm/vma: Add a driver_private member to vma_node. Date: Wed, 26 May 2021 13:32:58 +0200 [thread overview] Message-ID: <20210526113259.1661914-15-thomas.hellstrom@linux.intel.com> (raw) In-Reply-To: <20210526113259.1661914-1-thomas.hellstrom@linux.intel.com> From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> This allows drivers to distinguish between different types of vma_node's. The readonly flag was unused and is thus removed. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> --- drivers/gpu/drm/drm_gem.c | 9 --------- include/drm/drm_vma_manager.h | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 9989425e9875..e710e79069f6 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1149,15 +1149,6 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) return -EACCES; } - if (node->readonly) { - if (vma->vm_flags & VM_WRITE) { - drm_gem_object_put(obj); - return -EINVAL; - } - - vma->vm_flags &= ~VM_MAYWRITE; - } - ret = drm_gem_mmap_obj(obj, drm_vma_node_size(node) << PAGE_SHIFT, vma); diff --git a/include/drm/drm_vma_manager.h b/include/drm/drm_vma_manager.h index 76ac5e97a559..4f8c35206f7c 100644 --- a/include/drm/drm_vma_manager.h +++ b/include/drm/drm_vma_manager.h @@ -53,7 +53,7 @@ struct drm_vma_offset_node { rwlock_t vm_lock; struct drm_mm_node vm_node; struct rb_root vm_files; - bool readonly:1; + void *driver_private; }; struct drm_vma_offset_manager { -- 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 v4 14/15] drm/vma: Add a driver_private member to vma_node. Date: Wed, 26 May 2021 13:32:58 +0200 [thread overview] Message-ID: <20210526113259.1661914-15-thomas.hellstrom@linux.intel.com> (raw) In-Reply-To: <20210526113259.1661914-1-thomas.hellstrom@linux.intel.com> From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> This allows drivers to distinguish between different types of vma_node's. The readonly flag was unused and is thus removed. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> --- drivers/gpu/drm/drm_gem.c | 9 --------- include/drm/drm_vma_manager.h | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 9989425e9875..e710e79069f6 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1149,15 +1149,6 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) return -EACCES; } - if (node->readonly) { - if (vma->vm_flags & VM_WRITE) { - drm_gem_object_put(obj); - return -EINVAL; - } - - vma->vm_flags &= ~VM_MAYWRITE; - } - ret = drm_gem_mmap_obj(obj, drm_vma_node_size(node) << PAGE_SHIFT, vma); diff --git a/include/drm/drm_vma_manager.h b/include/drm/drm_vma_manager.h index 76ac5e97a559..4f8c35206f7c 100644 --- a/include/drm/drm_vma_manager.h +++ b/include/drm/drm_vma_manager.h @@ -53,7 +53,7 @@ struct drm_vma_offset_node { rwlock_t vm_lock; struct drm_mm_node vm_node; struct rb_root vm_files; - bool readonly:1; + void *driver_private; }; struct drm_vma_offset_manager { -- 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-26 11:33 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-26 11:32 [PATCH v4 00/15] drm/i915: Move LMEM (VRAM) management over to TTM Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 11:32 ` [PATCH v4 01/15] drm/i915: Untangle the vma pages_mutex Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 11:32 ` [PATCH v4 02/15] drm/i915: Don't free shared locks while shared Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 11:32 ` [PATCH v4 03/15] drm/i915: Fix i915_sg_page_sizes to record dma segments rather than physical pages Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 11:32 ` [PATCH v4 04/15] drm/i915/ttm Initialize the ttm device and memory managers Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 11:32 ` [PATCH v4 05/15] drm/i915/ttm: Embed a ttm buffer object in the i915 gem object Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 11:32 ` [PATCH v4 06/15] drm/ttm: Add a generic TTM memcpy move for page-based iomem Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 11:32 ` [PATCH v4 07/15] drm, drm/i915: Move the memcpy_from_wc functionality to core drm Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 14:27 ` Christian König 2021-05-26 14:27 ` [Intel-gfx] " Christian König 2021-05-26 11:32 ` [PATCH v4 08/15] drm/ttm: Use drm_memcpy_from_wc_dbm for TTM bo moves Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 11:32 ` [PATCH v4 09/15] drm/ttm: Document and optimize ttm_bo_pipeline_gutting() Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 14:32 ` Christian König 2021-05-26 14:32 ` [Intel-gfx] " Christian König 2021-05-26 11:32 ` [PATCH v4 10/15] drm/ttm, drm/amdgpu: Allow the driver some control over swapping Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 13:26 ` Christian König 2021-05-26 13:26 ` [Intel-gfx] " Christian König 2021-05-27 7:33 ` Thomas Hellström (Intel) 2021-05-27 7:33 ` [Intel-gfx] " Thomas Hellström (Intel) 2021-05-27 12:36 ` Christian König 2021-05-27 12:36 ` [Intel-gfx] " Christian König 2021-05-27 13:52 ` Thomas Hellström 2021-05-27 13:52 ` [Intel-gfx] " Thomas Hellström 2021-05-27 14:21 ` Thomas Hellström 2021-05-27 14:21 ` [Intel-gfx] " Thomas Hellström 2021-05-26 11:32 ` [PATCH v4 11/15] drm/i915/ttm: Introduce a TTM i915 gem object backend Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 11:32 ` [PATCH v4 12/15] drm/i915/lmem: Verify checks for lmem residency Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 11:32 ` [PATCH v4 13/15] drm/i915: Disable mmap ioctl for gen12+ Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 17:28 ` Thomas Hellström (Intel) 2021-05-26 17:28 ` [Intel-gfx] " Thomas Hellström (Intel) 2021-05-26 11:32 ` Thomas Hellström [this message] 2021-05-26 11:32 ` [Intel-gfx] [PATCH v4 14/15] drm/vma: Add a driver_private member to vma_node Thomas Hellström 2021-05-27 8:16 ` Thomas Hellström (Intel) 2021-05-27 8:16 ` [Intel-gfx] " Thomas Hellström (Intel) 2021-05-26 11:32 ` [PATCH v4 15/15] drm/i915: Use ttm mmap handling for ttm bo's Thomas Hellström 2021-05-26 11:32 ` [Intel-gfx] " Thomas Hellström 2021-05-26 17:40 ` Thomas Hellström 2021-05-26 17:40 ` [Intel-gfx] " Thomas Hellström 2021-05-27 11:11 ` Maarten Lankhorst 2021-05-27 11:11 ` [Intel-gfx] " Maarten Lankhorst 2021-05-26 16:20 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Move LMEM (VRAM) management over to TTM (rev4) Patchwork 2021-05-26 16:23 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-05-26 16:51 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-05-27 1: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=20210526113259.1661914-15-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.