Skip to content
Snippets Groups Projects
Commit 16d69a89 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

Merge drm/drm-next into drm-intel-gt-next


Maarten requested a backmerge due his work depending on subtle semantic
changes introduced by:

  7e2e69ed ("drm/i915: Fix i915_request fence wait semantics")
  2cbb8d4d ("drm/i915: use new iterator in i915_gem_object_wait_reservation")

Both should probably have been merged to drm-intel-gt-next anyway.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 5652df82 c18c8891
No related branches found
No related tags found
Loading
Showing
with 695 additions and 139 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment