intel/tools: drop wrappers around mmio regs macros
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16664>
This commit is contained in:
Marcin Ślusarz
Marge Bot
parent
b916b30f58
commit
43ad5fd9b7
|
|
@ -185,7 +185,7 @@ handle_memtrace_reg_write(struct aub_read *read, const uint32_t *p)
|
|||
uint64_t context_descriptor;
|
||||
|
||||
switch (offset) {
|
||||
case EXECLIST_SUBMITPORT_RCSUNIT: /* render elsp */
|
||||
case RCSUNIT(EXECLIST_SUBMITPORT): /* render elsp */
|
||||
read->render_elsp[read->render_elsp_index++] = value;
|
||||
if (read->render_elsp_index < 4)
|
||||
return;
|
||||
|
|
@ -195,7 +195,7 @@ handle_memtrace_reg_write(struct aub_read *read, const uint32_t *p)
|
|||
context_descriptor = (uint64_t)read->render_elsp[2] << 32 |
|
||||
read->render_elsp[3];
|
||||
break;
|
||||
case EXECLIST_SUBMITPORT_VCSUNIT0: /* video elsp */
|
||||
case VCSUNIT0(EXECLIST_SUBMITPORT): /* video elsp */
|
||||
read->video_elsp[read->video_elsp_index++] = value;
|
||||
if (read->video_elsp_index < 4)
|
||||
return;
|
||||
|
|
@ -205,7 +205,7 @@ handle_memtrace_reg_write(struct aub_read *read, const uint32_t *p)
|
|||
context_descriptor = (uint64_t)read->video_elsp[2] << 32 |
|
||||
read->video_elsp[3];
|
||||
break;
|
||||
case EXECLIST_SUBMITPORT_BCSUNIT: /* blitter elsp */
|
||||
case BCSUNIT0(EXECLIST_SUBMITPORT): /* blitter elsp */
|
||||
read->blitter_elsp[read->blitter_elsp_index++] = value;
|
||||
if (read->blitter_elsp_index < 4)
|
||||
return;
|
||||
|
|
@ -215,35 +215,35 @@ handle_memtrace_reg_write(struct aub_read *read, const uint32_t *p)
|
|||
context_descriptor = (uint64_t)read->blitter_elsp[2] << 32 |
|
||||
read->blitter_elsp[3];
|
||||
break;
|
||||
case EXECLIST_SQ_CONTENTS0_RCSUNIT: /* render elsq0 lo */
|
||||
case RCSUNIT(EXECLIST_SQ_CONTENTS): /* render elsq0 lo */
|
||||
read->render_elsp[3] = value;
|
||||
return;
|
||||
case (EXECLIST_SQ_CONTENTS0_RCSUNIT + 4): /* render elsq0 hi */
|
||||
case RCSUNIT(EXECLIST_SQ_CONTENTS) + 4: /* render elsq0 hi */
|
||||
read->render_elsp[2] = value;
|
||||
return;
|
||||
case EXECLIST_SQ_CONTENTS0_VCSUNIT0: /* video elsq0 lo */
|
||||
case VCSUNIT0(EXECLIST_SQ_CONTENTS): /* video elsq0 lo */
|
||||
read->video_elsp[3] = value;
|
||||
return;
|
||||
case EXECLIST_SQ_CONTENTS0_VCSUNIT0 + 4: /* video elsq0 hi */
|
||||
case VCSUNIT0(EXECLIST_SQ_CONTENTS) + 4: /* video elsq0 hi */
|
||||
read->video_elsp[2] = value;
|
||||
return;
|
||||
case EXECLIST_SQ_CONTENTS0_BCSUNIT: /* blitter elsq0 lo */
|
||||
case BCSUNIT0(EXECLIST_SQ_CONTENTS): /* blitter elsq0 lo */
|
||||
read->blitter_elsp[3] = value;
|
||||
return;
|
||||
case (EXECLIST_SQ_CONTENTS0_BCSUNIT + 4): /* blitter elsq0 hi */
|
||||
case BCSUNIT0(EXECLIST_SQ_CONTENTS) + 4: /* blitter elsq0 hi */
|
||||
read->blitter_elsp[2] = value;
|
||||
return;
|
||||
case EXECLIST_CONTROL_RCSUNIT: /* render elsc */
|
||||
case RCSUNIT(EXECLIST_CONTROL): /* render elsc */
|
||||
engine = I915_ENGINE_CLASS_RENDER;
|
||||
context_descriptor = (uint64_t)read->render_elsp[2] << 32 |
|
||||
read->render_elsp[3];
|
||||
break;
|
||||
case EXECLIST_CONTROL_VCSUNIT0: /* video_elsc */
|
||||
case VCSUNIT0(EXECLIST_CONTROL): /* video_elsc */
|
||||
engine = I915_ENGINE_CLASS_VIDEO;
|
||||
context_descriptor = (uint64_t)read->video_elsp[2] << 32 |
|
||||
read->video_elsp[3];
|
||||
break;
|
||||
case EXECLIST_CONTROL_BCSUNIT: /* blitter elsc */
|
||||
case BCSUNIT0(EXECLIST_CONTROL): /* blitter elsc */
|
||||
engine = I915_ENGINE_CLASS_COPY;
|
||||
context_descriptor = (uint64_t)read->blitter_elsp[2] << 32 |
|
||||
read->blitter_elsp[3];
|
||||
|
|
|
|||
|
|
@ -359,28 +359,28 @@ static const struct engine {
|
|||
.name = "RENDER",
|
||||
.engine_class = I915_ENGINE_CLASS_RENDER,
|
||||
.hw_class = 1,
|
||||
.elsp_reg = EXECLIST_SUBMITPORT_RCSUNIT,
|
||||
.elsq_reg = EXECLIST_SQ_CONTENTS0_RCSUNIT,
|
||||
.status_reg = EXECLIST_STATUS_RCSUNIT,
|
||||
.control_reg = EXECLIST_CONTROL_RCSUNIT,
|
||||
.elsp_reg = RCSUNIT(EXECLIST_SUBMITPORT),
|
||||
.elsq_reg = RCSUNIT(EXECLIST_SQ_CONTENTS),
|
||||
.status_reg = RCSUNIT(EXECLIST_STATUS),
|
||||
.control_reg = RCSUNIT(EXECLIST_CONTROL),
|
||||
},
|
||||
[I915_ENGINE_CLASS_VIDEO] = {
|
||||
.name = "VIDEO",
|
||||
.engine_class = I915_ENGINE_CLASS_VIDEO,
|
||||
.hw_class = 3,
|
||||
.elsp_reg = EXECLIST_SUBMITPORT_VCSUNIT0,
|
||||
.elsq_reg = EXECLIST_SQ_CONTENTS0_VCSUNIT0,
|
||||
.status_reg = EXECLIST_STATUS_VCSUNIT0,
|
||||
.control_reg = EXECLIST_CONTROL_VCSUNIT0,
|
||||
.elsp_reg = VCSUNIT0(EXECLIST_SUBMITPORT),
|
||||
.elsq_reg = VCSUNIT0(EXECLIST_SQ_CONTENTS),
|
||||
.status_reg = VCSUNIT0(EXECLIST_STATUS),
|
||||
.control_reg = VCSUNIT0(EXECLIST_CONTROL),
|
||||
},
|
||||
[I915_ENGINE_CLASS_COPY] = {
|
||||
.name = "BLITTER",
|
||||
.engine_class = I915_ENGINE_CLASS_COPY,
|
||||
.hw_class = 2,
|
||||
.elsp_reg = EXECLIST_SUBMITPORT_BCSUNIT,
|
||||
.elsq_reg = EXECLIST_SQ_CONTENTS0_BCSUNIT,
|
||||
.status_reg = EXECLIST_STATUS_BCSUNIT,
|
||||
.control_reg = EXECLIST_CONTROL_BCSUNIT,
|
||||
.elsp_reg = BCSUNIT0(EXECLIST_SUBMITPORT),
|
||||
.elsq_reg = BCSUNIT0(EXECLIST_SQ_CONTENTS),
|
||||
.status_reg = BCSUNIT0(EXECLIST_STATUS),
|
||||
.control_reg = BCSUNIT0(EXECLIST_CONTROL),
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -504,9 +504,9 @@ write_hwsp(struct aub_file *aub,
|
|||
{
|
||||
uint32_t reg = 0;
|
||||
switch (engine_class) {
|
||||
case I915_ENGINE_CLASS_RENDER: reg = HWS_PGA_RCSUNIT; break;
|
||||
case I915_ENGINE_CLASS_COPY: reg = HWS_PGA_BCSUNIT; break;
|
||||
case I915_ENGINE_CLASS_VIDEO: reg = HWS_PGA_VCSUNIT0; break;
|
||||
case I915_ENGINE_CLASS_RENDER: reg = RCSUNIT (HWS_PGA); break;
|
||||
case I915_ENGINE_CLASS_COPY: reg = BCSUNIT0(HWS_PGA); break;
|
||||
case I915_ENGINE_CLASS_VIDEO: reg = VCSUNIT0(HWS_PGA); break;
|
||||
default:
|
||||
unreachable("unknown ring");
|
||||
}
|
||||
|
|
@ -571,9 +571,9 @@ write_engine_execlist_setup(struct aub_file *aub,
|
|||
static void
|
||||
write_execlists_default_setup(struct aub_file *aub)
|
||||
{
|
||||
register_write_out(aub, GFX_MODE_RCSUNIT, 0x80008000 /* execlist enable */);
|
||||
register_write_out(aub, GFX_MODE_VCSUNIT0, 0x80008000 /* execlist enable */);
|
||||
register_write_out(aub, GFX_MODE_BCSUNIT, 0x80008000 /* execlist enable */);
|
||||
register_write_out(aub, RCSUNIT(GFX_MODE), 0x80008000 /* execlist enable */);
|
||||
register_write_out(aub, VCSUNIT0(GFX_MODE), 0x80008000 /* execlist enable */);
|
||||
register_write_out(aub, BCSUNIT0(GFX_MODE), 0x80008000 /* execlist enable */);
|
||||
}
|
||||
|
||||
static void write_legacy_default_setup(struct aub_file *aub)
|
||||
|
|
|
|||
|
|
@ -63,30 +63,6 @@
|
|||
#define VCSUNIT0(reg) (VCSUNIT0_START + reg)
|
||||
#define BCSUNIT0(reg) (BCSUNIT0_START + reg)
|
||||
|
||||
#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)
|
||||
|
||||
#define PTE_SIZE 4
|
||||
|
|
|
|||
Loading…
Reference in New Issue