Skip to content

Commit 50f79da

Browse files
committed
drm/etnaviv: update hardware headers from rnndb
Update the state HI header from the rnndb commit 640a009e7e66 ("rnndb: fix AXI1_TOTAL_REQUEST_COUNT"). Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
1 parent 49b5ff4 commit 50f79da

1 file changed

Lines changed: 70 additions & 16 deletions

File tree

drivers/gpu/drm/etnaviv/state_hi.xml.h

Lines changed: 70 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ This file was generated by the rules-ng-ng headergen tool in this git repository
88
git clone git://0x04.net/rules-ng-ng
99
1010
The rules-ng-ng source files this header was generated from are:
11-
- state.xml ( 26666 bytes, from 2019-12-20 21:20:35)
12-
- common.xml ( 35468 bytes, from 2018-02-10 13:09:26)
13-
- common_3d.xml ( 15058 bytes, from 2019-12-28 20:02:03)
14-
- state_hi.xml ( 30552 bytes, from 2019-12-28 20:02:48)
15-
- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26)
16-
- state_2d.xml ( 51552 bytes, from 2018-02-10 13:09:26)
17-
- state_3d.xml ( 83098 bytes, from 2019-12-28 20:02:03)
18-
- state_blt.xml ( 14252 bytes, from 2019-10-20 19:59:15)
19-
- state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26)
20-
21-
Copyright (C) 2012-2019 by the following authors:
11+
- state.xml ( 27198 bytes, from 2022-04-22 10:35:24)
12+
- common.xml ( 35468 bytes, from 2020-10-28 12:56:03)
13+
- common_3d.xml ( 15058 bytes, from 2020-10-28 12:56:03)
14+
- state_hi.xml ( 34804 bytes, from 2022-12-02 09:06:28)
15+
- copyright.xml ( 1597 bytes, from 2020-10-28 12:56:03)
16+
- state_2d.xml ( 51552 bytes, from 2020-10-28 12:56:03)
17+
- state_3d.xml ( 84445 bytes, from 2022-11-15 15:59:38)
18+
- state_blt.xml ( 14424 bytes, from 2022-11-07 11:18:41)
19+
- state_vg.xml ( 5975 bytes, from 2020-10-28 12:56:03)
20+
21+
Copyright (C) 2012-2022 by the following authors:
2222
- Wladimir J. van der Laan <laanwj@gmail.com>
2323
- Christian Gmeiner <christian.gmeiner@gmail.com>
2424
- Lucas Stach <l.stach@pengutronix.de>
@@ -321,16 +321,16 @@ DEALINGS IN THE SOFTWARE.
321321
#define VIVS_MMUv2_CONFIGURATION_ADDRESS(x) (((x) << VIVS_MMUv2_CONFIGURATION_ADDRESS__SHIFT) & VIVS_MMUv2_CONFIGURATION_ADDRESS__MASK)
322322

323323
#define VIVS_MMUv2_STATUS 0x00000188
324-
#define VIVS_MMUv2_STATUS_EXCEPTION0__MASK 0x00000003
324+
#define VIVS_MMUv2_STATUS_EXCEPTION0__MASK 0x0000000f
325325
#define VIVS_MMUv2_STATUS_EXCEPTION0__SHIFT 0
326326
#define VIVS_MMUv2_STATUS_EXCEPTION0(x) (((x) << VIVS_MMUv2_STATUS_EXCEPTION0__SHIFT) & VIVS_MMUv2_STATUS_EXCEPTION0__MASK)
327-
#define VIVS_MMUv2_STATUS_EXCEPTION1__MASK 0x00000030
327+
#define VIVS_MMUv2_STATUS_EXCEPTION1__MASK 0x000000f0
328328
#define VIVS_MMUv2_STATUS_EXCEPTION1__SHIFT 4
329329
#define VIVS_MMUv2_STATUS_EXCEPTION1(x) (((x) << VIVS_MMUv2_STATUS_EXCEPTION1__SHIFT) & VIVS_MMUv2_STATUS_EXCEPTION1__MASK)
330-
#define VIVS_MMUv2_STATUS_EXCEPTION2__MASK 0x00000300
330+
#define VIVS_MMUv2_STATUS_EXCEPTION2__MASK 0x00000f00
331331
#define VIVS_MMUv2_STATUS_EXCEPTION2__SHIFT 8
332332
#define VIVS_MMUv2_STATUS_EXCEPTION2(x) (((x) << VIVS_MMUv2_STATUS_EXCEPTION2__SHIFT) & VIVS_MMUv2_STATUS_EXCEPTION2__MASK)
333-
#define VIVS_MMUv2_STATUS_EXCEPTION3__MASK 0x00003000
333+
#define VIVS_MMUv2_STATUS_EXCEPTION3__MASK 0x0000f000
334334
#define VIVS_MMUv2_STATUS_EXCEPTION3__SHIFT 12
335335
#define VIVS_MMUv2_STATUS_EXCEPTION3(x) (((x) << VIVS_MMUv2_STATUS_EXCEPTION3__SHIFT) & VIVS_MMUv2_STATUS_EXCEPTION3__MASK)
336336

