Commit fd2b94a5 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/trace: split out display trace to a separate file 



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.

We end up having to include intel_crtc.h in a few places because it was
pulled in implicitly via intel_de.h -> i915_trace.h -> intel_crtc.h, and
that's no longer the case.

There should be no changes to tracepoints.

v3:
- Rebase

v2:
- Define TRACE_INCLUDE_PATH relative to define_trace.h (Chris)
- Remove useless comments (Ville)

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/7862ad764fbd0748d903c76bc632d3d277874e5b.1638961423.git.jani.nikula@intel.com
parent 4bb71337

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ i915-y += \ 
	display/intel_crt.o \

	display/intel_ddi.o \

	display/intel_ddi_buf_trans.o \

	display/intel_display_trace.o \

	display/intel_dp.o \

	display/intel_dp_aux.o \

	display/intel_dp_aux_backlight.o \

drivers/gpu/drm/i915/display/g4x_dp.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "intel_audio.h"

#include "intel_backlight.h"

#include "intel_connector.h"

#include "intel_crtc.h"

#include "intel_de.h"

#include "intel_display_types.h"

#include "intel_dp.h"

drivers/gpu/drm/i915/display/g4x_hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include "g4x_hdmi.h"

#include "intel_audio.h"

#include "intel_connector.h"

#include "intel_crtc.h"

#include "intel_de.h"

#include "intel_display_types.h"

#include "intel_dpio_phy.h"

drivers/gpu/drm/i915/display/intel_atomic_plane.c

+3 −2
Original line number Diff line number Diff line
@@ -35,15 +35,16 @@ 
#include <drm/drm_fourcc.h>

#include <drm/drm_plane_helper.h>



#include "i915_trace.h"

#include "gt/intel_rps.h"



#include "intel_atomic_plane.h"

#include "intel_cdclk.h"

#include "intel_display_trace.h"

#include "intel_display_types.h"

#include "intel_fb.h"

#include "intel_fb_pin.h"

#include "intel_pm.h"

#include "intel_sprite.h"

#include "gt/intel_rps.h"



static void intel_plane_state_reset(struct intel_plane_state *plane_state,

				    struct intel_plane *plane)

drivers/gpu/drm/i915/display/intel_audio.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "intel_atomic.h"

#include "intel_audio.h"

#include "intel_cdclk.h"

#include "intel_crtc.h"

#include "intel_de.h"

#include "intel_display_types.h"

#include "intel_lpe_audio.h"