diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2021-06-14 12:24:24 +0300 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2021-06-14 12:24:55 +0300 |
| commit | 0e9d217b79371d726e53d4a1beef1743952383b7 (patch) | |
| tree | 700a8c5ee995dc69deac0a246920f2f28e2afc8b /include | |
| parent | c649432e86ca677d8762c5764a2832509ca8d449 (diff) | |
| parent | cf3e3e86d77970211e0983130e896ae242601003 (diff) | |
| download | linux-0e9d217b79371d726e53d4a1beef1743952383b7.tar.bz2 | |
Merge tag 'topic/i915-ttm-2021-06-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-intel-gt-next
drm-misc and drm-intel pull request for topic/i915-ttm:
- Convert i915 lmem handling to ttm.
- Add a patch to temporarily add a driver_private member to vma_node.
- Use this to allow mixed object mmap handling for i915.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/eb71ee2d-3413-6ca8-0b7c-a58695f00b77@linux.intel.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_vma_manager.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |