== Series Details == Series: Add NV12 support (rev3) URL : https://patchwork.freedesktop.org/series/39670/ State : failure == Summary == Applying: drm/i915/skl+: rename skl_wm_values struct to skl_ddb_values Applying: drm/i915/skl+: refactor WM calculation for NV12 Applying: drm/i915/skl+: add NV12 in skl_format_to_fourcc Applying: drm/i915/skl+: support verification of DDB HW state for NV12 Applying: drm/i915/skl+: NV12 related changes for WM Applying: drm/i915/skl+: pass skl_wm_level struct to wm compute func Applying: drm/i915/skl+: make sure higher latency level has higher wm value Applying: drm/i915/skl+: nv12 workaround disable WM level 1-7 Applying: drm/i915/skl: split skl_compute_ddb function Applying: drm/i915: Set scaler mode for NV12 Applying: drm/i915: Update format_is_yuv() to include NV12 Applying: drm/i915: Upscale scaler max scale for NV12 error: Failed to merge in the changes. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_display.c M drivers/gpu/drm/i915/intel_drv.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h Auto-merging drivers/gpu/drm/i915/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c Patch failed at 0012 drm/i915: Upscale scaler max scale for NV12 The copy of the patch that failed is found in: .git/rebase-apply/patch 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
