Commit 00a7f0d7 authored by Lionel Landwerlin's avatar Lionel Landwerlin
Browse files

drm/i915/tgl: Add perf support on TGL 



The design of the OA unit has been split into several units. We now
have a global unit (OAG) and a render specific unit (OAR). This leads
to some changes on how we program things. Some details :

OAR:
  - has its own set of counter registers, they are per-context
    saved/restored
  - counters are not written to the circular OA buffer
  - a snapshot of the counters can be acquired with
    MI_RECORD_PERF_COUNT, or a single counter can be read with
    MI_STORE_REGISTER_MEM.

OAG:
  - has global counters that increment across context switches
  - counters are written into the circular OA buffer (if requested)

v2: Fix checkpatch warnings on code style (Lucas)
v3: (Umesh)
  - Update register from which tail, status and head are read
  - Update logic to sample context reports
  - Update whitelist mux and b counter regs
v4: Fix a bug when updating context image for new contexts (Umesh)
v5: Squash patch enabling save/restore of counters into context image

    We want this so we can preempt performance queries and keep the
    system responsive even when long running queries are ongoing. We
    avoid doing it for all contexts.

    - use LRI to modify context control (Chris)
    - use MASKED_FIELD to program just the masked bits (Chris)
    - disable save/restore of counters on cleanup (Chris)
v6: Do not use implicit parameters (Chris)

BSpec: 28727, 30021

Signed-off-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: default avatarUmesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Acked-by: default avatarChris Wilson <chris.p.wilson@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191025193746.47155-2-umesh.nerlige.ramappa@intel.com
parent fc215230

drivers/gpu/drm/i915/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -247,7 +247,8 @@ i915-y += \ 
	oa/i915_oa_cflgt2.o \

	oa/i915_oa_cflgt3.o \

	oa/i915_oa_cnl.o \

	oa/i915_oa_icl.o

	oa/i915_oa_icl.o \

	oa/i915_oa_tgl.o

i915-y += i915_perf.o



# Post-mortem debug and GPU hang state capture

drivers/gpu/drm/i915/gt/intel_lrc.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ struct intel_engine_cs; 
#define	  CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT	(1 << 0)

#define   CTX_CTRL_RS_CTX_ENABLE		(1 << 1)

#define	  CTX_CTRL_ENGINE_CTX_SAVE_INHIBIT	(1 << 2)

#define	  GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE	(1 << 8)

#define RING_CONTEXT_STATUS_PTR(base)		_MMIO((base) + 0x3a0)

#define RING_EXECLIST_SQ_CONTENTS(base)		_MMIO((base) + 0x510)

#define RING_EXECLIST_CONTROL(base)		_MMIO((base) + 0x550)

drivers/gpu/drm/i915/i915_perf.c

+317 −34

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_reg.h

+103 −0
Original line number Diff line number Diff line
@@ -684,6 +684,45 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) 
#define OABUFFER_SIZE_8M    (6 << 3)

#define OABUFFER_SIZE_16M   (7 << 3)



/* Gen12 OAR unit */

#define GEN12_OAR_OACONTROL _MMIO(0x2960)

#define  GEN12_OAR_OACONTROL_COUNTER_FORMAT_SHIFT 1

#define  GEN12_OAR_OACONTROL_COUNTER_ENABLE       (1 << 0)



#define GEN12_OACTXCONTROL _MMIO(0x2360)

#define GEN12_OAR_OASTATUS _MMIO(0x2968)



/* Gen12 OAG unit */

#define GEN12_OAG_OAHEADPTR _MMIO(0xdb00)

#define  GEN12_OAG_OAHEADPTR_MASK 0xffffffc0

#define GEN12_OAG_OATAILPTR _MMIO(0xdb04)

#define  GEN12_OAG_OATAILPTR_MASK 0xffffffc0



#define GEN12_OAG_OABUFFER  _MMIO(0xdb08)

#define  GEN12_OAG_OABUFFER_BUFFER_SIZE_MASK  (0x7)

