== Series Details == Series: Begin enabling Xe_HP SDV and DG2 platforms (rev8) URL : https://patchwork.freedesktop.org/series/92135/ State : failure == Summary == Applying: drm/i915/xehp: handle new steering options Applying: drm/i915/xehpsdv: Define steering tables Applying: drm/i915/dg2: Add forcewake table Applying: drm/i915/dg2: Update LNCF steering ranges Applying: drm/i915/dg2: Add SQIDI steering Applying: drm/i915/xehp: Loop over all gslices for INSTDONE processing Applying: drm/i915/dg2: Report INSTDONE_GEOM values in error state Applying: drm/i915/xehp: Changes to ss/eu definitions Applying: drm/i915/xehpsdv: Add maximum sseu limits Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_sseu.c M drivers/gpu/drm/i915/gt/intel_sseu.h M drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c Auto-merging drivers/gpu/drm/i915/gt/intel_sseu.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_sseu.h Auto-merging drivers/gpu/drm/i915/gt/intel_sseu.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0009 drm/i915/xehpsdv: Add maximum sseu limits 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@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