@@ -465,7 +465,13 @@ DEALINGS IN THE SOFTWARE.
465465
#define VIVS_MC_PROFILE_CONFIG0 0x00000470
466466
#define VIVS_MC_PROFILE_CONFIG0_FE__MASK 0x000000ff
467467
#define VIVS_MC_PROFILE_CONFIG0_FE__SHIFT 0
468+
#define VIVS_MC_PROFILE_CONFIG0_FE_DRAW_COUNT 0x0000000a
469+
#define VIVS_MC_PROFILE_CONFIG0_FE_OUT_VERTEX_COUNT 0x0000000b
470+
#define VIVS_MC_PROFILE_CONFIG0_FE_CACHE_MISS_COUNT 0x0000000c
468471
#define VIVS_MC_PROFILE_CONFIG0_FE_RESET 0x0000000f
472+
#define VIVS_MC_PROFILE_CONFIG0_FE_CACHE_LK_COUNT 0x00000010
473+
#define VIVS_MC_PROFILE_CONFIG0_FE_STALL_COUNT 0x00000011
474+
#define VIVS_MC_PROFILE_CONFIG0_FE_PROCESS_COUNT 0x00000012
469475
#define VIVS_MC_PROFILE_CONFIG0_DE__MASK 0x0000ff00
470476
#define VIVS_MC_PROFILE_CONFIG0_DE__SHIFT 8
471477
#define VIVS_MC_PROFILE_CONFIG0_DE_RESET 0x00000f00
@@ -499,11 +505,14 @@ DEALINGS IN THE SOFTWARE.
499505
#define VIVS_MC_PROFILE_CONFIG1_PA_DEPTH_CLIPPED_COUNTER 0x00000006
500506
#define VIVS_MC_PROFILE_CONFIG1_PA_TRIVIAL_REJECTED_COUNTER 0x00000007
501507
#define VIVS_MC_PROFILE_CONFIG1_PA_CULLED_COUNTER 0x00000008
508+
#define VIVS_MC_PROFILE_CONFIG1_PA_DROPED_PRIM_COUNTER 0x00000009
509+
#define VIVS_MC_PROFILE_CONFIG1_PA_FRUSTUM_CLIPPED_PRIM_COUNTER 0x0000000a
502510
#define VIVS_MC_PROFILE_CONFIG1_PA_RESET 0x0000000f
503511
#define VIVS_MC_PROFILE_CONFIG1_SE__MASK 0x0000ff00
504512
#define VIVS_MC_PROFILE_CONFIG1_SE__SHIFT 8
505513
#define VIVS_MC_PROFILE_CONFIG1_SE_CULLED_TRIANGLE_COUNT 0x00000000
506514
#define VIVS_MC_PROFILE_CONFIG1_SE_CULLED_LINES_COUNT 0x00000100
515+
#define VIVS_MC_PROFILE_CONFIG1_SE_TRIVIAL_REJECTED_LINE_COUNT 0x00000400
507516
#define VIVS_MC_PROFILE_CONFIG1_SE_RESET 0x00000f00
508517
#define VIVS_MC_PROFILE_CONFIG1_RA__MASK 0x00ff0000
509518
#define VIVS_MC_PROFILE_CONFIG1_RA__SHIFT 16
@@ -515,6 +524,8 @@ DEALINGS IN THE SOFTWARE.
515524
#define VIVS_MC_PROFILE_CONFIG1_RA_PREFETCH_CACHE_MISS_COUNTER 0x000a0000
516525
#define VIVS_MC_PROFILE_CONFIG1_RA_CULLED_QUAD_COUNT 0x000b0000
517526
#define VIVS_MC_PROFILE_CONFIG1_RA_RESET 0x000f0000
527+
#define VIVS_MC_PROFILE_CONFIG1_RA_PIPE_HZ_CACHE_MISS_COUNTER 0x00110000
528+
#define VIVS_MC_PROFILE_CONFIG1_RA_PREFETCH_HZ_CACHE_MISS_COUNTER 0x00120000
518529
#define VIVS_MC_PROFILE_CONFIG1_TX__MASK 0xff000000
519530
#define VIVS_MC_PROFILE_CONFIG1_TX__SHIFT 24
520531
#define VIVS_MC_PROFILE_CONFIG1_TX_TOTAL_BILINEAR_REQUESTS 0x00000000
@@ -535,13 +546,48 @@ DEALINGS IN THE SOFTWARE.
535546
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_READ_REQ_8B_FROM_PIPELINE 0x00000001
536547
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_READ_REQ_8B_FROM_IP 0x00000002
537548
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_WRITE_REQ_8B_FROM_PIPELINE 0x00000003
538-
#define VIVS_MC_PROFILE_CONFIG2_MC_RESET 0x0000000f
549+
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_READ_REQ_SENTOUT_FROM_COLORPIPE 0x00000004
550+
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_WRITE_REQ_FROM_COLORPIPE 0x00000005
551+
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_READ_REQ_8B_FROM_DEPTHPIPE 0x00000007
552+
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_READ_REQ_8B_SENTOUT_FROM_DEPTHPIPE 0x00000008
553+
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_WRITE_REQ_8B_FROM_DEPTHPIPE 0x00000009
554+
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_READ_REQ_SENTOUT_FROM_DEPTHPIPE 0x0000000a
555+
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_WRITE_REQ_FROM_DEPTHPIPE 0x0000000b
556+
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_READ_REQ_8B_FROM_OTHERS 0x0000000c
557+
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_WRITE_REQ_8B_FROM_OTHERS 0x0000000d
558+
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_READ_REQ_FROM_OTHERS 0x0000000e
559+
#define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_WRITE_REQ_FROM_OTHERS 0x0000000f
560+
#define VIVS_MC_PROFILE_CONFIG2_MC_FE_READ_BANDWIDTH 0x00000015
561+
#define VIVS_MC_PROFILE_CONFIG2_MC_MMU_READ_BANDWIDTH 0x00000016
562+
#define VIVS_MC_PROFILE_CONFIG2_MC_BLT_READ_BANDWIDTH 0x00000017
563+
#define VIVS_MC_PROFILE_CONFIG2_MC_SH0_READ_BANDWIDTH 0x00000018
564+
#define VIVS_MC_PROFILE_CONFIG2_MC_SH1_READ_BANDWIDTH 0x00000019
565+
#define VIVS_MC_PROFILE_CONFIG2_MC_PE_WRITE_BANDWIDTH 0x0000001a
566+
#define VIVS_MC_PROFILE_CONFIG2_MC_BLT_WRITE_BANDWIDTH 0x0000001b
567+
#define VIVS_MC_PROFILE_CONFIG2_MC_SH0_WRITE_BANDWIDTH 0x0000001c
568+
#define VIVS_MC_PROFILE_CONFIG2_MC_SH1_WRITE_BANDWIDTH 0x0000001d
539569
#define VIVS_MC_PROFILE_CONFIG2_HI__MASK 0x0000ff00
540570
#define VIVS_MC_PROFILE_CONFIG2_HI__SHIFT 8
541571
#define VIVS_MC_PROFILE_CONFIG2_HI_AXI_CYCLES_READ_REQUEST_STALLED 0x00000000
542572
#define VIVS_MC_PROFILE_CONFIG2_HI_AXI_CYCLES_WRITE_REQUEST_STALLED 0x00000100
543573
#define VIVS_MC_PROFILE_CONFIG2_HI_AXI_CYCLES_WRITE_DATA_STALLED 0x00000200
544574
#define VIVS_MC_PROFILE_CONFIG2_HI_RESET 0x00000f00
575+
#define VIVS_MC_PROFILE_CONFIG2_L2__MASK 0x00ff0000
576+
#define VIVS_MC_PROFILE_CONFIG2_L2__SHIFT 16
577+
#define VIVS_MC_PROFILE_CONFIG2_L2_TOTAL_AXI0_READ_REQUEST_COUNT 0x00000000
578+
#define VIVS_MC_PROFILE_CONFIG2_L2_TOTAL_AXI0_WRITE_REQUEST_COUNT 0x00040000
579+
#define VIVS_MC_PROFILE_CONFIG2_L2_TOTAL_AXI1_WRITE_REQUEST_COUNT 0x00050000
580+
#define VIVS_MC_PROFILE_CONFIG2_L2_TOTAL_READ_TRANSACTIONS_REQUEST_BY_AXI0 0x00080000
581+
#define VIVS_MC_PROFILE_CONFIG2_L2_TOTAL_READ_TRANSACTIONS_REQUEST_BY_AXI1 0x00090000
582+
#define VIVS_MC_PROFILE_CONFIG2_L2_TOTAL_WRITE_TRANSACTIONS_REQUEST_BY_AXI0 0x000c0000
583+
#define VIVS_MC_PROFILE_CONFIG2_L2_TOTAL_WRITE_TRANSACTIONS_REQUEST_BY_AXI1 0x000d0000
584+
#define VIVS_MC_PROFILE_CONFIG2_L2_RESET 0x000f0000
585+
#define VIVS_MC_PROFILE_CONFIG2_L2_AXI0_MINMAX_LATENCY 0x00100000
586+
#define VIVS_MC_PROFILE_CONFIG2_L2_AXI0_TOTAL_LATENCY 0x00110000
587+
#define VIVS_MC_PROFILE_CONFIG2_L2_AXI0_TOTAL_REQUEST_COUNT 0x00120000
588+
#define VIVS_MC_PROFILE_CONFIG2_L2_AXI1_MINMAX_LATENCY 0x00130000
589+
#define VIVS_MC_PROFILE_CONFIG2_L2_AXI1_TOTAL_LATENCY 0x00140000
590+
#define VIVS_MC_PROFILE_CONFIG2_L2_AXI1_TOTAL_REQUEST_COUNT 0x00150000
545591
#define VIVS_MC_PROFILE_CONFIG2_BLT__MASK 0xff000000
546592
#define VIVS_MC_PROFILE_CONFIG2_BLT__SHIFT 24
547593
#define VIVS_MC_PROFILE_CONFIG2_BLT_UNK0 0x00000000
@@ -566,5 +612,13 @@ DEALINGS IN THE SOFTWARE.
566612

567613
#define VIVS_MC_PROFILE_L2_READ 0x00000564
568614

615+
#define VIVS_MC_MC_LATENCY_RESET 0x00000568
616+
617+
#define VIVS_MC_MC_AXI_MAX_MIN_LATENCY 0x0000056c
618+
619+
#define VIVS_MC_MC_AXI_TOTAL_LATENCY 0x00000570
620+
621+
#define VIVS_MC_MC_AXI_SAMPLE_COUNT 0x00000574
622+
569623

570624
#endif /* STATE_HI_XML */

0 commit comments

Comments
 (0)