From b916b30f58313287ee92aa1933918a6dc16b3c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= Date: Thu, 19 May 2022 16:35:52 +0200 Subject: [PATCH] intel/tools: clean up mmio regs definitions Each unit has the same regs at the same offsets. Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/tools/intel_context.h | 56 ++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/src/intel/tools/intel_context.h b/src/intel/tools/intel_context.h index d03c210c607..b9c7142007d 100644 --- a/src/intel/tools/intel_context.h +++ b/src/intel/tools/intel_context.h @@ -43,29 +43,49 @@ #define MI_BATCH_BUFFER_END (0xA << 23) -#define HWS_PGA_RCSUNIT 0x02080 -#define HWS_PGA_VCSUNIT0 0x12080 -#define HWS_PGA_BCSUNIT 0x22080 +#define RCSUNIT_START 0x2000 +#define RCSUNIT_END 0x3fff -#define GFX_MODE_RCSUNIT 0x0229c -#define GFX_MODE_VCSUNIT0 0x1229c -#define GFX_MODE_BCSUNIT 0x2229c +#define VCSUNIT0_START 0x12000 +#define VCSUNIT0_END 0x13fff -#define EXECLIST_SUBMITPORT_RCSUNIT 0x02230 -#define EXECLIST_SUBMITPORT_VCSUNIT0 0x12230 -#define EXECLIST_SUBMITPORT_BCSUNIT 0x22230 +#define BCSUNIT0_START 0x22000 +#define BCSUNIT0_END 0x23fff -#define EXECLIST_STATUS_RCSUNIT 0x02234 -#define EXECLIST_STATUS_VCSUNIT0 0x12234 -#define EXECLIST_STATUS_BCSUNIT 0x22234 +#define HWS_PGA 0x080 +#define EXECLIST_SUBMITPORT 0x230 +#define EXECLIST_STATUS 0x234 +#define GFX_MODE 0x29c +#define EXECLIST_SQ_CONTENTS 0x510 +#define EXECLIST_CONTROL 0x550 -#define EXECLIST_SQ_CONTENTS0_RCSUNIT 0x02510 -#define EXECLIST_SQ_CONTENTS0_VCSUNIT0 0x12510 -#define EXECLIST_SQ_CONTENTS0_BCSUNIT 0x22510 +#define RCSUNIT(reg) (RCSUNIT_START + reg) +#define VCSUNIT0(reg) (VCSUNIT0_START + reg) +#define BCSUNIT0(reg) (BCSUNIT0_START + reg) -#define EXECLIST_CONTROL_RCSUNIT 0x02550 -#define EXECLIST_CONTROL_VCSUNIT0 0x12550 -#define EXECLIST_CONTROL_BCSUNIT 0x22550 +#define HWS_PGA_RCSUNIT RCSUNIT (HWS_PGA) +#define HWS_PGA_VCSUNIT0 VCSUNIT0(HWS_PGA) +#define HWS_PGA_BCSUNIT BCSUNIT0(HWS_PGA) + +#define GFX_MODE_RCSUNIT RCSUNIT (GFX_MODE) +#define GFX_MODE_VCSUNIT0 VCSUNIT0(GFX_MODE) +#define GFX_MODE_BCSUNIT BCSUNIT0(GFX_MODE) + +#define EXECLIST_SUBMITPORT_RCSUNIT RCSUNIT (EXECLIST_SUBMITPORT) +#define EXECLIST_SUBMITPORT_VCSUNIT0 VCSUNIT0(EXECLIST_SUBMITPORT) +#define EXECLIST_SUBMITPORT_BCSUNIT BCSUNIT0(EXECLIST_SUBMITPORT) + +#define EXECLIST_STATUS_RCSUNIT RCSUNIT (EXECLIST_STATUS) +#define EXECLIST_STATUS_VCSUNIT0 VCSUNIT0(EXECLIST_STATUS) +#define EXECLIST_STATUS_BCSUNIT BCSUNIT0(EXECLIST_STATUS) + +#define EXECLIST_SQ_CONTENTS0_RCSUNIT RCSUNIT (EXECLIST_SQ_CONTENTS) +#define EXECLIST_SQ_CONTENTS0_VCSUNIT0 VCSUNIT0(EXECLIST_SQ_CONTENTS) +#define EXECLIST_SQ_CONTENTS0_BCSUNIT BCSUNIT0(EXECLIST_SQ_CONTENTS) + +#define EXECLIST_CONTROL_RCSUNIT RCSUNIT (EXECLIST_CONTROL) +#define EXECLIST_CONTROL_VCSUNIT0 VCSUNIT0(EXECLIST_CONTROL) +#define EXECLIST_CONTROL_BCSUNIT BCSUNIT0(EXECLIST_CONTROL) #define MEMORY_MAP_SIZE (64 /* MiB */ * 1024 * 1024)