Commit 17d70726 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: extract intel_uncore_trace.[ch] 



The i915_reg_rw tracing is a small isolated part of i915_trace.h. Its
users are orthogonal to the other i915_trace.h users as well, and its
implementation does not require all the includes of i915_trace.h. Split
i915_reg_rw tracing to separate intel_uncore_trace.[ch].

The main underlying goal is to reduce implicit includes of i915_drv.h
from display code.

Reviewed-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1a3623fbb120adc55bc1cab1e27aca6e55487163.1732104170.git.jani.nikula@intel.com
parent 57442cfb

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ i915-y += \ 
	intel_sbi.o \

	intel_step.o \

	intel_uncore.o \

	intel_uncore_trace.o \

	intel_wakeref.o \

	vlv_sideband.o \

	vlv_suspend.o

drivers/gpu/drm/i915/display/intel_de.h

+1 −1
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ 
#define __INTEL_DE_H__



#include "i915_drv.h"

#include "i915_trace.h"

#include "intel_dsb.h"

#include "intel_uncore.h"

#include "intel_uncore_trace.h"



static inline struct intel_uncore *__to_uncore(struct intel_display *display)

{

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

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


#include "i915_drv.h"

#include "i915_reg.h"

#include "i915_trace.h"

#include "intel_de.h"

#include "intel_display_types.h"

#include "intel_dp.h"
@@ -14,6 +13,7 @@ 
#include "intel_pps.h"

#include "intel_quirks.h"

#include "intel_tc.h"

#include "intel_uncore_trace.h"



#define AUX_CH_NAME_BUFSIZE	6

drivers/gpu/drm/i915/i915_trace.h

+0 −28
Original line number Diff line number Diff line
@@ -642,34 +642,6 @@ DEFINE_EVENT(i915_request, i915_request_wait_end, 
	    TP_ARGS(rq)

);



TRACE_EVENT_CONDITION(i915_reg_rw,

	TP_PROTO(bool write, i915_reg_t reg, u64 val, int len, bool trace),



	TP_ARGS(write, reg, val, len, trace),



	TP_CONDITION(trace),



	TP_STRUCT__entry(

		__field(u64, val)

		__field(u32, reg)

		__field(u16, write)

		__field(u16, len)

		),



	TP_fast_assign(

		__entry->val = (u64)val;

		__entry->reg = i915_mmio_reg_offset(reg);

		__entry->write = write;

		__entry->len = len;

		),



	TP_printk("%s reg=0x%x, len=%d, val=(0x%x, 0x%x)",

		__entry->write ? "write" : "read",

		__entry->reg, __entry->len,

		(u32)(__entry->val & 0xffffffff),

		(u32)(__entry->val >> 32))

);



/**

 * DOC: i915_ppgtt_create and i915_ppgtt_release tracepoints

 *

drivers/gpu/drm/i915/intel_uncore.c

+1 −1
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
#include "i915_drv.h"

#include "i915_iosf_mbi.h"

#include "i915_reg.h"

#include "i915_trace.h"

#include "i915_vgpu.h"

#include "intel_uncore_trace.h"



#define FORCEWAKE_ACK_TIMEOUT_MS 50

#define GT_FIFO_TIMEOUT_MS	 10