diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2021-06-14 06:56:22 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2021-06-14 06:56:22 +0200 |
| commit | bfd616ff9a2602ec66414438c3f9871a49fa1e16 (patch) | |
| tree | 3532c79ea9e2b611b613608cb6082b3bb182ecb5 /include/drm | |
| parent | 00f4471e42c871524c68ef1413d2fe53ce1d0a1b (diff) | |
| parent | cf3e3e86d77970211e0983130e896ae242601003 (diff) | |
| download | linux-bfd616ff9a2602ec66414438c3f9871a49fa1e16.tar.gz linux-bfd616ff9a2602ec66414438c3f9871a49fa1e16.tar.bz2 linux-bfd616ff9a2602ec66414438c3f9871a49fa1e16.zip | |
Merge tag 'tags/topic/i915-ttm-2021-06-11' into drm-misc-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.
Diffstat (limited to 'include/drm')
| -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 { |