Merge tag 'topic/i915-ttm-2021-06-11' of git://anongit.freedesktop.org/drm/drm-misc...
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Mon, 14 Jun 2021 09:24:24 +0000 (12:24 +0300)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Mon, 14 Jun 2021 09:24:55 +0000 (12:24 +0300)
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

Trivial merge