== Series Details == Series: series starting with [01/22] Revert "drm/i915/gem: Drop relocation slowpath" URL : https://patchwork.freedesktop.org/series/75251/ State : failure
== Summary == Applying: Revert "drm/i915/gem: Drop relocation slowpath" Applying: perf/core: Only copy-to-user after completely unlocking all locks. (CI test) Applying: drm/i915: Add an implementation for i915_gem_ww_ctx locking, v2. Applying: drm/i915: Remove locking from i915_gem_object_prepare_read/write Applying: drm/i915: Parse command buffer earlier in eb_relocate(slow) Applying: drm/i915: Use per object locking in execbuf, v7. Applying: drm/i915: Use ww locking in intel_renderstate. Applying: drm/i915: Add ww context handling to context_barrier_task Applying: drm/i915: Nuke arguments to eb_pin_engine Applying: drm/i915: Pin engine before pinning all objects, v3. Applying: drm/i915: Rework intel_context pinning to do everything outside of pin_mutex Applying: drm/i915: Make sure execbuffer always passes ww state to i915_vma_pin. Applying: drm/i915: Convert i915_gem_object/client_blt.c to use ww locking as well, v2. Applying: drm/i915: Kill last user of intel_context_create_request outside of selftests Applying: drm/i915: Convert i915_perf to ww locking as well Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_perf.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_perf.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_perf.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0015 drm/i915: Convert i915_perf to ww locking as well When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
