== Series Details == Series: Consider DBuf bandwidth when calculating CDCLK (rev13) URL : https://patchwork.freedesktop.org/series/74739/ State : failure == Summary == Applying: drm/i915: Decouple cdclk calculation from modeset checks Applying: drm/i915: Extract cdclk requirements checking to separate function Applying: drm/i915: Check plane configuration properly Applying: drm/i915: Plane configuration affects CDCLK in Gen11+ Applying: drm/i915: Introduce for_each_dbuf_slice_in_mask macro Applying: drm/i915: Adjust CDCLK accordingly to our DBuf bw needs Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_bw.c M drivers/gpu/drm/i915/display/intel_bw.h M drivers/gpu/drm/i915/display/intel_display.c M drivers/gpu/drm/i915/intel_pm.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_pm.c Auto-merging drivers/gpu/drm/i915/display/intel_display.c Auto-merging drivers/gpu/drm/i915/display/intel_bw.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bw.h Auto-merging drivers/gpu/drm/i915/display/intel_bw.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bw.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0006 drm/i915: Adjust CDCLK accordingly to our DBuf bw needs 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
