== Series Details == Series: Consider DBuf bandwidth when calculating CDCLK (rev7) URL : https://patchwork.freedesktop.org/series/74739/ State : failure == Summary == Applying: drm/i915: Decouple cdclk calculation from modeset checks Applying: drm/i915: Force recalculate min_cdclk if planes config changed Applying: drm/i915: Introduce for_each_dbuf_slice_in_mask macro Applying: drm/i915: Adjust CDCLK accordingly to our DBuf bw needs Applying: drm/i915: Remove unneeded hack now for CDCLK Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_cdclk.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_cdclk.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_cdclk.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0005 drm/i915: Remove unneeded hack now for CDCLK 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
