Merge tag 'topic/i915-gem-next-2021-03-26' of ssh://git.freedesktop.org/git/drm/drm...
authorDave Airlie <airlied@redhat.com>
Wed, 31 Mar 2021 20:24:05 +0000 (06:24 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 31 Mar 2021 20:24:13 +0000 (06:24 +1000)
commit2f835b5dd8f7fc1e58d73fc2cd2ec33c2b054036
treeb85cf8b2b43a3976bd916479949b9dc94d8a6f7e
parentfe8a057839fc49dbf23ff92ad3a7f906b932b585
parente1a5e6a8c48bf99ea374fb3e535661cfe226bca4
Merge tag 'topic/i915-gem-next-2021-03-26' of ssh://git.freedesktop.org/git/drm/drm into drm-next

special i915-gem-next pull as requested

- Conversion to dma_resv_locking, obj->mm.lock is gone (Maarten, with
  help from Thomas Hellström)
- watchdog (Tvrtko, one patch to cancel individual request from Chris)
- legacy ioctl cleanup (Jason+Ashutosh)
- i915-gem TODO and RFC process doc (me)
- i915_ prefix for vma_lookup (Liam Howlett) just because I spotted it
  and put it in here too

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/YF24MHoOSjpKFEXA@phenom.ffwll.local