All of lore.kernel.org
 help / color / mirror / Atom feed
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 14/15] drm/vma: Add a driver_private member to vma_node.
Date: Fri, 28 May 2021 12:57:43 +0200	[thread overview]
Message-ID: <20210528105744.58271-15-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20210528105744.58271-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.

This is a temporary solution, until i915 is converted completely to
use ttm for bo's.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch> #irc
---
 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

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: [PATCH v6 14/15] drm/vma: Add a driver_private member to vma_node.
Date: Fri, 28 May 2021 12:57:43 +0200	[thread overview]
Message-ID: <20210528105744.58271-15-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20210528105744.58271-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.

This is a temporary solution, until i915 is converted completely to
use ttm for bo's.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch> #irc
---
 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


  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 [Intel-gfx] [PATCH v6 00/15] Move LMEM (VRAM) management over to TTM Thomas Hellström
2021-05-28 10:57 ` Thomas Hellström
2021-05-28 10:57 ` [Intel-gfx] [PATCH v6 01/15] drm/i915: Untangle the vma pages_mutex Thomas Hellström
2021-05-28 10:57   ` Thomas Hellström
2021-05-28 10:57 ` [Intel-gfx] [PATCH v6 02/15] drm/i915: Don't free shared locks while shared Thomas Hellström
2021-05-28 10:57   ` Thomas Hellström
2021-05-28 10:57 ` [Intel-gfx] [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   ` Thomas Hellström
2021-05-28 10:57 ` [Intel-gfx] [PATCH v6 04/15] drm/i915/ttm Initialize the ttm device and memory managers Thomas Hellström
2021-05-28 10:57   ` Thomas Hellström
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   ` Thomas Hellström
2021-05-28 10:57 ` [Intel-gfx] [PATCH v6 06/15] drm/ttm: Add a generic TTM memcpy move for page-based iomem Thomas Hellström
2021-05-28 10:57   ` Thomas Hellström
2021-05-28 10:57 ` [Intel-gfx] [PATCH v6 07/15] drm: Add a prefetching memcpy_from_wc Thomas Hellström
2021-05-28 10:57   ` Thomas Hellström
2021-05-29 19:49   ` [Intel-gfx] " kernel test robot
2021-05-29 21:54   ` kernel test robot
2021-05-28 10:57 ` [Intel-gfx] [PATCH v6 08/15] drm/ttm: Use drm_memcpy_from_wc for TTM bo moves Thomas Hellström
2021-05-28 10:57   ` Thomas Hellström
2021-05-28 10:57 ` [Intel-gfx] [PATCH v6 09/15] drm/ttm: Document and optimize ttm_bo_pipeline_gutting() Thomas Hellström
2021-05-28 10:57   ` Thomas Hellström
2021-05-28 10:57 ` [Intel-gfx] [PATCH v6 10/15] drm/ttm, drm/amdgpu: Allow the driver some control over swapping Thomas Hellström
2021-05-28 10:57   ` Thomas Hellström
2021-05-28 10:57 ` [Intel-gfx] [PATCH v6 11/15] drm/i915/ttm: Introduce a TTM i915 gem object backend Thomas Hellström
2021-05-28 10:57   ` Thomas Hellström
2021-05-28 10:57 ` [Intel-gfx] [PATCH v6 12/15] drm/i915/lmem: Verify checks for lmem residency Thomas Hellström
2021-05-28 10:57   ` Thomas Hellström
2021-05-28 10:57 ` [Intel-gfx] [PATCH v6 13/15] drm/i915: Disable mmap ioctl for gen12+ Thomas Hellström
2021-05-28 10:57   ` Thomas Hellström
2021-05-28 10:57 ` Thomas Hellström [this message]
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] [PATCH v6 15/15] drm/i915: Use ttm mmap handling for ttm bo's Thomas Hellström
2021-05-28 10:57   ` 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-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: link
Be 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.