✗ Fi.CI.BUILD: failure for drm/i915: Move system memory to TTM for discrete

Patchwork patchwork at emeril.freedesktop.org
Mon Jun 28 20:56:28 UTC 2021


== Series Details ==

Series: drm/i915: Move system memory to TTM for discrete
URL   : https://patchwork.freedesktop.org/series/91825/
State : failure

== Summary ==

Applying: drm/i915: Update object placement flags to be mutable
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gem/i915_gem_internal.c
M	drivers/gpu/drm/i915/gem/i915_gem_lmem.c
M	drivers/gpu/drm/i915/gem/i915_gem_lmem.h
M	drivers/gpu/drm/i915/gem/i915_gem_mman.c
M	drivers/gpu/drm/i915/gem/i915_gem_object.c
M	drivers/gpu/drm/i915/gem/i915_gem_object.h
M	drivers/gpu/drm/i915/gem/i915_gem_object_types.h
M	drivers/gpu/drm/i915/gem/i915_gem_pages.c
M	drivers/gpu/drm/i915/gem/i915_gem_phys.c
M	drivers/gpu/drm/i915/gem/i915_gem_shmem.c
M	drivers/gpu/drm/i915/gem/i915_gem_ttm.c
M	drivers/gpu/drm/i915/gem/i915_gem_userptr.c
M	drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c
M	drivers/gpu/drm/i915/gem/selftests/huge_pages.c
M	drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
M	drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c
M	drivers/gpu/drm/i915/i915_gpu_error.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_ttm.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c
Patch failed at 0001 drm/i915: Update object placement flags to be mutable
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".




More information about the Intel-gfx-trybot mailing list