| Message ID | 20200114095107.21197-1-wambui.karugax@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | drm/i915: conversion to new drm logging macros. | expand |
On Thu, 16 Jan 2020, Patchwork <patchwork@emeril.freedesktop.org> wrote: > == Series Details == > > Series: drm/i915: conversion to new drm logging macros. > URL : https://patchwork.freedesktop.org/series/72096/ > State : failure > > == Summary == > > Applying: drm/i915/atomic: use new logging macros for debug > Applying: drm/i915/audio: convert to new drm logging macros. > Using index info to reconstruct a base tree... > M drivers/gpu/drm/i915/display/intel_audio.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/i915/display/intel_audio.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_audio.c > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch' to see the failed patch > Patch failed at 0002 drm/i915/audio: convert to new drm logging macros. > 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". When you see this, please rebase and repost. We don't apply patches unless they've passed our CI. Thanks, Jani. > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
This series continues the conversion to the new struct drm_device based logging macros in drm/i915. These patches were mostly achieved using coccinelle: @rule1@ identifier fn, T; @@ fn(struct drm_i915_private *T,...) { <+... ( -DRM_INFO( +drm_info(&T->drm, ...) | -DRM_ERROR( +drm_err(&T->drm, ...) | -DRM_WARN( +drm_warn(&T->drm, ...) | -DRM_DEBUG( +drm_dbg(&T->drm, ...) | -DRM_DEBUG_DRIVER( +drm_dbg(&T->drm, ...) | -DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm, ...) ) ...+> } @rule2@ identifier fn, T; @@ fn(...) { ... struct drm_i915_private *T = ...; <+... ( -DRM_INFO( +drm_info(&T->drm, ...) | -DRM_ERROR( +drm_err(&T->drm, ...) | -DRM_WARN( +drm_warn(&T->drm, ...) | -DRM_DEBUG( +drm_dbg(&T->drm, ...) | -DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm, ...) | -DRM_DEBUG_DRIVER( +drm_dbg(&T->drm, ...) ) ...+> } Wambui Karuga (5): drm/i915/atomic: use new logging macros for debug drm/i915/audio: convert to new drm logging macros. drm/i915/bios: convert to new drm logging macros. drm/i915/bw: convert to new drm_device based logging macros. drm/i915/cdclk: use new drm logging macros. drivers/gpu/drm/i915/display/intel_atomic_plane.c | 9 +- drivers/gpu/drm/i915/display/intel_audio.c | 71 ++-- drivers/gpu/drm/i915/display/intel_bios.c | 357 +++++++++++------- drivers/gpu/drm/i915/display/intel_bw.c | 29 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 109 +++--- 5 files changed, 337 insertions(+), 238 deletions(-)