[00/10] drm/i915/display: conversion to drm_device based logging macros

Message

Wambui Karuga Feb. 26, 2020, 10:11 a.m. UTC

This series continues the conversion of various instances of the printk
based drm logging macros to use the struct drm_device logging macros.
This series focuses on various files in drm/i915/display and was done
both manually and using coccinelle.

Wambui Karuga (10):
  drm/i915/dsb: convert to drm_device based logging macros.
  drm/i915/fbc: convert to drm_device based logging macros.
  drm/i915/fbdev: convert to drm_device based logging.
  drm/i915/fifo_underrun: convert to drm_device based logging.
  drm/i915/gmbus: convert to drm_device based logging,
  drm/i915/hdcp: convert to struct drm_device based logging.
  drm/i915/hotplug: convert to drm_device based logging.
  drm/i915/lpe_audio: convert to drm_device based logging macros.
  drm/i915/lvds: convert to drm_device based logging macros.
  drm/i915/overlay: convert to drm_device based logging.

 drivers/gpu/drm/i915/display/intel_dsb.c      |  28 +++--
 drivers/gpu/drm/i915/display/intel_fbc.c      |  28 +++--
 drivers/gpu/drm/i915/display/intel_fbdev.c    |  89 ++++++++------
 .../drm/i915/display/intel_fifo_underrun.c    |  29 +++--
 drivers/gpu/drm/i915/display/intel_gmbus.c    |  33 ++---
 drivers/gpu/drm/i915/display/intel_hdcp.c     | 114 ++++++++++--------
 drivers/gpu/drm/i915/display/intel_hotplug.c  |  40 +++---
 .../gpu/drm/i915/display/intel_lpe_audio.c    |  23 ++--
 drivers/gpu/drm/i915/display/intel_lvds.c     |  43 ++++---
 drivers/gpu/drm/i915/display/intel_overlay.c  |  11 +-
 10 files changed, 255 insertions(+), 183 deletions(-)

Comments

Jani Nikula March 3, 2020, 3:20 p.m. UTC | #1

On Tue, 03 Mar 2020, Patchwork <[e-mail]> wrote:
> == Series Details ==
>
> Series: drm/i915/display: conversion to drm_device based logging macros (rev5)
> URL   : https://patchwork.freedesktop.org/series/72760/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915/dsb: convert to drm_device based logging macros.
> Applying: drm/i915/fbc: convert to drm_device based logging macros.
> Applying: drm/i915/fbdev: convert to drm_device based logging.
> Applying: drm/i915/fifo_underrun: convert to drm_device based logging.
> Applying: drm/i915/gmbus: convert to drm_device based logging,
> Applying: drm/i915/hdcp: convert to struct drm_device based logging.
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/i915/display/intel_hdcp.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Patch failed at 0006 drm/i915/hdcp: convert to struct drm_device based logging.
> 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".

Wambui, please rebase and resend the entire series. It's been a bit
unlucky in CI, getting failures until it doesn't apply anymore. :(

BR,
Jani.