[Intel-gfx] [PATCH 2/2] drm/i915/trace: split out display trace to a separate file

[Ville Syrjälä]

On Tue, Nov 16, 2021 at 05:42:34PM +0200, Jani Nikula wrote:
> Add display/intel_display_trace.[ch] for defining display
> tracepoints. The main goal is to reduce cross-includes between gem and
> display. It would be possible split up tracing even further, but that
> would lead to more boilerplate.
> 
> There should be no changes to tracepoints.
> 
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/Makefile                 |   1 +
>  .../gpu/drm/i915/display/intel_atomic_plane.c |   5 +-
>  drivers/gpu/drm/i915/display/intel_crtc.c     |   5 +-
>  .../drm/i915/display/intel_display_trace.c    |   9 +
>  .../drm/i915/display/intel_display_trace.h    | 588 ++++++++++++++++++
>  drivers/gpu/drm/i915/display/intel_fbc.c      |   2 +-
>  .../drm/i915/display/intel_fifo_underrun.c    |   2 +-
>  .../gpu/drm/i915/display/intel_frontbuffer.c  |   7 +-
>  drivers/gpu/drm/i915/display/intel_sprite.c   |   1 -
>  drivers/gpu/drm/i915/i915_debugfs.c           |   1 -
>  drivers/gpu/drm/i915/i915_drv.c               |   1 -
>  drivers/gpu/drm/i915/i915_irq.c               |   2 +-
>  drivers/gpu/drm/i915/i915_trace.h             | 567 -----------------
>  drivers/gpu/drm/i915/intel_pm.c               |   2 +-
>  14 files changed, 610 insertions(+), 583 deletions(-)
>  create mode 100644 drivers/gpu/drm/i915/display/intel_display_trace.c
>  create mode 100644 drivers/gpu/drm/i915/display/intel_display_trace.h
> 
<snip>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_trace.c b/drivers/gpu/drm/i915/display/intel_display_trace.c
> new file mode 100644
> index 000000000000..737979ada869
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/display/intel_display_trace.c
> @@ -0,0 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright © 2021 Intel Corporation
> + */
> +
> +#ifndef __CHECKER__
> +#define CREATE_TRACE_POINTS
> +#include "intel_display_trace.h"
> +#endif
> diff --git a/drivers/gpu/drm/i915/display/intel_display_trace.h b/drivers/gpu/drm/i915/display/intel_display_trace.h
> new file mode 100644
> index 000000000000..8608f5a6ff32
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/display/intel_display_trace.h
> @@ -0,0 +1,588 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +
> +#undef TRACE_SYSTEM
> +#define TRACE_SYSTEM i915
> +
> +#if !defined(__INTEL_DISPLAY_TRACE_H__) || defined(TRACE_HEADER_MULTI_READ)
> +#define __INTEL_DISPLAY_TRACE_H__
> +
> +#include <linux/types.h>
> +#include <linux/tracepoint.h>
> +
> +#include "i915_drv.h"
> +#include "intel_crtc.h"
> +#include "intel_display_types.h"
> +
> +/* watermark/fifo updates */

That comment is a bit misplaced. I guess it already was like that in the
old file. Maybe just nuke all these comments? I don't think they really
serve any useful purpose.

Series is
Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

-- 
Ville Syrjälä
Intel