#define  GEN12_OAG_OABUFFER_BUFFER_SIZE_SHIFT (3)

#define  GEN12_OAG_OABUFFER_MEMORY_SELECT     (1 << 0) /* 0: PPGTT, 1: GGTT */



#define GEN12_OAG_OAGLBCTXCTRL _MMIO(0x2b28)

#define  GEN12_OAG_OAGLBCTXCTRL_TIMER_PERIOD_SHIFT 2

#define  GEN12_OAG_OAGLBCTXCTRL_TIMER_ENABLE       (1 << 1)

#define  GEN12_OAG_OAGLBCTXCTRL_COUNTER_RESUME     (1 << 0)



#define GEN12_OAG_OACONTROL _MMIO(0xdaf4)

#define  GEN12_OAG_OACONTROL_OA_COUNTER_FORMAT_SHIFT 2

#define  GEN12_OAG_OACONTROL_OA_COUNTER_ENABLE       (1 << 0)



#define GEN12_OAG_OA_DEBUG _MMIO(0xdaf8)

#define  GEN12_OAG_OA_DEBUG_INCLUDE_CLK_RATIO          (1 << 6)

#define  GEN12_OAG_OA_DEBUG_DISABLE_CLK_RATIO_REPORTS  (1 << 5)

#define  GEN12_OAG_OA_DEBUG_DISABLE_GO_1_0_REPORTS     (1 << 2)

#define  GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS (1 << 1)



#define GEN12_OAG_OASTATUS _MMIO(0xdafc)

#define  GEN12_OAG_OASTATUS_COUNTER_OVERFLOW (1 << 2)

#define  GEN12_OAG_OASTATUS_BUFFER_OVERFLOW  (1 << 1)

#define  GEN12_OAG_OASTATUS_REPORT_LOST      (1 << 0)



/*

 * Flexible, Aggregate EU Counter Registers.

 * Note: these aren't contiguous
@@ -920,6 +959,26 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) 
#define OAREPORTTRIG8_NOA_SELECT_6_SHIFT    24

#define OAREPORTTRIG8_NOA_SELECT_7_SHIFT    28



/* Same layout as OASTARTTRIGX */

#define GEN12_OAG_OASTARTTRIG1 _MMIO(0xd900)

#define GEN12_OAG_OASTARTTRIG2 _MMIO(0xd904)

#define GEN12_OAG_OASTARTTRIG3 _MMIO(0xd908)

#define GEN12_OAG_OASTARTTRIG4 _MMIO(0xd90c)

#define GEN12_OAG_OASTARTTRIG5 _MMIO(0xd910)

#define GEN12_OAG_OASTARTTRIG6 _MMIO(0xd914)

#define GEN12_OAG_OASTARTTRIG7 _MMIO(0xd918)

#define GEN12_OAG_OASTARTTRIG8 _MMIO(0xd91c)



/* Same layout as OAREPORTTRIGX */

#define GEN12_OAG_OAREPORTTRIG1 _MMIO(0xd920)

#define GEN12_OAG_OAREPORTTRIG2 _MMIO(0xd924)

#define GEN12_OAG_OAREPORTTRIG3 _MMIO(0xd928)

#define GEN12_OAG_OAREPORTTRIG4 _MMIO(0xd92c)

#define GEN12_OAG_OAREPORTTRIG5 _MMIO(0xd930)

#define GEN12_OAG_OAREPORTTRIG6 _MMIO(0xd934)

#define GEN12_OAG_OAREPORTTRIG7 _MMIO(0xd938)

#define GEN12_OAG_OAREPORTTRIG8 _MMIO(0xd93c)



/* CECX_0 */

#define OACEC_COMPARE_LESS_OR_EQUAL	6

#define OACEC_COMPARE_NOT_EQUAL		5
@@ -936,6 +995,10 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) 
#define OACEC_SELECT_PREV	(1 << 19)

#define OACEC_SELECT_BOOLEAN	(2 << 19)



/* 11-bit array 0: pass-through, 1: negated */

#define GEN12_OASCEC_NEGATE_MASK  0x7ff

#define GEN12_OASCEC_NEGATE_SHIFT 21



/* CECX_1 */

#define OACEC_MASK_MASK		    0xffff

#define OACEC_CONSIDERATIONS_MASK   0xffff
@@ -958,6 +1021,42 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) 
#define OACEC7_0 _MMIO(0x27a8)

#define OACEC7_1 _MMIO(0x27ac)



/* Same layout as CECX_Y */

#define GEN12_OAG_CEC0_0 _MMIO(0xd940)

#define GEN12_OAG_CEC0_1 _MMIO(0xd944)

#define GEN12_OAG_CEC1_0 _MMIO(0xd948)

#define GEN12_OAG_CEC1_1 _MMIO(0xd94c)

#define GEN12_OAG_CEC2_0 _MMIO(0xd950)

#define GEN12_OAG_CEC2_1 _MMIO(0xd954)

#define GEN12_OAG_CEC3_0 _MMIO(0xd958)

#define GEN12_OAG_CEC3_1 _MMIO(0xd95c)

#define GEN12_OAG_CEC4_0 _MMIO(0xd960)

#define GEN12_OAG_CEC4_1 _MMIO(0xd964)

#define GEN12_OAG_CEC5_0 _MMIO(0xd968)

#define GEN12_OAG_CEC5_1 _MMIO(0xd96c)

#define GEN12_OAG_CEC6_0 _MMIO(0xd970)

#define GEN12_OAG_CEC6_1 _MMIO(0xd974)

#define GEN12_OAG_CEC7_0 _MMIO(0xd978)

#define GEN12_OAG_CEC7_1 _MMIO(0xd97c)



/* Same layout as CECX_Y + negate 11-bit array */

#define GEN12_OAG_SCEC0_0 _MMIO(0xdc00)

#define GEN12_OAG_SCEC0_1 _MMIO(0xdc04)

#define GEN12_OAG_SCEC1_0 _MMIO(0xdc08)

#define GEN12_OAG_SCEC1_1 _MMIO(0xdc0c)

#define GEN12_OAG_SCEC2_0 _MMIO(0xdc10)

#define GEN12_OAG_SCEC2_1 _MMIO(0xdc14)

#define GEN12_OAG_SCEC3_0 _MMIO(0xdc18)

#define GEN12_OAG_SCEC3_1 _MMIO(0xdc1c)

#define GEN12_OAG_SCEC4_0 _MMIO(0xdc20)

#define GEN12_OAG_SCEC4_1 _MMIO(0xdc24)

#define GEN12_OAG_SCEC5_0 _MMIO(0xdc28)

#define GEN12_OAG_SCEC5_1 _MMIO(0xdc2c)

#define GEN12_OAG_SCEC6_0 _MMIO(0xdc30)

#define GEN12_OAG_SCEC6_1 _MMIO(0xdc34)

#define GEN12_OAG_SCEC7_0 _MMIO(0xdc38)

#define GEN12_OAG_SCEC7_1 _MMIO(0xdc3c)



/* OA perf counters */

#define OA_PERFCNT1_LO      _MMIO(0x91B8)

#define OA_PERFCNT1_HI      _MMIO(0x91BC)
@@ -1038,6 +1137,10 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) 
#define MICRO_BP3_COUNT_STATUS23	_MMIO(0x9838)

#define MICRO_BP_FIRED_ARMED		_MMIO(0x983C)



#define GEN12_OAA_DBG_REG _MMIO(0xdc44)

#define GEN12_OAG_OA_PESS _MMIO(0x2b2c)

#define GEN12_OAG_SPCTR_CNF _MMIO(0xdc40)



#define GDT_CHICKEN_BITS    _MMIO(0x9840)

#define   GT_NOA_ENABLE	    0x00000080

drivers/gpu/drm/i915/oa/i915_oa_tgl.c

0 → 100644
+121 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE