* [igt-dev] [PATCH i-g-t 0/2] Start using intel_gpu_commands.h header
@ 2023-03-03 12:55 Zbigniew Kempczyński
2023-03-03 12:55 ` [igt-dev] [PATCH i-g-t 1/2] intel_gpu_commands: Use kernel copy commands definition Zbigniew Kempczyński
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Zbigniew Kempczyński @ 2023-03-03 12:55 UTC (permalink / raw)
To: igt-dev
Reduce code duplication by using kernel intel_gpu_commands.h header.
Zbigniew Kempczyński (2):
intel_gpu_commands: Use kernel copy commands definition
igt: Remove duplicated macros
benchmarks/gem_wsim.c | 6 +-
include/intel_gpu_commands.h | 470 +++++++++++++++++++++++
include/intel_gpu_commands_staging.h | 18 +
include/linux/bitops.h | 10 +
include/linux_scaffold.h | 50 +++
lib/gen4_render.h | 2 -
lib/gen7_media.h | 2 -
lib/gen7_render.h | 3 -
lib/gen8_media.h | 2 -
lib/huc_copy.c | 6 +-
lib/huc_copy.h | 2 +-
lib/i830_reg.h | 16 -
lib/i915/i915_blt.h | 4 +-
lib/i915/i915_crc.c | 15 +-
lib/igt_draw.c | 4 +-
lib/igt_dummyload.c | 2 +-
lib/igt_store.c | 2 +-
lib/intel_allocator.h | 8 +-
lib/intel_aux_pgtable.c | 5 +-
lib/intel_batchbuffer.c | 12 +-
lib/intel_bufops.c | 7 +
lib/intel_reg.h | 69 +---
lib/ioctl_wrappers.h | 4 +-
lib/rendercopy_gen9.c | 9 +-
meson.build | 2 +-
tests/i915/api_intel_bb.c | 2 +-
tests/i915/gem_blits.c | 20 +-
tests/i915/gem_busy.c | 8 +-
tests/i915/gem_ccs.c | 2 +-
tests/i915/gem_ctx_shared.c | 4 +-
tests/i915/gem_exec_async.c | 2 +-
tests/i915/gem_exec_balancer.c | 23 +-
tests/i915/gem_exec_capture.c | 4 +-
tests/i915/gem_exec_endless.c | 13 +-
tests/i915/gem_exec_fair.c | 18 +-
tests/i915/gem_exec_fence.c | 43 +--
tests/i915/gem_exec_flush.c | 6 +-
tests/i915/gem_exec_gttfill.c | 2 +-
tests/i915/gem_exec_nop.c | 4 +-
tests/i915/gem_exec_parallel.c | 2 +-
tests/i915/gem_exec_params.c | 4 +-
tests/i915/gem_exec_reloc.c | 29 +-
tests/i915/gem_exec_schedule.c | 43 +--
tests/i915/gem_exec_store.c | 6 +-
tests/i915/gem_exec_suspend.c | 2 +-
tests/i915/gem_exec_whisper.c | 2 +-
tests/i915/gem_pipe_control_store_loop.c | 11 +-
tests/i915/gem_pxp.c | 7 +-
tests/i915/gem_ringfill.c | 2 +-
tests/i915/gem_softpin.c | 16 +-
tests/i915/gem_sync.c | 16 +-
tests/i915/gem_userptr_blits.c | 6 +-
tests/i915/gem_vm_create.c | 2 +-
tests/i915/gem_watchdog.c | 6 +-
tests/i915/gem_workarounds.c | 2 +-
tests/i915/gen7_exec_parse.c | 34 +-
tests/i915/gen9_exec_parse.c | 47 +--
tests/i915/i915_module_load.c | 2 +-
tests/i915/perf.c | 17 +-
tests/i915/perf_pmu.c | 18 +-
tests/i915/sysfs_timeslice_duration.c | 17 +-
tests/prime_vgem.c | 2 +-
tools/intel_audio_dump.c | 1 +
tools/intel_reg.c | 2 +-
64 files changed, 759 insertions(+), 418 deletions(-)
create mode 100644 include/intel_gpu_commands.h
create mode 100644 include/intel_gpu_commands_staging.h
create mode 100644 include/linux/bitops.h
create mode 100644 include/linux_scaffold.h
--
2.34.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [igt-dev] [PATCH i-g-t 1/2] intel_gpu_commands: Use kernel copy commands definition 2023-03-03 12:55 [igt-dev] [PATCH i-g-t 0/2] Start using intel_gpu_commands.h header Zbigniew Kempczyński @ 2023-03-03 12:55 ` Zbigniew Kempczyński 2023-03-06 14:11 ` Kamil Konieczny 2023-03-03 12:55 ` [igt-dev] [PATCH i-g-t 2/2] igt: Remove duplicated macros Zbigniew Kempczyński ` (2 subsequent siblings) 3 siblings, 1 reply; 11+ messages in thread From: Zbigniew Kempczyński @ 2023-03-03 12:55 UTC (permalink / raw) To: igt-dev i915 has nicely collected command macros in one file. We want to use this pattern (file) and remove duplicated definitions. Unfortunately command file uses includes which don't exists in userspace, so we need to import minimal set of kernel includes to ensure we will have verbatim copy in the future. Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> Cc: Petri Latvala <adrinael@adrinael.net> Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com> --- include/intel_gpu_commands.h | 470 +++++++++++++++++++++++++++++++++++ include/linux/bitops.h | 8 + include/linux_scaffold.h | 50 ++++ meson.build | 2 +- 4 files changed, 529 insertions(+), 1 deletion(-) create mode 100644 include/intel_gpu_commands.h create mode 100644 include/linux/bitops.h create mode 100644 include/linux_scaffold.h diff --git a/include/intel_gpu_commands.h b/include/intel_gpu_commands.h new file mode 100644 index 0000000000..e10507fa71 --- /dev/null +++ b/include/intel_gpu_commands.h @@ -0,0 +1,470 @@ +/* SPDX-License-Identifier: MIT*/ +/* + * Copyright © 2003-2018 Intel Corporation + */ + +#ifndef _INTEL_GPU_COMMANDS_H_ +#define _INTEL_GPU_COMMANDS_H_ + +#include <linux/bitops.h> + +/* + * Target address alignments required for GPU access e.g. + * MI_STORE_DWORD_IMM. + */ +#define alignof_dword 4 +#define alignof_qword 8 + +/* + * Instruction field definitions used by the command parser + */ +#define INSTR_CLIENT_SHIFT 29 +#define INSTR_MI_CLIENT 0x0 +#define INSTR_BC_CLIENT 0x2 +#define INSTR_GSC_CLIENT 0x2 /* MTL+ */ +#define INSTR_RC_CLIENT 0x3 +#define INSTR_SUBCLIENT_SHIFT 27 +#define INSTR_SUBCLIENT_MASK 0x18000000 +#define INSTR_MEDIA_SUBCLIENT 0x2 +#define INSTR_26_TO_24_MASK 0x7000000 +#define INSTR_26_TO_24_SHIFT 24 + +#define __INSTR(client) ((client) << INSTR_CLIENT_SHIFT) + +/* + * Memory interface instructions used by the kernel + */ +#define MI_INSTR(opcode, flags) \ + (__INSTR(INSTR_MI_CLIENT) | (opcode) << 23 | (flags)) +/* Many MI commands use bit 22 of the header dword for GGTT vs PPGTT */ +#define MI_GLOBAL_GTT (1<<22) + +#define MI_NOOP MI_INSTR(0, 0) +#define MI_SET_PREDICATE MI_INSTR(0x01, 0) +#define MI_SET_PREDICATE_DISABLE (0 << 0) +#define MI_USER_INTERRUPT MI_INSTR(0x02, 0) +#define MI_WAIT_FOR_EVENT MI_INSTR(0x03, 0) +#define MI_WAIT_FOR_OVERLAY_FLIP (1<<16) +#define MI_WAIT_FOR_PLANE_B_FLIP (1<<6) +#define MI_WAIT_FOR_PLANE_A_FLIP (1<<2) +#define MI_WAIT_FOR_PLANE_A_SCANLINES (1<<1) +#define MI_FLUSH MI_INSTR(0x04, 0) +#define MI_READ_FLUSH (1 << 0) +#define MI_EXE_FLUSH (1 << 1) +#define MI_NO_WRITE_FLUSH (1 << 2) +#define MI_SCENE_COUNT (1 << 3) /* just increment scene count */ +#define MI_END_SCENE (1 << 4) /* flush binner and incr scene count */ +#define MI_INVALIDATE_ISP (1 << 5) /* invalidate indirect state pointers */ +#define MI_REPORT_HEAD MI_INSTR(0x07, 0) +#define MI_ARB_ON_OFF MI_INSTR(0x08, 0) +#define MI_ARB_ENABLE (1<<0) +#define MI_ARB_DISABLE (0<<0) +#define MI_BATCH_BUFFER_END MI_INSTR(0x0a, 0) +#define MI_SUSPEND_FLUSH MI_INSTR(0x0b, 0) +#define MI_SUSPEND_FLUSH_EN (1<<0) +#define MI_SET_APPID MI_INSTR(0x0e, 0) +#define MI_SET_APPID_SESSION_ID(x) ((x) << 0) +#define MI_OVERLAY_FLIP MI_INSTR(0x11, 0) +#define MI_OVERLAY_CONTINUE (0x0<<21) +#define MI_OVERLAY_ON (0x1<<21) +#define MI_OVERLAY_OFF (0x2<<21) +#define MI_LOAD_SCAN_LINES_INCL MI_INSTR(0x12, 0) +#define MI_DISPLAY_FLIP MI_INSTR(0x14, 2) +#define MI_DISPLAY_FLIP_I915 MI_INSTR(0x14, 1) +#define MI_DISPLAY_FLIP_PLANE(n) ((n) << 20) +/* IVB has funny definitions for which plane to flip. */ +#define MI_DISPLAY_FLIP_IVB_PLANE_A (0 << 19) +#define MI_DISPLAY_FLIP_IVB_PLANE_B (1 << 19) +#define MI_DISPLAY_FLIP_IVB_SPRITE_A (2 << 19) +#define MI_DISPLAY_FLIP_IVB_SPRITE_B (3 << 19) +#define MI_DISPLAY_FLIP_IVB_PLANE_C (4 << 19) +#define MI_DISPLAY_FLIP_IVB_SPRITE_C (5 << 19) +/* SKL ones */ +#define MI_DISPLAY_FLIP_SKL_PLANE_1_A (0 << 8) +#define MI_DISPLAY_FLIP_SKL_PLANE_1_B (1 << 8) +#define MI_DISPLAY_FLIP_SKL_PLANE_1_C (2 << 8) +#define MI_DISPLAY_FLIP_SKL_PLANE_2_A (4 << 8) +#define MI_DISPLAY_FLIP_SKL_PLANE_2_B (5 << 8) +#define MI_DISPLAY_FLIP_SKL_PLANE_2_C (6 << 8) +#define MI_DISPLAY_FLIP_SKL_PLANE_3_A (7 << 8) +#define MI_DISPLAY_FLIP_SKL_PLANE_3_B (8 << 8) +#define MI_DISPLAY_FLIP_SKL_PLANE_3_C (9 << 8) +#define MI_SEMAPHORE_MBOX MI_INSTR(0x16, 1) /* gen6, gen7 */ +#define MI_SEMAPHORE_GLOBAL_GTT (1<<22) +#define MI_SEMAPHORE_UPDATE (1<<21) +#define MI_SEMAPHORE_COMPARE (1<<20) +#define MI_SEMAPHORE_REGISTER (1<<18) +#define MI_SEMAPHORE_SYNC_VR (0<<16) /* RCS wait for VCS (RVSYNC) */ +#define MI_SEMAPHORE_SYNC_VER (1<<16) /* RCS wait for VECS (RVESYNC) */ +#define MI_SEMAPHORE_SYNC_BR (2<<16) /* RCS wait for BCS (RBSYNC) */ +#define MI_SEMAPHORE_SYNC_BV (0<<16) /* VCS wait for BCS (VBSYNC) */ +#define MI_SEMAPHORE_SYNC_VEV (1<<16) /* VCS wait for VECS (VVESYNC) */ +#define MI_SEMAPHORE_SYNC_RV (2<<16) /* VCS wait for RCS (VRSYNC) */ +#define MI_SEMAPHORE_SYNC_RB (0<<16) /* BCS wait for RCS (BRSYNC) */ +#define MI_SEMAPHORE_SYNC_VEB (1<<16) /* BCS wait for VECS (BVESYNC) */ +#define MI_SEMAPHORE_SYNC_VB (2<<16) /* BCS wait for VCS (BVSYNC) */ +#define MI_SEMAPHORE_SYNC_BVE (0<<16) /* VECS wait for BCS (VEBSYNC) */ +#define MI_SEMAPHORE_SYNC_VVE (1<<16) /* VECS wait for VCS (VEVSYNC) */ +#define MI_SEMAPHORE_SYNC_RVE (2<<16) /* VECS wait for RCS (VERSYNC) */ +#define MI_SEMAPHORE_SYNC_INVALID (3<<16) +#define MI_SEMAPHORE_SYNC_MASK (3<<16) +#define MI_SET_CONTEXT MI_INSTR(0x18, 0) +#define MI_MM_SPACE_GTT (1<<8) +#define MI_MM_SPACE_PHYSICAL (0<<8) +#define MI_SAVE_EXT_STATE_EN (1<<3) +#define MI_RESTORE_EXT_STATE_EN (1<<2) +#define MI_FORCE_RESTORE (1<<1) +#define MI_RESTORE_INHIBIT (1<<0) +#define HSW_MI_RS_SAVE_STATE_EN (1<<3) +#define HSW_MI_RS_RESTORE_STATE_EN (1<<2) +#define MI_SEMAPHORE_SIGNAL MI_INSTR(0x1b, 0) /* GEN8+ */ +#define MI_SEMAPHORE_TARGET(engine) ((engine)<<15) +#define MI_SEMAPHORE_WAIT MI_INSTR(0x1c, 2) /* GEN8+ */ +#define MI_SEMAPHORE_WAIT_TOKEN MI_INSTR(0x1c, 3) /* GEN12+ */ +#define MI_SEMAPHORE_POLL (1 << 15) +#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) +#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) +#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) +#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) +#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) +#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) +#define MI_SEMAPHORE_TOKEN_MASK REG_GENMASK(9, 5) +#define MI_SEMAPHORE_TOKEN_SHIFT 5 +#define MI_STORE_DATA_IMM MI_INSTR(0x20, 0) +#define MI_STORE_DWORD_IMM MI_INSTR(0x20, 1) +#define MI_STORE_DWORD_IMM_GEN4 MI_INSTR(0x20, 2) +#define MI_STORE_QWORD_IMM_GEN8 (MI_INSTR(0x20, 3) | REG_BIT(21)) +#define MI_MEM_VIRTUAL (1 << 22) /* 945,g33,965 */ +#define MI_USE_GGTT (1 << 22) /* g4x+ */ +#define MI_STORE_DWORD_INDEX MI_INSTR(0x21, 1) +#define MI_ATOMIC MI_INSTR(0x2f, 1) +#define MI_ATOMIC_INLINE (MI_INSTR(0x2f, 9) | MI_ATOMIC_INLINE_DATA) +#define MI_ATOMIC_GLOBAL_GTT (1 << 22) +#define MI_ATOMIC_INLINE_DATA (1 << 18) +#define MI_ATOMIC_CS_STALL (1 << 17) +#define MI_ATOMIC_MOVE (0x4 << 8) + +/* + * Official intel docs are somewhat sloppy concerning MI_LOAD_REGISTER_IMM: + * - Always issue a MI_NOOP _before_ the MI_LOAD_REGISTER_IMM - otherwise hw + * simply ignores the register load under certain conditions. + * - One can actually load arbitrary many arbitrary registers: Simply issue x + * address/value pairs. Don't overdue it, though, x <= 2^4 must hold! + */ +#define MI_LOAD_REGISTER_IMM(x) MI_INSTR(0x22, 2*(x)-1) +/* Gen11+. addr = base + (ctx_restore ? offset & GENMASK(12,2) : offset) */ +#define MI_LRI_LRM_CS_MMIO REG_BIT(19) +#define MI_LRI_MMIO_REMAP_EN REG_BIT(17) +#define MI_LRI_FORCE_POSTED (1<<12) +#define MI_LOAD_REGISTER_IMM_MAX_REGS (126) +#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 1) +#define MI_STORE_REGISTER_MEM_GEN8 MI_INSTR(0x24, 2) +#define MI_SRM_LRM_GLOBAL_GTT (1<<22) +#define MI_FLUSH_DW MI_INSTR(0x26, 1) /* for GEN6 */ +#define MI_FLUSH_DW_PROTECTED_MEM_EN (1 << 22) +#define MI_FLUSH_DW_STORE_INDEX (1<<21) +#define MI_INVALIDATE_TLB (1<<18) +#define MI_FLUSH_DW_CCS (1<<16) +#define MI_FLUSH_DW_OP_STOREDW (1<<14) +#define MI_FLUSH_DW_OP_MASK (3<<14) +#define MI_FLUSH_DW_LLC (1<<9) +#define MI_FLUSH_DW_NOTIFY (1<<8) +#define MI_INVALIDATE_BSD (1<<7) +#define MI_FLUSH_DW_USE_GTT (1<<2) +#define MI_FLUSH_DW_USE_PPGTT (0<<2) +#define MI_LOAD_REGISTER_MEM MI_INSTR(0x29, 1) +#define MI_LOAD_REGISTER_MEM_GEN8 MI_INSTR(0x29, 2) +#define MI_LOAD_REGISTER_REG MI_INSTR(0x2A, 1) +#define MI_LRR_SOURCE_CS_MMIO REG_BIT(18) +#define MI_BATCH_BUFFER MI_INSTR(0x30, 1) +#define MI_BATCH_NON_SECURE (1) +/* for snb/ivb/vlv this also means "batch in ppgtt" when ppgtt is enabled. */ +#define MI_BATCH_NON_SECURE_I965 (1<<8) +#define MI_BATCH_PPGTT_HSW (1<<8) +#define MI_BATCH_NON_SECURE_HSW (1<<13) +#define MI_BATCH_BUFFER_START MI_INSTR(0x31, 0) +#define MI_BATCH_GTT (2<<6) /* aliased with (1<<7) on gen4 */ +#define MI_BATCH_BUFFER_START_GEN8 MI_INSTR(0x31, 1) +#define MI_BATCH_RESOURCE_STREAMER REG_BIT(10) +#define MI_BATCH_PREDICATE REG_BIT(15) /* HSW+ on RCS only*/ + +#define MI_OPCODE(x) (((x) >> 23) & 0x3f) +#define IS_MI_LRI_CMD(x) (MI_OPCODE(x) == MI_OPCODE(MI_INSTR(0x22, 0))) +#define MI_LRI_LEN(x) (((x) & 0xff) + 1) + +/* + * 3D instructions used by the kernel + */ +#define GFX_INSTR(opcode, flags) ((0x3 << 29) | ((opcode) << 24) | (flags)) + +#define GEN9_MEDIA_POOL_STATE ((0x3 << 29) | (0x2 << 27) | (0x5 << 16) | 4) +#define GEN9_MEDIA_POOL_ENABLE (1 << 31) +#define GFX_OP_RASTER_RULES ((0x3<<29)|(0x7<<24)) +#define GFX_OP_SCISSOR ((0x3<<29)|(0x1c<<24)|(0x10<<19)) +#define SC_UPDATE_SCISSOR (0x1<<1) +#define SC_ENABLE_MASK (0x1<<0) +#define SC_ENABLE (0x1<<0) +#define GFX_OP_LOAD_INDIRECT ((0x3<<29)|(0x1d<<24)|(0x7<<16)) +#define GFX_OP_SCISSOR_INFO ((0x3<<29)|(0x1d<<24)|(0x81<<16)|(0x1)) +#define SCI_YMIN_MASK (0xffff<<16) +#define SCI_XMIN_MASK (0xffff<<0) +#define SCI_YMAX_MASK (0xffff<<16) +#define SCI_XMAX_MASK (0xffff<<0) +#define GFX_OP_SCISSOR_ENABLE ((0x3<<29)|(0x1c<<24)|(0x10<<19)) +#define GFX_OP_SCISSOR_RECT ((0x3<<29)|(0x1d<<24)|(0x81<<16)|1) +#define GFX_OP_COLOR_FACTOR ((0x3<<29)|(0x1d<<24)|(0x1<<16)|0x0) +#define GFX_OP_STIPPLE ((0x3<<29)|(0x1d<<24)|(0x83<<16)) +#define GFX_OP_MAP_INFO ((0x3<<29)|(0x1d<<24)|0x4) +#define GFX_OP_DESTBUFFER_VARS ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0) +#define GFX_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1) +#define GFX_OP_DRAWRECT_INFO ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3)) +#define GFX_OP_DRAWRECT_INFO_I965 ((0x7900<<16)|0x2) + +#define XY_CTRL_SURF_INSTR_SIZE 5 +#define MI_FLUSH_DW_SIZE 3 +#define XY_CTRL_SURF_COPY_BLT ((2 << 29) | (0x48 << 22) | 3) +#define SRC_ACCESS_TYPE_SHIFT 21 +#define DST_ACCESS_TYPE_SHIFT 20 +#define CCS_SIZE_MASK 0x3FF +#define CCS_SIZE_SHIFT 8 +#define XY_CTRL_SURF_MOCS_MASK GENMASK(31, 25) +#define NUM_CCS_BYTES_PER_BLOCK 256 +#define NUM_BYTES_PER_CCS_BYTE 256 +#define NUM_CCS_BLKS_PER_XFER 1024 +#define INDIRECT_ACCESS 0 +#define DIRECT_ACCESS 1 + +#define COLOR_BLT_CMD (2 << 29 | 0x40 << 22 | (5 - 2)) +#define XY_COLOR_BLT_CMD (2 << 29 | 0x50 << 22) +#define XY_FAST_COLOR_BLT_CMD (2 << 29 | 0x44 << 22) +#define XY_FAST_COLOR_BLT_DEPTH_32 (2 << 19) +#define XY_FAST_COLOR_BLT_DW 16 +#define XY_FAST_COLOR_BLT_MOCS_MASK GENMASK(27, 21) +#define XY_FAST_COLOR_BLT_MEM_TYPE_SHIFT 31 + +#define XY_FAST_COPY_BLT_D0_SRC_TILING_MASK REG_GENMASK(21, 20) +#define XY_FAST_COPY_BLT_D0_DST_TILING_MASK REG_GENMASK(14, 13) +#define XY_FAST_COPY_BLT_D0_SRC_TILE_MODE(mode) \ + REG_FIELD_PREP(XY_FAST_COPY_BLT_D0_SRC_TILING_MASK, mode) +#define XY_FAST_COPY_BLT_D0_DST_TILE_MODE(mode) \ + REG_FIELD_PREP(XY_FAST_COPY_BLT_D0_DST_TILING_MASK, mode) +#define LINEAR 0 +#define TILE_X 0x1 +#define XMAJOR 0x1 +#define YMAJOR 0x2 +#define TILE_64 0x3 +#define XY_FAST_COPY_BLT_D1_SRC_TILE4 REG_BIT(31) +#define XY_FAST_COPY_BLT_D1_DST_TILE4 REG_BIT(30) +#define BLIT_CCTL_SRC_MOCS_MASK REG_GENMASK(6, 0) +#define BLIT_CCTL_DST_MOCS_MASK REG_GENMASK(14, 8) +/* Note: MOCS value = (index << 1) */ +#define BLIT_CCTL_SRC_MOCS(idx) \ + REG_FIELD_PREP(BLIT_CCTL_SRC_MOCS_MASK, (idx) << 1) +#define BLIT_CCTL_DST_MOCS(idx) \ + REG_FIELD_PREP(BLIT_CCTL_DST_MOCS_MASK, (idx) << 1) + +#define SRC_COPY_BLT_CMD (2 << 29 | 0x43 << 22) +#define GEN9_XY_FAST_COPY_BLT_CMD (2 << 29 | 0x42 << 22) +#define XY_SRC_COPY_BLT_CMD (2 << 29 | 0x53 << 22) +#define XY_MONO_SRC_COPY_IMM_BLT (2 << 29 | 0x71 << 22 | 5) +#define BLT_WRITE_A (2<<20) +#define BLT_WRITE_RGB (1<<20) +#define BLT_WRITE_RGBA (BLT_WRITE_RGB | BLT_WRITE_A) +#define BLT_DEPTH_8 (0<<24) +#define BLT_DEPTH_16_565 (1<<24) +#define BLT_DEPTH_16_1555 (2<<24) +#define BLT_DEPTH_32 (3<<24) +#define BLT_ROP_SRC_COPY (0xcc<<16) +#define BLT_ROP_COLOR_COPY (0xf0<<16) +#define XY_SRC_COPY_BLT_SRC_TILED (1<<15) /* 965+ only */ +#define XY_SRC_COPY_BLT_DST_TILED (1<<11) /* 965+ only */ +#define CMD_OP_DISPLAYBUFFER_INFO ((0x0<<29)|(0x14<<23)|2) +#define ASYNC_FLIP (1<<22) +#define DISPLAY_PLANE_A (0<<20) +#define DISPLAY_PLANE_B (1<<20) +#define GFX_OP_PIPE_CONTROL(len) ((0x3<<29)|(0x3<<27)|(0x2<<24)|((len)-2)) +#define PIPE_CONTROL_COMMAND_CACHE_INVALIDATE (1<<29) /* gen11+ */ +#define PIPE_CONTROL_TILE_CACHE_FLUSH (1<<28) /* gen11+ */ +#define PIPE_CONTROL_FLUSH_L3 (1<<27) +#define PIPE_CONTROL_AMFS_FLUSH (1<<25) /* gen12+ */ +#define PIPE_CONTROL_GLOBAL_GTT_IVB (1<<24) /* gen7+ */ +#define PIPE_CONTROL_MMIO_WRITE (1<<23) +#define PIPE_CONTROL_STORE_DATA_INDEX (1<<21) +#define PIPE_CONTROL_CS_STALL (1<<20) +#define PIPE_CONTROL_GLOBAL_SNAPSHOT_RESET (1<<19) +#define PIPE_CONTROL_TLB_INVALIDATE (1<<18) +#define PIPE_CONTROL_PSD_SYNC (1<<17) /* gen11+ */ +#define PIPE_CONTROL_MEDIA_STATE_CLEAR (1<<16) +#define PIPE_CONTROL_WRITE_TIMESTAMP (3<<14) +#define PIPE_CONTROL_QW_WRITE (1<<14) +#define PIPE_CONTROL_POST_SYNC_OP_MASK (3<<14) +#define PIPE_CONTROL_DEPTH_STALL (1<<13) +#define PIPE_CONTROL_WRITE_FLUSH (1<<12) +#define PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH (1<<12) /* gen6+ */ +#define PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE (1<<11) /* MBZ on ILK */ +#define PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE (1<<10) /* GM45+ only */ +#define PIPE_CONTROL_INDIRECT_STATE_DISABLE (1<<9) +#define PIPE_CONTROL0_HDC_PIPELINE_FLUSH REG_BIT(9) /* gen12 */ +#define PIPE_CONTROL_NOTIFY (1<<8) +#define PIPE_CONTROL_FLUSH_ENABLE (1<<7) /* gen7+ */ +#define PIPE_CONTROL_DC_FLUSH_ENABLE (1<<5) +#define PIPE_CONTROL_VF_CACHE_INVALIDATE (1<<4) +#define PIPE_CONTROL_CONST_CACHE_INVALIDATE (1<<3) +#define PIPE_CONTROL_STATE_CACHE_INVALIDATE (1<<2) +#define PIPE_CONTROL_STALL_AT_SCOREBOARD (1<<1) +#define PIPE_CONTROL_DEPTH_CACHE_FLUSH (1<<0) +#define PIPE_CONTROL_GLOBAL_GTT (1<<2) /* in addr dword */ + +/* + * 3D-related flags that can't be set on _engines_ that lack access to the 3D + * pipeline (i.e., CCS engines). + */ +#define PIPE_CONTROL_3D_ENGINE_FLAGS (\ + PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH | \ + PIPE_CONTROL_DEPTH_CACHE_FLUSH | \ + PIPE_CONTROL_TILE_CACHE_FLUSH | \ + PIPE_CONTROL_DEPTH_STALL | \ + PIPE_CONTROL_STALL_AT_SCOREBOARD | \ + PIPE_CONTROL_PSD_SYNC | \ + PIPE_CONTROL_AMFS_FLUSH | \ + PIPE_CONTROL_VF_CACHE_INVALIDATE | \ + PIPE_CONTROL_GLOBAL_SNAPSHOT_RESET) + +/* 3D-related flags that can't be set on _platforms_ that lack a 3D pipeline */ +#define PIPE_CONTROL_3D_ARCH_FLAGS ( \ + PIPE_CONTROL_3D_ENGINE_FLAGS | \ + PIPE_CONTROL_INDIRECT_STATE_DISABLE | \ + PIPE_CONTROL_FLUSH_ENABLE | \ + PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE | \ + PIPE_CONTROL_DC_FLUSH_ENABLE) + +#define MI_MATH(x) MI_INSTR(0x1a, (x) - 1) +#define MI_MATH_INSTR(opcode, op1, op2) ((opcode) << 20 | (op1) << 10 | (op2)) +/* Opcodes for MI_MATH_INSTR */ +#define MI_MATH_NOOP MI_MATH_INSTR(0x000, 0x0, 0x0) +#define MI_MATH_LOAD(op1, op2) MI_MATH_INSTR(0x080, op1, op2) +#define MI_MATH_LOADINV(op1, op2) MI_MATH_INSTR(0x480, op1, op2) +#define MI_MATH_LOAD0(op1) MI_MATH_INSTR(0x081, op1) +#define MI_MATH_LOAD1(op1) MI_MATH_INSTR(0x481, op1) +#define MI_MATH_ADD MI_MATH_INSTR(0x100, 0x0, 0x0) +#define MI_MATH_SUB MI_MATH_INSTR(0x101, 0x0, 0x0) +#define MI_MATH_AND MI_MATH_INSTR(0x102, 0x0, 0x0) +#define MI_MATH_OR MI_MATH_INSTR(0x103, 0x0, 0x0) +#define MI_MATH_XOR MI_MATH_INSTR(0x104, 0x0, 0x0) +#define MI_MATH_STORE(op1, op2) MI_MATH_INSTR(0x180, op1, op2) +#define MI_MATH_STOREINV(op1, op2) MI_MATH_INSTR(0x580, op1, op2) +/* Registers used as operands in MI_MATH_INSTR */ +#define MI_MATH_REG(x) (x) +#define MI_MATH_REG_SRCA 0x20 +#define MI_MATH_REG_SRCB 0x21 +#define MI_MATH_REG_ACCU 0x31 +#define MI_MATH_REG_ZF 0x32 +#define MI_MATH_REG_CF 0x33 + +/* + * Media instructions used by the kernel + */ +#define MEDIA_INSTR(pipe, op, sub_op, flags) \ + (__INSTR(INSTR_RC_CLIENT) | (pipe) << INSTR_SUBCLIENT_SHIFT | \ + (op) << INSTR_26_TO_24_SHIFT | (sub_op) << 16 | (flags)) + +#define MFX_WAIT MEDIA_INSTR(1, 0, 0, 0) +#define MFX_WAIT_DW0_MFX_SYNC_CONTROL_FLAG REG_BIT(8) +#define MFX_WAIT_DW0_PXP_SYNC_CONTROL_FLAG REG_BIT(9) + +#define CRYPTO_KEY_EXCHANGE MEDIA_INSTR(2, 6, 9, 0) + +/* + * Commands used only by the command parser + */ +#define MI_SET_PREDICATE MI_INSTR(0x01, 0) +#define MI_ARB_CHECK MI_INSTR(0x05, 0) +#define MI_RS_CONTROL MI_INSTR(0x06, 0) +#define MI_URB_ATOMIC_ALLOC MI_INSTR(0x09, 0) +#define MI_PREDICATE MI_INSTR(0x0C, 0) +#define MI_RS_CONTEXT MI_INSTR(0x0F, 0) +#define MI_TOPOLOGY_FILTER MI_INSTR(0x0D, 0) +#define MI_LOAD_SCAN_LINES_EXCL MI_INSTR(0x13, 0) +#define MI_URB_CLEAR MI_INSTR(0x19, 0) +#define MI_UPDATE_GTT MI_INSTR(0x23, 0) +#define MI_CLFLUSH MI_INSTR(0x27, 0) +#define MI_REPORT_PERF_COUNT MI_INSTR(0x28, 0) +#define MI_REPORT_PERF_COUNT_GGTT (1<<0) +#define MI_RS_STORE_DATA_IMM MI_INSTR(0x2B, 0) +#define MI_LOAD_URB_MEM MI_INSTR(0x2C, 0) +#define MI_STORE_URB_MEM MI_INSTR(0x2D, 0) +#define MI_CONDITIONAL_BATCH_BUFFER_END MI_INSTR(0x36, 0) +#define MI_DO_COMPARE REG_BIT(21) + +#define STATE_BASE_ADDRESS \ + ((0x3 << 29) | (0x0 << 27) | (0x1 << 24) | (0x1 << 16)) +#define BASE_ADDRESS_MODIFY REG_BIT(0) +#define PIPELINE_SELECT \ + ((0x3 << 29) | (0x1 << 27) | (0x1 << 24) | (0x4 << 16)) +#define PIPELINE_SELECT_MEDIA REG_BIT(0) +#define GFX_OP_3DSTATE_VF_STATISTICS \ + ((0x3 << 29) | (0x1 << 27) | (0x0 << 24) | (0xB << 16)) +#define MEDIA_VFE_STATE \ + ((0x3 << 29) | (0x2 << 27) | (0x0 << 24) | (0x0 << 16)) +#define MEDIA_VFE_STATE_MMIO_ACCESS_MASK (0x18) +#define MEDIA_INTERFACE_DESCRIPTOR_LOAD \ + ((0x3 << 29) | (0x2 << 27) | (0x0 << 24) | (0x2 << 16)) +#define MEDIA_OBJECT \ + ((0x3 << 29) | (0x2 << 27) | (0x1 << 24) | (0x0 << 16)) +#define GPGPU_OBJECT ((0x3<<29)|(0x2<<27)|(0x1<<24)|(0x4<<16)) +#define GPGPU_WALKER ((0x3<<29)|(0x2<<27)|(0x1<<24)|(0x5<<16)) +#define GFX_OP_3DSTATE_DX9_CONSTANTF_VS \ + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x39<<16)) +#define GFX_OP_3DSTATE_DX9_CONSTANTF_PS \ + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x3A<<16)) +#define GFX_OP_3DSTATE_SO_DECL_LIST \ + ((0x3<<29)|(0x3<<27)|(0x1<<24)|(0x17<<16)) + +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_VS \ + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x43<<16)) +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_GS \ + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x44<<16)) +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_HS \ + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x45<<16)) +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_DS \ + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x46<<16)) +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_PS \ + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x47<<16)) + +#define COLOR_BLT ((0x2<<29)|(0x40<<22)) +#define SRC_COPY_BLT ((0x2<<29)|(0x43<<22)) + +#define GSC_INSTR(opcode, data, flags) \ + (__INSTR(INSTR_GSC_CLIENT) | (opcode) << 22 | (data) << 9 | (flags)) + +#define GSC_FW_LOAD GSC_INSTR(1, 0, 2) +#define HECI1_FW_LIMIT_VALID (1 << 31) + +/* + * Used to convert any address to canonical form. + * Starting from gen8, some commands (e.g. STATE_BASE_ADDRESS, + * MI_LOAD_REGISTER_MEM and others, see Broadwell PRM Vol2a) require the + * addresses to be in a canonical form: + * "GraphicsAddress[63:48] are ignored by the HW and assumed to be in correct + * canonical form [63:48] == [47]." + */ +#define GEN8_HIGH_ADDRESS_BIT 47 +static inline u64 gen8_canonical_addr(u64 address) +{ + return sign_extend64(address, GEN8_HIGH_ADDRESS_BIT); +} + +static inline u64 gen8_noncanonical_addr(u64 address) +{ + return address & GENMASK_ULL(GEN8_HIGH_ADDRESS_BIT, 0); +} + +static inline u32 *__gen6_emit_bb_start(u32 *cs, u32 addr, unsigned int flags) +{ + *cs++ = MI_BATCH_BUFFER_START | flags; + *cs++ = addr; + + return cs; +} + +#endif /* _INTEL_GPU_COMMANDS_H_ */ diff --git a/include/linux/bitops.h b/include/linux/bitops.h new file mode 100644 index 0000000000..1bbe60c83c --- /dev/null +++ b/include/linux/bitops.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: MIT */ + +#ifndef _HAX_LINUX_BITOPS_H_ +#define _HAX_LINUX_BITOPS_H_ + +#include <linux_scaffold.h> + +#endif /* _HAX_LINUX_BITOPS_H_ */ diff --git a/include/linux_scaffold.h b/include/linux_scaffold.h new file mode 100644 index 0000000000..fe304330e5 --- /dev/null +++ b/include/linux_scaffold.h @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: MIT */ + +#ifndef _INTEL_GPU_COMMANDS_SCAFFOLD_H_ +#define _INTEL_GPU_COMMANDS_SCAFFOLD_H_ + +#include <linux/const.h> + +#include <stdint.h> + +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; +typedef uint64_t u64; + +typedef int8_t s8; +typedef int16_t s16; +typedef int32_t s32; +typedef int64_t s64; + +static s64 sign_extend64(u64 value, int index) +{ + int shift = 63 - index; + return (s64)(value << shift) >> shift; +} + +/* Make IGT build with Kernels < 4.17 */ +#ifndef _AC +# define _AC(X,Y) __AC(X,Y) +#endif +#ifndef _UL +# define _UL(x) (_AC(x, UL)) +#endif +#ifndef _ULL +# define _ULL(x) (_AC(x, ULL)) +#endif + +#define GENMASK(h, l) \ + (((~_UL(0)) - (_UL(1) << (l)) + 1) & \ + (~_UL(0) >> (BITS_PER_LONG - 1 - (h)))) + +#define GENMASK_ULL(h, l) \ + (((~_ULL(0)) - (_ULL(1) << (l)) + 1) & \ + (~_ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h)))) + +#define BITS_PER_BYTE 8 +#define BITS_PER_TYPE(t) (sizeof(t) * BITS_PER_BYTE) +#define BITS_PER_LONG BITS_PER_TYPE(long) +#define BITS_PER_LONG_LONG BITS_PER_TYPE(long long) + +#endif /* _INTEL_GPU_COMMANDS_SCAFFOLD_H_ */ diff --git a/meson.build b/meson.build index e7a68503d7..4dc720bc25 100644 --- a/meson.build +++ b/meson.build @@ -85,7 +85,7 @@ with_libdrm = get_option('libdrm_drivers') build_info = ['Build type: ' + get_option('buildtype')] -inc = include_directories('include/drm-uapi', 'include/linux-uapi', 'lib', 'lib/stubs/syscalls', '.') +inc = include_directories('include', 'include/drm-uapi', 'include/linux-uapi', 'lib', 'lib/stubs/syscalls', '.') inc_for_gtkdoc = include_directories('lib') -- 2.34.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 1/2] intel_gpu_commands: Use kernel copy commands definition 2023-03-03 12:55 ` [igt-dev] [PATCH i-g-t 1/2] intel_gpu_commands: Use kernel copy commands definition Zbigniew Kempczyński @ 2023-03-06 14:11 ` Kamil Konieczny 2023-03-06 15:05 ` Zbigniew Kempczyński 0 siblings, 1 reply; 11+ messages in thread From: Kamil Konieczny @ 2023-03-06 14:11 UTC (permalink / raw) To: igt-dev Hi Zbigniew, please improve commit description in Subject: intel_gpu_commands: Use kernel copy commands definition ------------------------------ ^ imho better word wold be gpu, so it will read: intel_gpu_commands: Use kernel gpu commands definition On 2023-03-03 at 13:55:20 +0100, Zbigniew Kempczyński wrote: > i915 has nicely collected command macros in one file. We want to use > this pattern (file) and remove duplicated definitions. Unfortunately > command file uses includes which don't exists in userspace, so we > need to import minimal set of kernel includes to ensure we will have > verbatim copy in the future. > > Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> > Cc: Petri Latvala <adrinael@adrinael.net> > Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com> > --- > include/intel_gpu_commands.h | 470 +++++++++++++++++++++++++++++++++++ > include/linux/bitops.h | 8 + > include/linux_scaffold.h | 50 ++++ > meson.build | 2 +- > 4 files changed, 529 insertions(+), 1 deletion(-) > create mode 100644 include/intel_gpu_commands.h > create mode 100644 include/linux/bitops.h > create mode 100644 include/linux_scaffold.h > > diff --git a/include/intel_gpu_commands.h b/include/intel_gpu_commands.h > new file mode 100644 > index 0000000000..e10507fa71 > --- /dev/null > +++ b/include/intel_gpu_commands.h > @@ -0,0 +1,470 @@ > +/* SPDX-License-Identifier: MIT*/ > +/* > + * Copyright © 2003-2018 Intel Corporation > + */ > + > +#ifndef _INTEL_GPU_COMMANDS_H_ > +#define _INTEL_GPU_COMMANDS_H_ > + > +#include <linux/bitops.h> > + > +/* > + * Target address alignments required for GPU access e.g. > + * MI_STORE_DWORD_IMM. > + */ > +#define alignof_dword 4 > +#define alignof_qword 8 > + > +/* > + * Instruction field definitions used by the command parser > + */ > +#define INSTR_CLIENT_SHIFT 29 > +#define INSTR_MI_CLIENT 0x0 > +#define INSTR_BC_CLIENT 0x2 > +#define INSTR_GSC_CLIENT 0x2 /* MTL+ */ > +#define INSTR_RC_CLIENT 0x3 > +#define INSTR_SUBCLIENT_SHIFT 27 > +#define INSTR_SUBCLIENT_MASK 0x18000000 > +#define INSTR_MEDIA_SUBCLIENT 0x2 > +#define INSTR_26_TO_24_MASK 0x7000000 > +#define INSTR_26_TO_24_SHIFT 24 > + > +#define __INSTR(client) ((client) << INSTR_CLIENT_SHIFT) > + > +/* > + * Memory interface instructions used by the kernel > + */ > +#define MI_INSTR(opcode, flags) \ > + (__INSTR(INSTR_MI_CLIENT) | (opcode) << 23 | (flags)) > +/* Many MI commands use bit 22 of the header dword for GGTT vs PPGTT */ > +#define MI_GLOBAL_GTT (1<<22) > + > +#define MI_NOOP MI_INSTR(0, 0) > +#define MI_SET_PREDICATE MI_INSTR(0x01, 0) > +#define MI_SET_PREDICATE_DISABLE (0 << 0) > +#define MI_USER_INTERRUPT MI_INSTR(0x02, 0) > +#define MI_WAIT_FOR_EVENT MI_INSTR(0x03, 0) > +#define MI_WAIT_FOR_OVERLAY_FLIP (1<<16) > +#define MI_WAIT_FOR_PLANE_B_FLIP (1<<6) > +#define MI_WAIT_FOR_PLANE_A_FLIP (1<<2) > +#define MI_WAIT_FOR_PLANE_A_SCANLINES (1<<1) > +#define MI_FLUSH MI_INSTR(0x04, 0) > +#define MI_READ_FLUSH (1 << 0) > +#define MI_EXE_FLUSH (1 << 1) > +#define MI_NO_WRITE_FLUSH (1 << 2) > +#define MI_SCENE_COUNT (1 << 3) /* just increment scene count */ > +#define MI_END_SCENE (1 << 4) /* flush binner and incr scene count */ > +#define MI_INVALIDATE_ISP (1 << 5) /* invalidate indirect state pointers */ > +#define MI_REPORT_HEAD MI_INSTR(0x07, 0) > +#define MI_ARB_ON_OFF MI_INSTR(0x08, 0) > +#define MI_ARB_ENABLE (1<<0) > +#define MI_ARB_DISABLE (0<<0) > +#define MI_BATCH_BUFFER_END MI_INSTR(0x0a, 0) > +#define MI_SUSPEND_FLUSH MI_INSTR(0x0b, 0) > +#define MI_SUSPEND_FLUSH_EN (1<<0) > +#define MI_SET_APPID MI_INSTR(0x0e, 0) > +#define MI_SET_APPID_SESSION_ID(x) ((x) << 0) > +#define MI_OVERLAY_FLIP MI_INSTR(0x11, 0) > +#define MI_OVERLAY_CONTINUE (0x0<<21) > +#define MI_OVERLAY_ON (0x1<<21) > +#define MI_OVERLAY_OFF (0x2<<21) > +#define MI_LOAD_SCAN_LINES_INCL MI_INSTR(0x12, 0) > +#define MI_DISPLAY_FLIP MI_INSTR(0x14, 2) > +#define MI_DISPLAY_FLIP_I915 MI_INSTR(0x14, 1) > +#define MI_DISPLAY_FLIP_PLANE(n) ((n) << 20) > +/* IVB has funny definitions for which plane to flip. */ > +#define MI_DISPLAY_FLIP_IVB_PLANE_A (0 << 19) > +#define MI_DISPLAY_FLIP_IVB_PLANE_B (1 << 19) > +#define MI_DISPLAY_FLIP_IVB_SPRITE_A (2 << 19) > +#define MI_DISPLAY_FLIP_IVB_SPRITE_B (3 << 19) > +#define MI_DISPLAY_FLIP_IVB_PLANE_C (4 << 19) > +#define MI_DISPLAY_FLIP_IVB_SPRITE_C (5 << 19) > +/* SKL ones */ > +#define MI_DISPLAY_FLIP_SKL_PLANE_1_A (0 << 8) > +#define MI_DISPLAY_FLIP_SKL_PLANE_1_B (1 << 8) > +#define MI_DISPLAY_FLIP_SKL_PLANE_1_C (2 << 8) > +#define MI_DISPLAY_FLIP_SKL_PLANE_2_A (4 << 8) > +#define MI_DISPLAY_FLIP_SKL_PLANE_2_B (5 << 8) > +#define MI_DISPLAY_FLIP_SKL_PLANE_2_C (6 << 8) > +#define MI_DISPLAY_FLIP_SKL_PLANE_3_A (7 << 8) > +#define MI_DISPLAY_FLIP_SKL_PLANE_3_B (8 << 8) > +#define MI_DISPLAY_FLIP_SKL_PLANE_3_C (9 << 8) > +#define MI_SEMAPHORE_MBOX MI_INSTR(0x16, 1) /* gen6, gen7 */ > +#define MI_SEMAPHORE_GLOBAL_GTT (1<<22) > +#define MI_SEMAPHORE_UPDATE (1<<21) > +#define MI_SEMAPHORE_COMPARE (1<<20) > +#define MI_SEMAPHORE_REGISTER (1<<18) > +#define MI_SEMAPHORE_SYNC_VR (0<<16) /* RCS wait for VCS (RVSYNC) */ > +#define MI_SEMAPHORE_SYNC_VER (1<<16) /* RCS wait for VECS (RVESYNC) */ > +#define MI_SEMAPHORE_SYNC_BR (2<<16) /* RCS wait for BCS (RBSYNC) */ > +#define MI_SEMAPHORE_SYNC_BV (0<<16) /* VCS wait for BCS (VBSYNC) */ > +#define MI_SEMAPHORE_SYNC_VEV (1<<16) /* VCS wait for VECS (VVESYNC) */ > +#define MI_SEMAPHORE_SYNC_RV (2<<16) /* VCS wait for RCS (VRSYNC) */ > +#define MI_SEMAPHORE_SYNC_RB (0<<16) /* BCS wait for RCS (BRSYNC) */ > +#define MI_SEMAPHORE_SYNC_VEB (1<<16) /* BCS wait for VECS (BVESYNC) */ > +#define MI_SEMAPHORE_SYNC_VB (2<<16) /* BCS wait for VCS (BVSYNC) */ > +#define MI_SEMAPHORE_SYNC_BVE (0<<16) /* VECS wait for BCS (VEBSYNC) */ > +#define MI_SEMAPHORE_SYNC_VVE (1<<16) /* VECS wait for VCS (VEVSYNC) */ > +#define MI_SEMAPHORE_SYNC_RVE (2<<16) /* VECS wait for RCS (VERSYNC) */ > +#define MI_SEMAPHORE_SYNC_INVALID (3<<16) > +#define MI_SEMAPHORE_SYNC_MASK (3<<16) > +#define MI_SET_CONTEXT MI_INSTR(0x18, 0) > +#define MI_MM_SPACE_GTT (1<<8) > +#define MI_MM_SPACE_PHYSICAL (0<<8) > +#define MI_SAVE_EXT_STATE_EN (1<<3) > +#define MI_RESTORE_EXT_STATE_EN (1<<2) > +#define MI_FORCE_RESTORE (1<<1) > +#define MI_RESTORE_INHIBIT (1<<0) > +#define HSW_MI_RS_SAVE_STATE_EN (1<<3) > +#define HSW_MI_RS_RESTORE_STATE_EN (1<<2) > +#define MI_SEMAPHORE_SIGNAL MI_INSTR(0x1b, 0) /* GEN8+ */ > +#define MI_SEMAPHORE_TARGET(engine) ((engine)<<15) > +#define MI_SEMAPHORE_WAIT MI_INSTR(0x1c, 2) /* GEN8+ */ > +#define MI_SEMAPHORE_WAIT_TOKEN MI_INSTR(0x1c, 3) /* GEN12+ */ > +#define MI_SEMAPHORE_POLL (1 << 15) > +#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > +#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > +#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > +#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > +#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > +#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > +#define MI_SEMAPHORE_TOKEN_MASK REG_GENMASK(9, 5) > +#define MI_SEMAPHORE_TOKEN_SHIFT 5 > +#define MI_STORE_DATA_IMM MI_INSTR(0x20, 0) > +#define MI_STORE_DWORD_IMM MI_INSTR(0x20, 1) > +#define MI_STORE_DWORD_IMM_GEN4 MI_INSTR(0x20, 2) > +#define MI_STORE_QWORD_IMM_GEN8 (MI_INSTR(0x20, 3) | REG_BIT(21)) > +#define MI_MEM_VIRTUAL (1 << 22) /* 945,g33,965 */ > +#define MI_USE_GGTT (1 << 22) /* g4x+ */ > +#define MI_STORE_DWORD_INDEX MI_INSTR(0x21, 1) > +#define MI_ATOMIC MI_INSTR(0x2f, 1) > +#define MI_ATOMIC_INLINE (MI_INSTR(0x2f, 9) | MI_ATOMIC_INLINE_DATA) > +#define MI_ATOMIC_GLOBAL_GTT (1 << 22) > +#define MI_ATOMIC_INLINE_DATA (1 << 18) > +#define MI_ATOMIC_CS_STALL (1 << 17) > +#define MI_ATOMIC_MOVE (0x4 << 8) > + > +/* > + * Official intel docs are somewhat sloppy concerning MI_LOAD_REGISTER_IMM: > + * - Always issue a MI_NOOP _before_ the MI_LOAD_REGISTER_IMM - otherwise hw > + * simply ignores the register load under certain conditions. > + * - One can actually load arbitrary many arbitrary registers: Simply issue x > + * address/value pairs. Don't overdue it, though, x <= 2^4 must hold! > + */ > +#define MI_LOAD_REGISTER_IMM(x) MI_INSTR(0x22, 2*(x)-1) > +/* Gen11+. addr = base + (ctx_restore ? offset & GENMASK(12,2) : offset) */ > +#define MI_LRI_LRM_CS_MMIO REG_BIT(19) > +#define MI_LRI_MMIO_REMAP_EN REG_BIT(17) > +#define MI_LRI_FORCE_POSTED (1<<12) > +#define MI_LOAD_REGISTER_IMM_MAX_REGS (126) > +#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 1) > +#define MI_STORE_REGISTER_MEM_GEN8 MI_INSTR(0x24, 2) > +#define MI_SRM_LRM_GLOBAL_GTT (1<<22) > +#define MI_FLUSH_DW MI_INSTR(0x26, 1) /* for GEN6 */ > +#define MI_FLUSH_DW_PROTECTED_MEM_EN (1 << 22) > +#define MI_FLUSH_DW_STORE_INDEX (1<<21) > +#define MI_INVALIDATE_TLB (1<<18) > +#define MI_FLUSH_DW_CCS (1<<16) > +#define MI_FLUSH_DW_OP_STOREDW (1<<14) > +#define MI_FLUSH_DW_OP_MASK (3<<14) > +#define MI_FLUSH_DW_LLC (1<<9) > +#define MI_FLUSH_DW_NOTIFY (1<<8) > +#define MI_INVALIDATE_BSD (1<<7) > +#define MI_FLUSH_DW_USE_GTT (1<<2) > +#define MI_FLUSH_DW_USE_PPGTT (0<<2) > +#define MI_LOAD_REGISTER_MEM MI_INSTR(0x29, 1) > +#define MI_LOAD_REGISTER_MEM_GEN8 MI_INSTR(0x29, 2) > +#define MI_LOAD_REGISTER_REG MI_INSTR(0x2A, 1) > +#define MI_LRR_SOURCE_CS_MMIO REG_BIT(18) > +#define MI_BATCH_BUFFER MI_INSTR(0x30, 1) > +#define MI_BATCH_NON_SECURE (1) > +/* for snb/ivb/vlv this also means "batch in ppgtt" when ppgtt is enabled. */ > +#define MI_BATCH_NON_SECURE_I965 (1<<8) > +#define MI_BATCH_PPGTT_HSW (1<<8) > +#define MI_BATCH_NON_SECURE_HSW (1<<13) > +#define MI_BATCH_BUFFER_START MI_INSTR(0x31, 0) > +#define MI_BATCH_GTT (2<<6) /* aliased with (1<<7) on gen4 */ > +#define MI_BATCH_BUFFER_START_GEN8 MI_INSTR(0x31, 1) > +#define MI_BATCH_RESOURCE_STREAMER REG_BIT(10) > +#define MI_BATCH_PREDICATE REG_BIT(15) /* HSW+ on RCS only*/ > + > +#define MI_OPCODE(x) (((x) >> 23) & 0x3f) > +#define IS_MI_LRI_CMD(x) (MI_OPCODE(x) == MI_OPCODE(MI_INSTR(0x22, 0))) > +#define MI_LRI_LEN(x) (((x) & 0xff) + 1) > + > +/* > + * 3D instructions used by the kernel > + */ > +#define GFX_INSTR(opcode, flags) ((0x3 << 29) | ((opcode) << 24) | (flags)) > + > +#define GEN9_MEDIA_POOL_STATE ((0x3 << 29) | (0x2 << 27) | (0x5 << 16) | 4) > +#define GEN9_MEDIA_POOL_ENABLE (1 << 31) > +#define GFX_OP_RASTER_RULES ((0x3<<29)|(0x7<<24)) > +#define GFX_OP_SCISSOR ((0x3<<29)|(0x1c<<24)|(0x10<<19)) > +#define SC_UPDATE_SCISSOR (0x1<<1) > +#define SC_ENABLE_MASK (0x1<<0) > +#define SC_ENABLE (0x1<<0) > +#define GFX_OP_LOAD_INDIRECT ((0x3<<29)|(0x1d<<24)|(0x7<<16)) > +#define GFX_OP_SCISSOR_INFO ((0x3<<29)|(0x1d<<24)|(0x81<<16)|(0x1)) > +#define SCI_YMIN_MASK (0xffff<<16) > +#define SCI_XMIN_MASK (0xffff<<0) > +#define SCI_YMAX_MASK (0xffff<<16) > +#define SCI_XMAX_MASK (0xffff<<0) > +#define GFX_OP_SCISSOR_ENABLE ((0x3<<29)|(0x1c<<24)|(0x10<<19)) > +#define GFX_OP_SCISSOR_RECT ((0x3<<29)|(0x1d<<24)|(0x81<<16)|1) > +#define GFX_OP_COLOR_FACTOR ((0x3<<29)|(0x1d<<24)|(0x1<<16)|0x0) > +#define GFX_OP_STIPPLE ((0x3<<29)|(0x1d<<24)|(0x83<<16)) > +#define GFX_OP_MAP_INFO ((0x3<<29)|(0x1d<<24)|0x4) > +#define GFX_OP_DESTBUFFER_VARS ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0) > +#define GFX_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1) > +#define GFX_OP_DRAWRECT_INFO ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3)) > +#define GFX_OP_DRAWRECT_INFO_I965 ((0x7900<<16)|0x2) > + > +#define XY_CTRL_SURF_INSTR_SIZE 5 > +#define MI_FLUSH_DW_SIZE 3 > +#define XY_CTRL_SURF_COPY_BLT ((2 << 29) | (0x48 << 22) | 3) > +#define SRC_ACCESS_TYPE_SHIFT 21 > +#define DST_ACCESS_TYPE_SHIFT 20 > +#define CCS_SIZE_MASK 0x3FF > +#define CCS_SIZE_SHIFT 8 > +#define XY_CTRL_SURF_MOCS_MASK GENMASK(31, 25) > +#define NUM_CCS_BYTES_PER_BLOCK 256 > +#define NUM_BYTES_PER_CCS_BYTE 256 > +#define NUM_CCS_BLKS_PER_XFER 1024 > +#define INDIRECT_ACCESS 0 > +#define DIRECT_ACCESS 1 > + > +#define COLOR_BLT_CMD (2 << 29 | 0x40 << 22 | (5 - 2)) > +#define XY_COLOR_BLT_CMD (2 << 29 | 0x50 << 22) > +#define XY_FAST_COLOR_BLT_CMD (2 << 29 | 0x44 << 22) > +#define XY_FAST_COLOR_BLT_DEPTH_32 (2 << 19) > +#define XY_FAST_COLOR_BLT_DW 16 > +#define XY_FAST_COLOR_BLT_MOCS_MASK GENMASK(27, 21) > +#define XY_FAST_COLOR_BLT_MEM_TYPE_SHIFT 31 > + > +#define XY_FAST_COPY_BLT_D0_SRC_TILING_MASK REG_GENMASK(21, 20) > +#define XY_FAST_COPY_BLT_D0_DST_TILING_MASK REG_GENMASK(14, 13) > +#define XY_FAST_COPY_BLT_D0_SRC_TILE_MODE(mode) \ > + REG_FIELD_PREP(XY_FAST_COPY_BLT_D0_SRC_TILING_MASK, mode) > +#define XY_FAST_COPY_BLT_D0_DST_TILE_MODE(mode) \ > + REG_FIELD_PREP(XY_FAST_COPY_BLT_D0_DST_TILING_MASK, mode) > +#define LINEAR 0 > +#define TILE_X 0x1 > +#define XMAJOR 0x1 > +#define YMAJOR 0x2 > +#define TILE_64 0x3 > +#define XY_FAST_COPY_BLT_D1_SRC_TILE4 REG_BIT(31) > +#define XY_FAST_COPY_BLT_D1_DST_TILE4 REG_BIT(30) > +#define BLIT_CCTL_SRC_MOCS_MASK REG_GENMASK(6, 0) > +#define BLIT_CCTL_DST_MOCS_MASK REG_GENMASK(14, 8) > +/* Note: MOCS value = (index << 1) */ > +#define BLIT_CCTL_SRC_MOCS(idx) \ > + REG_FIELD_PREP(BLIT_CCTL_SRC_MOCS_MASK, (idx) << 1) > +#define BLIT_CCTL_DST_MOCS(idx) \ > + REG_FIELD_PREP(BLIT_CCTL_DST_MOCS_MASK, (idx) << 1) > + > +#define SRC_COPY_BLT_CMD (2 << 29 | 0x43 << 22) > +#define GEN9_XY_FAST_COPY_BLT_CMD (2 << 29 | 0x42 << 22) > +#define XY_SRC_COPY_BLT_CMD (2 << 29 | 0x53 << 22) > +#define XY_MONO_SRC_COPY_IMM_BLT (2 << 29 | 0x71 << 22 | 5) > +#define BLT_WRITE_A (2<<20) > +#define BLT_WRITE_RGB (1<<20) > +#define BLT_WRITE_RGBA (BLT_WRITE_RGB | BLT_WRITE_A) > +#define BLT_DEPTH_8 (0<<24) > +#define BLT_DEPTH_16_565 (1<<24) > +#define BLT_DEPTH_16_1555 (2<<24) > +#define BLT_DEPTH_32 (3<<24) > +#define BLT_ROP_SRC_COPY (0xcc<<16) > +#define BLT_ROP_COLOR_COPY (0xf0<<16) > +#define XY_SRC_COPY_BLT_SRC_TILED (1<<15) /* 965+ only */ > +#define XY_SRC_COPY_BLT_DST_TILED (1<<11) /* 965+ only */ > +#define CMD_OP_DISPLAYBUFFER_INFO ((0x0<<29)|(0x14<<23)|2) > +#define ASYNC_FLIP (1<<22) > +#define DISPLAY_PLANE_A (0<<20) > +#define DISPLAY_PLANE_B (1<<20) > +#define GFX_OP_PIPE_CONTROL(len) ((0x3<<29)|(0x3<<27)|(0x2<<24)|((len)-2)) > +#define PIPE_CONTROL_COMMAND_CACHE_INVALIDATE (1<<29) /* gen11+ */ > +#define PIPE_CONTROL_TILE_CACHE_FLUSH (1<<28) /* gen11+ */ > +#define PIPE_CONTROL_FLUSH_L3 (1<<27) > +#define PIPE_CONTROL_AMFS_FLUSH (1<<25) /* gen12+ */ > +#define PIPE_CONTROL_GLOBAL_GTT_IVB (1<<24) /* gen7+ */ > +#define PIPE_CONTROL_MMIO_WRITE (1<<23) > +#define PIPE_CONTROL_STORE_DATA_INDEX (1<<21) > +#define PIPE_CONTROL_CS_STALL (1<<20) > +#define PIPE_CONTROL_GLOBAL_SNAPSHOT_RESET (1<<19) > +#define PIPE_CONTROL_TLB_INVALIDATE (1<<18) > +#define PIPE_CONTROL_PSD_SYNC (1<<17) /* gen11+ */ > +#define PIPE_CONTROL_MEDIA_STATE_CLEAR (1<<16) > +#define PIPE_CONTROL_WRITE_TIMESTAMP (3<<14) > +#define PIPE_CONTROL_QW_WRITE (1<<14) > +#define PIPE_CONTROL_POST_SYNC_OP_MASK (3<<14) > +#define PIPE_CONTROL_DEPTH_STALL (1<<13) > +#define PIPE_CONTROL_WRITE_FLUSH (1<<12) > +#define PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH (1<<12) /* gen6+ */ > +#define PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE (1<<11) /* MBZ on ILK */ > +#define PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE (1<<10) /* GM45+ only */ > +#define PIPE_CONTROL_INDIRECT_STATE_DISABLE (1<<9) > +#define PIPE_CONTROL0_HDC_PIPELINE_FLUSH REG_BIT(9) /* gen12 */ > +#define PIPE_CONTROL_NOTIFY (1<<8) > +#define PIPE_CONTROL_FLUSH_ENABLE (1<<7) /* gen7+ */ > +#define PIPE_CONTROL_DC_FLUSH_ENABLE (1<<5) > +#define PIPE_CONTROL_VF_CACHE_INVALIDATE (1<<4) > +#define PIPE_CONTROL_CONST_CACHE_INVALIDATE (1<<3) > +#define PIPE_CONTROL_STATE_CACHE_INVALIDATE (1<<2) > +#define PIPE_CONTROL_STALL_AT_SCOREBOARD (1<<1) > +#define PIPE_CONTROL_DEPTH_CACHE_FLUSH (1<<0) > +#define PIPE_CONTROL_GLOBAL_GTT (1<<2) /* in addr dword */ > + > +/* > + * 3D-related flags that can't be set on _engines_ that lack access to the 3D > + * pipeline (i.e., CCS engines). > + */ > +#define PIPE_CONTROL_3D_ENGINE_FLAGS (\ > + PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH | \ > + PIPE_CONTROL_DEPTH_CACHE_FLUSH | \ > + PIPE_CONTROL_TILE_CACHE_FLUSH | \ > + PIPE_CONTROL_DEPTH_STALL | \ > + PIPE_CONTROL_STALL_AT_SCOREBOARD | \ > + PIPE_CONTROL_PSD_SYNC | \ > + PIPE_CONTROL_AMFS_FLUSH | \ > + PIPE_CONTROL_VF_CACHE_INVALIDATE | \ > + PIPE_CONTROL_GLOBAL_SNAPSHOT_RESET) > + > +/* 3D-related flags that can't be set on _platforms_ that lack a 3D pipeline */ > +#define PIPE_CONTROL_3D_ARCH_FLAGS ( \ > + PIPE_CONTROL_3D_ENGINE_FLAGS | \ > + PIPE_CONTROL_INDIRECT_STATE_DISABLE | \ > + PIPE_CONTROL_FLUSH_ENABLE | \ > + PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE | \ > + PIPE_CONTROL_DC_FLUSH_ENABLE) > + > +#define MI_MATH(x) MI_INSTR(0x1a, (x) - 1) > +#define MI_MATH_INSTR(opcode, op1, op2) ((opcode) << 20 | (op1) << 10 | (op2)) > +/* Opcodes for MI_MATH_INSTR */ > +#define MI_MATH_NOOP MI_MATH_INSTR(0x000, 0x0, 0x0) > +#define MI_MATH_LOAD(op1, op2) MI_MATH_INSTR(0x080, op1, op2) > +#define MI_MATH_LOADINV(op1, op2) MI_MATH_INSTR(0x480, op1, op2) > +#define MI_MATH_LOAD0(op1) MI_MATH_INSTR(0x081, op1) > +#define MI_MATH_LOAD1(op1) MI_MATH_INSTR(0x481, op1) > +#define MI_MATH_ADD MI_MATH_INSTR(0x100, 0x0, 0x0) > +#define MI_MATH_SUB MI_MATH_INSTR(0x101, 0x0, 0x0) > +#define MI_MATH_AND MI_MATH_INSTR(0x102, 0x0, 0x0) > +#define MI_MATH_OR MI_MATH_INSTR(0x103, 0x0, 0x0) > +#define MI_MATH_XOR MI_MATH_INSTR(0x104, 0x0, 0x0) > +#define MI_MATH_STORE(op1, op2) MI_MATH_INSTR(0x180, op1, op2) > +#define MI_MATH_STOREINV(op1, op2) MI_MATH_INSTR(0x580, op1, op2) > +/* Registers used as operands in MI_MATH_INSTR */ > +#define MI_MATH_REG(x) (x) > +#define MI_MATH_REG_SRCA 0x20 > +#define MI_MATH_REG_SRCB 0x21 > +#define MI_MATH_REG_ACCU 0x31 > +#define MI_MATH_REG_ZF 0x32 > +#define MI_MATH_REG_CF 0x33 > + > +/* > + * Media instructions used by the kernel > + */ > +#define MEDIA_INSTR(pipe, op, sub_op, flags) \ > + (__INSTR(INSTR_RC_CLIENT) | (pipe) << INSTR_SUBCLIENT_SHIFT | \ > + (op) << INSTR_26_TO_24_SHIFT | (sub_op) << 16 | (flags)) > + > +#define MFX_WAIT MEDIA_INSTR(1, 0, 0, 0) > +#define MFX_WAIT_DW0_MFX_SYNC_CONTROL_FLAG REG_BIT(8) > +#define MFX_WAIT_DW0_PXP_SYNC_CONTROL_FLAG REG_BIT(9) > + > +#define CRYPTO_KEY_EXCHANGE MEDIA_INSTR(2, 6, 9, 0) > + > +/* > + * Commands used only by the command parser > + */ > +#define MI_SET_PREDICATE MI_INSTR(0x01, 0) > +#define MI_ARB_CHECK MI_INSTR(0x05, 0) > +#define MI_RS_CONTROL MI_INSTR(0x06, 0) > +#define MI_URB_ATOMIC_ALLOC MI_INSTR(0x09, 0) > +#define MI_PREDICATE MI_INSTR(0x0C, 0) > +#define MI_RS_CONTEXT MI_INSTR(0x0F, 0) > +#define MI_TOPOLOGY_FILTER MI_INSTR(0x0D, 0) > +#define MI_LOAD_SCAN_LINES_EXCL MI_INSTR(0x13, 0) > +#define MI_URB_CLEAR MI_INSTR(0x19, 0) > +#define MI_UPDATE_GTT MI_INSTR(0x23, 0) > +#define MI_CLFLUSH MI_INSTR(0x27, 0) > +#define MI_REPORT_PERF_COUNT MI_INSTR(0x28, 0) > +#define MI_REPORT_PERF_COUNT_GGTT (1<<0) > +#define MI_RS_STORE_DATA_IMM MI_INSTR(0x2B, 0) > +#define MI_LOAD_URB_MEM MI_INSTR(0x2C, 0) > +#define MI_STORE_URB_MEM MI_INSTR(0x2D, 0) > +#define MI_CONDITIONAL_BATCH_BUFFER_END MI_INSTR(0x36, 0) > +#define MI_DO_COMPARE REG_BIT(21) > + > +#define STATE_BASE_ADDRESS \ > + ((0x3 << 29) | (0x0 << 27) | (0x1 << 24) | (0x1 << 16)) > +#define BASE_ADDRESS_MODIFY REG_BIT(0) > +#define PIPELINE_SELECT \ > + ((0x3 << 29) | (0x1 << 27) | (0x1 << 24) | (0x4 << 16)) > +#define PIPELINE_SELECT_MEDIA REG_BIT(0) > +#define GFX_OP_3DSTATE_VF_STATISTICS \ > + ((0x3 << 29) | (0x1 << 27) | (0x0 << 24) | (0xB << 16)) > +#define MEDIA_VFE_STATE \ > + ((0x3 << 29) | (0x2 << 27) | (0x0 << 24) | (0x0 << 16)) > +#define MEDIA_VFE_STATE_MMIO_ACCESS_MASK (0x18) > +#define MEDIA_INTERFACE_DESCRIPTOR_LOAD \ > + ((0x3 << 29) | (0x2 << 27) | (0x0 << 24) | (0x2 << 16)) > +#define MEDIA_OBJECT \ > + ((0x3 << 29) | (0x2 << 27) | (0x1 << 24) | (0x0 << 16)) > +#define GPGPU_OBJECT ((0x3<<29)|(0x2<<27)|(0x1<<24)|(0x4<<16)) > +#define GPGPU_WALKER ((0x3<<29)|(0x2<<27)|(0x1<<24)|(0x5<<16)) > +#define GFX_OP_3DSTATE_DX9_CONSTANTF_VS \ > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x39<<16)) > +#define GFX_OP_3DSTATE_DX9_CONSTANTF_PS \ > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x3A<<16)) > +#define GFX_OP_3DSTATE_SO_DECL_LIST \ > + ((0x3<<29)|(0x3<<27)|(0x1<<24)|(0x17<<16)) > + > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_VS \ > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x43<<16)) > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_GS \ > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x44<<16)) > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_HS \ > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x45<<16)) > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_DS \ > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x46<<16)) > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_PS \ > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x47<<16)) > + > +#define COLOR_BLT ((0x2<<29)|(0x40<<22)) > +#define SRC_COPY_BLT ((0x2<<29)|(0x43<<22)) > + > +#define GSC_INSTR(opcode, data, flags) \ > + (__INSTR(INSTR_GSC_CLIENT) | (opcode) << 22 | (data) << 9 | (flags)) > + > +#define GSC_FW_LOAD GSC_INSTR(1, 0, 2) > +#define HECI1_FW_LIMIT_VALID (1 << 31) > + > +/* > + * Used to convert any address to canonical form. > + * Starting from gen8, some commands (e.g. STATE_BASE_ADDRESS, > + * MI_LOAD_REGISTER_MEM and others, see Broadwell PRM Vol2a) require the > + * addresses to be in a canonical form: > + * "GraphicsAddress[63:48] are ignored by the HW and assumed to be in correct > + * canonical form [63:48] == [47]." > + */ > +#define GEN8_HIGH_ADDRESS_BIT 47 > +static inline u64 gen8_canonical_addr(u64 address) > +{ > + return sign_extend64(address, GEN8_HIGH_ADDRESS_BIT); > +} > + > +static inline u64 gen8_noncanonical_addr(u64 address) > +{ > + return address & GENMASK_ULL(GEN8_HIGH_ADDRESS_BIT, 0); > +} > + > +static inline u32 *__gen6_emit_bb_start(u32 *cs, u32 addr, unsigned int flags) > +{ > + *cs++ = MI_BATCH_BUFFER_START | flags; > + *cs++ = addr; > + > + return cs; > +} > + > +#endif /* _INTEL_GPU_COMMANDS_H_ */ > diff --git a/include/linux/bitops.h b/include/linux/bitops.h > new file mode 100644 > index 0000000000..1bbe60c83c > --- /dev/null > +++ b/include/linux/bitops.h > @@ -0,0 +1,8 @@ > +/* SPDX-License-Identifier: MIT */ > + > +#ifndef _HAX_LINUX_BITOPS_H_ > +#define _HAX_LINUX_BITOPS_H_ ----------- ^ I would prefer here normal word. Please add some explanation why we deletegate these to linux_scaffold.h > + > +#include <linux_scaffold.h> > + > +#endif /* _HAX_LINUX_BITOPS_H_ */ > diff --git a/include/linux_scaffold.h b/include/linux_scaffold.h > new file mode 100644 > index 0000000000..fe304330e5 > --- /dev/null > +++ b/include/linux_scaffold.h > @@ -0,0 +1,50 @@ > +/* SPDX-License-Identifier: MIT */ > + > +#ifndef _INTEL_GPU_COMMANDS_SCAFFOLD_H_ > +#define _INTEL_GPU_COMMANDS_SCAFFOLD_H_ > + > +#include <linux/const.h> ------------ ^ I would prefer to have this in igt includes, you can copy them to igt_const.h or maybe copy it to drm-uapi ? Or maybe just copy it here and remove this include ? > + > +#include <stdint.h> > + > +typedef uint8_t u8; > +typedef uint16_t u16; > +typedef uint32_t u32; > +typedef uint64_t u64; > + > +typedef int8_t s8; > +typedef int16_t s16; > +typedef int32_t s32; > +typedef int64_t s64; Above typedefs looks like a good candidate to igt_types.h > + > +static s64 sign_extend64(u64 value, int index) -------- ^ inline > +{ > + int shift = 63 - index; > + return (s64)(value << shift) >> shift; > +} > + > +/* Make IGT build with Kernels < 4.17 */ > +#ifndef _AC > +# define _AC(X,Y) __AC(X,Y) ----------------------- ^ imho you should also write definition for __AC the same way > +#endif > +#ifndef _UL > +# define _UL(x) (_AC(x, UL)) > +#endif > +#ifndef _ULL > +# define _ULL(x) (_AC(x, ULL)) > +#endif > + > +#define GENMASK(h, l) \ > + (((~_UL(0)) - (_UL(1) << (l)) + 1) & \ > + (~_UL(0) >> (BITS_PER_LONG - 1 - (h)))) > + > +#define GENMASK_ULL(h, l) \ > + (((~_ULL(0)) - (_ULL(1) << (l)) + 1) & \ > + (~_ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h)))) > + > +#define BITS_PER_BYTE 8 > +#define BITS_PER_TYPE(t) (sizeof(t) * BITS_PER_BYTE) > +#define BITS_PER_LONG BITS_PER_TYPE(long) > +#define BITS_PER_LONG_LONG BITS_PER_TYPE(long long) > + > +#endif /* _INTEL_GPU_COMMANDS_SCAFFOLD_H_ */ > diff --git a/meson.build b/meson.build > index e7a68503d7..4dc720bc25 100644 > --- a/meson.build > +++ b/meson.build > @@ -85,7 +85,7 @@ with_libdrm = get_option('libdrm_drivers') > > build_info = ['Build type: ' + get_option('buildtype')] > > -inc = include_directories('include/drm-uapi', 'include/linux-uapi', 'lib', 'lib/stubs/syscalls', '.') > +inc = include_directories('include', 'include/drm-uapi', 'include/linux-uapi', 'lib', 'lib/stubs/syscalls', '.') ----------------------------- ^ This looks strange here. Regards, Kamil > > inc_for_gtkdoc = include_directories('lib') > > -- > 2.34.1 > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 1/2] intel_gpu_commands: Use kernel copy commands definition 2023-03-06 14:11 ` Kamil Konieczny @ 2023-03-06 15:05 ` Zbigniew Kempczyński 2023-03-07 9:22 ` Kamil Konieczny 0 siblings, 1 reply; 11+ messages in thread From: Zbigniew Kempczyński @ 2023-03-06 15:05 UTC (permalink / raw) To: Kamil Konieczny, igt-dev, Petri Latvala On Mon, Mar 06, 2023 at 03:11:00PM +0100, Kamil Konieczny wrote: > Hi Zbigniew, > > please improve commit description in Subject: > intel_gpu_commands: Use kernel copy commands definition > ------------------------------ ^ > > imho better word wold be gpu, so it will read: Ok, agree. > > intel_gpu_commands: Use kernel gpu commands definition > > On 2023-03-03 at 13:55:20 +0100, Zbigniew Kempczyński wrote: > > i915 has nicely collected command macros in one file. We want to use > > this pattern (file) and remove duplicated definitions. Unfortunately > > command file uses includes which don't exists in userspace, so we > > need to import minimal set of kernel includes to ensure we will have > > verbatim copy in the future. > > > > Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> > > Cc: Petri Latvala <adrinael@adrinael.net> > > Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com> > > --- > > include/intel_gpu_commands.h | 470 +++++++++++++++++++++++++++++++++++ > > include/linux/bitops.h | 8 + > > include/linux_scaffold.h | 50 ++++ > > meson.build | 2 +- > > 4 files changed, 529 insertions(+), 1 deletion(-) > > create mode 100644 include/intel_gpu_commands.h > > create mode 100644 include/linux/bitops.h > > create mode 100644 include/linux_scaffold.h > > > > diff --git a/include/intel_gpu_commands.h b/include/intel_gpu_commands.h > > new file mode 100644 > > index 0000000000..e10507fa71 > > --- /dev/null > > +++ b/include/intel_gpu_commands.h > > @@ -0,0 +1,470 @@ > > +/* SPDX-License-Identifier: MIT*/ > > +/* > > + * Copyright © 2003-2018 Intel Corporation > > + */ > > + > > +#ifndef _INTEL_GPU_COMMANDS_H_ > > +#define _INTEL_GPU_COMMANDS_H_ > > + > > +#include <linux/bitops.h> > > + > > +/* > > + * Target address alignments required for GPU access e.g. > > + * MI_STORE_DWORD_IMM. > > + */ > > +#define alignof_dword 4 > > +#define alignof_qword 8 > > + > > +/* > > + * Instruction field definitions used by the command parser > > + */ > > +#define INSTR_CLIENT_SHIFT 29 > > +#define INSTR_MI_CLIENT 0x0 > > +#define INSTR_BC_CLIENT 0x2 > > +#define INSTR_GSC_CLIENT 0x2 /* MTL+ */ > > +#define INSTR_RC_CLIENT 0x3 > > +#define INSTR_SUBCLIENT_SHIFT 27 > > +#define INSTR_SUBCLIENT_MASK 0x18000000 > > +#define INSTR_MEDIA_SUBCLIENT 0x2 > > +#define INSTR_26_TO_24_MASK 0x7000000 > > +#define INSTR_26_TO_24_SHIFT 24 > > + > > +#define __INSTR(client) ((client) << INSTR_CLIENT_SHIFT) > > + > > +/* > > + * Memory interface instructions used by the kernel > > + */ > > +#define MI_INSTR(opcode, flags) \ > > + (__INSTR(INSTR_MI_CLIENT) | (opcode) << 23 | (flags)) > > +/* Many MI commands use bit 22 of the header dword for GGTT vs PPGTT */ > > +#define MI_GLOBAL_GTT (1<<22) > > + > > +#define MI_NOOP MI_INSTR(0, 0) > > +#define MI_SET_PREDICATE MI_INSTR(0x01, 0) > > +#define MI_SET_PREDICATE_DISABLE (0 << 0) > > +#define MI_USER_INTERRUPT MI_INSTR(0x02, 0) > > +#define MI_WAIT_FOR_EVENT MI_INSTR(0x03, 0) > > +#define MI_WAIT_FOR_OVERLAY_FLIP (1<<16) > > +#define MI_WAIT_FOR_PLANE_B_FLIP (1<<6) > > +#define MI_WAIT_FOR_PLANE_A_FLIP (1<<2) > > +#define MI_WAIT_FOR_PLANE_A_SCANLINES (1<<1) > > +#define MI_FLUSH MI_INSTR(0x04, 0) > > +#define MI_READ_FLUSH (1 << 0) > > +#define MI_EXE_FLUSH (1 << 1) > > +#define MI_NO_WRITE_FLUSH (1 << 2) > > +#define MI_SCENE_COUNT (1 << 3) /* just increment scene count */ > > +#define MI_END_SCENE (1 << 4) /* flush binner and incr scene count */ > > +#define MI_INVALIDATE_ISP (1 << 5) /* invalidate indirect state pointers */ > > +#define MI_REPORT_HEAD MI_INSTR(0x07, 0) > > +#define MI_ARB_ON_OFF MI_INSTR(0x08, 0) > > +#define MI_ARB_ENABLE (1<<0) > > +#define MI_ARB_DISABLE (0<<0) > > +#define MI_BATCH_BUFFER_END MI_INSTR(0x0a, 0) > > +#define MI_SUSPEND_FLUSH MI_INSTR(0x0b, 0) > > +#define MI_SUSPEND_FLUSH_EN (1<<0) > > +#define MI_SET_APPID MI_INSTR(0x0e, 0) > > +#define MI_SET_APPID_SESSION_ID(x) ((x) << 0) > > +#define MI_OVERLAY_FLIP MI_INSTR(0x11, 0) > > +#define MI_OVERLAY_CONTINUE (0x0<<21) > > +#define MI_OVERLAY_ON (0x1<<21) > > +#define MI_OVERLAY_OFF (0x2<<21) > > +#define MI_LOAD_SCAN_LINES_INCL MI_INSTR(0x12, 0) > > +#define MI_DISPLAY_FLIP MI_INSTR(0x14, 2) > > +#define MI_DISPLAY_FLIP_I915 MI_INSTR(0x14, 1) > > +#define MI_DISPLAY_FLIP_PLANE(n) ((n) << 20) > > +/* IVB has funny definitions for which plane to flip. */ > > +#define MI_DISPLAY_FLIP_IVB_PLANE_A (0 << 19) > > +#define MI_DISPLAY_FLIP_IVB_PLANE_B (1 << 19) > > +#define MI_DISPLAY_FLIP_IVB_SPRITE_A (2 << 19) > > +#define MI_DISPLAY_FLIP_IVB_SPRITE_B (3 << 19) > > +#define MI_DISPLAY_FLIP_IVB_PLANE_C (4 << 19) > > +#define MI_DISPLAY_FLIP_IVB_SPRITE_C (5 << 19) > > +/* SKL ones */ > > +#define MI_DISPLAY_FLIP_SKL_PLANE_1_A (0 << 8) > > +#define MI_DISPLAY_FLIP_SKL_PLANE_1_B (1 << 8) > > +#define MI_DISPLAY_FLIP_SKL_PLANE_1_C (2 << 8) > > +#define MI_DISPLAY_FLIP_SKL_PLANE_2_A (4 << 8) > > +#define MI_DISPLAY_FLIP_SKL_PLANE_2_B (5 << 8) > > +#define MI_DISPLAY_FLIP_SKL_PLANE_2_C (6 << 8) > > +#define MI_DISPLAY_FLIP_SKL_PLANE_3_A (7 << 8) > > +#define MI_DISPLAY_FLIP_SKL_PLANE_3_B (8 << 8) > > +#define MI_DISPLAY_FLIP_SKL_PLANE_3_C (9 << 8) > > +#define MI_SEMAPHORE_MBOX MI_INSTR(0x16, 1) /* gen6, gen7 */ > > +#define MI_SEMAPHORE_GLOBAL_GTT (1<<22) > > +#define MI_SEMAPHORE_UPDATE (1<<21) > > +#define MI_SEMAPHORE_COMPARE (1<<20) > > +#define MI_SEMAPHORE_REGISTER (1<<18) > > +#define MI_SEMAPHORE_SYNC_VR (0<<16) /* RCS wait for VCS (RVSYNC) */ > > +#define MI_SEMAPHORE_SYNC_VER (1<<16) /* RCS wait for VECS (RVESYNC) */ > > +#define MI_SEMAPHORE_SYNC_BR (2<<16) /* RCS wait for BCS (RBSYNC) */ > > +#define MI_SEMAPHORE_SYNC_BV (0<<16) /* VCS wait for BCS (VBSYNC) */ > > +#define MI_SEMAPHORE_SYNC_VEV (1<<16) /* VCS wait for VECS (VVESYNC) */ > > +#define MI_SEMAPHORE_SYNC_RV (2<<16) /* VCS wait for RCS (VRSYNC) */ > > +#define MI_SEMAPHORE_SYNC_RB (0<<16) /* BCS wait for RCS (BRSYNC) */ > > +#define MI_SEMAPHORE_SYNC_VEB (1<<16) /* BCS wait for VECS (BVESYNC) */ > > +#define MI_SEMAPHORE_SYNC_VB (2<<16) /* BCS wait for VCS (BVSYNC) */ > > +#define MI_SEMAPHORE_SYNC_BVE (0<<16) /* VECS wait for BCS (VEBSYNC) */ > > +#define MI_SEMAPHORE_SYNC_VVE (1<<16) /* VECS wait for VCS (VEVSYNC) */ > > +#define MI_SEMAPHORE_SYNC_RVE (2<<16) /* VECS wait for RCS (VERSYNC) */ > > +#define MI_SEMAPHORE_SYNC_INVALID (3<<16) > > +#define MI_SEMAPHORE_SYNC_MASK (3<<16) > > +#define MI_SET_CONTEXT MI_INSTR(0x18, 0) > > +#define MI_MM_SPACE_GTT (1<<8) > > +#define MI_MM_SPACE_PHYSICAL (0<<8) > > +#define MI_SAVE_EXT_STATE_EN (1<<3) > > +#define MI_RESTORE_EXT_STATE_EN (1<<2) > > +#define MI_FORCE_RESTORE (1<<1) > > +#define MI_RESTORE_INHIBIT (1<<0) > > +#define HSW_MI_RS_SAVE_STATE_EN (1<<3) > > +#define HSW_MI_RS_RESTORE_STATE_EN (1<<2) > > +#define MI_SEMAPHORE_SIGNAL MI_INSTR(0x1b, 0) /* GEN8+ */ > > +#define MI_SEMAPHORE_TARGET(engine) ((engine)<<15) > > +#define MI_SEMAPHORE_WAIT MI_INSTR(0x1c, 2) /* GEN8+ */ > > +#define MI_SEMAPHORE_WAIT_TOKEN MI_INSTR(0x1c, 3) /* GEN12+ */ > > +#define MI_SEMAPHORE_POLL (1 << 15) > > +#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > > +#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > > +#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > > +#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > > +#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > > +#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > > +#define MI_SEMAPHORE_TOKEN_MASK REG_GENMASK(9, 5) > > +#define MI_SEMAPHORE_TOKEN_SHIFT 5 > > +#define MI_STORE_DATA_IMM MI_INSTR(0x20, 0) > > +#define MI_STORE_DWORD_IMM MI_INSTR(0x20, 1) > > +#define MI_STORE_DWORD_IMM_GEN4 MI_INSTR(0x20, 2) > > +#define MI_STORE_QWORD_IMM_GEN8 (MI_INSTR(0x20, 3) | REG_BIT(21)) > > +#define MI_MEM_VIRTUAL (1 << 22) /* 945,g33,965 */ > > +#define MI_USE_GGTT (1 << 22) /* g4x+ */ > > +#define MI_STORE_DWORD_INDEX MI_INSTR(0x21, 1) > > +#define MI_ATOMIC MI_INSTR(0x2f, 1) > > +#define MI_ATOMIC_INLINE (MI_INSTR(0x2f, 9) | MI_ATOMIC_INLINE_DATA) > > +#define MI_ATOMIC_GLOBAL_GTT (1 << 22) > > +#define MI_ATOMIC_INLINE_DATA (1 << 18) > > +#define MI_ATOMIC_CS_STALL (1 << 17) > > +#define MI_ATOMIC_MOVE (0x4 << 8) > > + > > +/* > > + * Official intel docs are somewhat sloppy concerning MI_LOAD_REGISTER_IMM: > > + * - Always issue a MI_NOOP _before_ the MI_LOAD_REGISTER_IMM - otherwise hw > > + * simply ignores the register load under certain conditions. > > + * - One can actually load arbitrary many arbitrary registers: Simply issue x > > + * address/value pairs. Don't overdue it, though, x <= 2^4 must hold! > > + */ > > +#define MI_LOAD_REGISTER_IMM(x) MI_INSTR(0x22, 2*(x)-1) > > +/* Gen11+. addr = base + (ctx_restore ? offset & GENMASK(12,2) : offset) */ > > +#define MI_LRI_LRM_CS_MMIO REG_BIT(19) > > +#define MI_LRI_MMIO_REMAP_EN REG_BIT(17) > > +#define MI_LRI_FORCE_POSTED (1<<12) > > +#define MI_LOAD_REGISTER_IMM_MAX_REGS (126) > > +#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 1) > > +#define MI_STORE_REGISTER_MEM_GEN8 MI_INSTR(0x24, 2) > > +#define MI_SRM_LRM_GLOBAL_GTT (1<<22) > > +#define MI_FLUSH_DW MI_INSTR(0x26, 1) /* for GEN6 */ > > +#define MI_FLUSH_DW_PROTECTED_MEM_EN (1 << 22) > > +#define MI_FLUSH_DW_STORE_INDEX (1<<21) > > +#define MI_INVALIDATE_TLB (1<<18) > > +#define MI_FLUSH_DW_CCS (1<<16) > > +#define MI_FLUSH_DW_OP_STOREDW (1<<14) > > +#define MI_FLUSH_DW_OP_MASK (3<<14) > > +#define MI_FLUSH_DW_LLC (1<<9) > > +#define MI_FLUSH_DW_NOTIFY (1<<8) > > +#define MI_INVALIDATE_BSD (1<<7) > > +#define MI_FLUSH_DW_USE_GTT (1<<2) > > +#define MI_FLUSH_DW_USE_PPGTT (0<<2) > > +#define MI_LOAD_REGISTER_MEM MI_INSTR(0x29, 1) > > +#define MI_LOAD_REGISTER_MEM_GEN8 MI_INSTR(0x29, 2) > > +#define MI_LOAD_REGISTER_REG MI_INSTR(0x2A, 1) > > +#define MI_LRR_SOURCE_CS_MMIO REG_BIT(18) > > +#define MI_BATCH_BUFFER MI_INSTR(0x30, 1) > > +#define MI_BATCH_NON_SECURE (1) > > +/* for snb/ivb/vlv this also means "batch in ppgtt" when ppgtt is enabled. */ > > +#define MI_BATCH_NON_SECURE_I965 (1<<8) > > +#define MI_BATCH_PPGTT_HSW (1<<8) > > +#define MI_BATCH_NON_SECURE_HSW (1<<13) > > +#define MI_BATCH_BUFFER_START MI_INSTR(0x31, 0) > > +#define MI_BATCH_GTT (2<<6) /* aliased with (1<<7) on gen4 */ > > +#define MI_BATCH_BUFFER_START_GEN8 MI_INSTR(0x31, 1) > > +#define MI_BATCH_RESOURCE_STREAMER REG_BIT(10) > > +#define MI_BATCH_PREDICATE REG_BIT(15) /* HSW+ on RCS only*/ > > + > > +#define MI_OPCODE(x) (((x) >> 23) & 0x3f) > > +#define IS_MI_LRI_CMD(x) (MI_OPCODE(x) == MI_OPCODE(MI_INSTR(0x22, 0))) > > +#define MI_LRI_LEN(x) (((x) & 0xff) + 1) > > + > > +/* > > + * 3D instructions used by the kernel > > + */ > > +#define GFX_INSTR(opcode, flags) ((0x3 << 29) | ((opcode) << 24) | (flags)) > > + > > +#define GEN9_MEDIA_POOL_STATE ((0x3 << 29) | (0x2 << 27) | (0x5 << 16) | 4) > > +#define GEN9_MEDIA_POOL_ENABLE (1 << 31) > > +#define GFX_OP_RASTER_RULES ((0x3<<29)|(0x7<<24)) > > +#define GFX_OP_SCISSOR ((0x3<<29)|(0x1c<<24)|(0x10<<19)) > > +#define SC_UPDATE_SCISSOR (0x1<<1) > > +#define SC_ENABLE_MASK (0x1<<0) > > +#define SC_ENABLE (0x1<<0) > > +#define GFX_OP_LOAD_INDIRECT ((0x3<<29)|(0x1d<<24)|(0x7<<16)) > > +#define GFX_OP_SCISSOR_INFO ((0x3<<29)|(0x1d<<24)|(0x81<<16)|(0x1)) > > +#define SCI_YMIN_MASK (0xffff<<16) > > +#define SCI_XMIN_MASK (0xffff<<0) > > +#define SCI_YMAX_MASK (0xffff<<16) > > +#define SCI_XMAX_MASK (0xffff<<0) > > +#define GFX_OP_SCISSOR_ENABLE ((0x3<<29)|(0x1c<<24)|(0x10<<19)) > > +#define GFX_OP_SCISSOR_RECT ((0x3<<29)|(0x1d<<24)|(0x81<<16)|1) > > +#define GFX_OP_COLOR_FACTOR ((0x3<<29)|(0x1d<<24)|(0x1<<16)|0x0) > > +#define GFX_OP_STIPPLE ((0x3<<29)|(0x1d<<24)|(0x83<<16)) > > +#define GFX_OP_MAP_INFO ((0x3<<29)|(0x1d<<24)|0x4) > > +#define GFX_OP_DESTBUFFER_VARS ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0) > > +#define GFX_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1) > > +#define GFX_OP_DRAWRECT_INFO ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3)) > > +#define GFX_OP_DRAWRECT_INFO_I965 ((0x7900<<16)|0x2) > > + > > +#define XY_CTRL_SURF_INSTR_SIZE 5 > > +#define MI_FLUSH_DW_SIZE 3 > > +#define XY_CTRL_SURF_COPY_BLT ((2 << 29) | (0x48 << 22) | 3) > > +#define SRC_ACCESS_TYPE_SHIFT 21 > > +#define DST_ACCESS_TYPE_SHIFT 20 > > +#define CCS_SIZE_MASK 0x3FF > > +#define CCS_SIZE_SHIFT 8 > > +#define XY_CTRL_SURF_MOCS_MASK GENMASK(31, 25) > > +#define NUM_CCS_BYTES_PER_BLOCK 256 > > +#define NUM_BYTES_PER_CCS_BYTE 256 > > +#define NUM_CCS_BLKS_PER_XFER 1024 > > +#define INDIRECT_ACCESS 0 > > +#define DIRECT_ACCESS 1 > > + > > +#define COLOR_BLT_CMD (2 << 29 | 0x40 << 22 | (5 - 2)) > > +#define XY_COLOR_BLT_CMD (2 << 29 | 0x50 << 22) > > +#define XY_FAST_COLOR_BLT_CMD (2 << 29 | 0x44 << 22) > > +#define XY_FAST_COLOR_BLT_DEPTH_32 (2 << 19) > > +#define XY_FAST_COLOR_BLT_DW 16 > > +#define XY_FAST_COLOR_BLT_MOCS_MASK GENMASK(27, 21) > > +#define XY_FAST_COLOR_BLT_MEM_TYPE_SHIFT 31 > > + > > +#define XY_FAST_COPY_BLT_D0_SRC_TILING_MASK REG_GENMASK(21, 20) > > +#define XY_FAST_COPY_BLT_D0_DST_TILING_MASK REG_GENMASK(14, 13) > > +#define XY_FAST_COPY_BLT_D0_SRC_TILE_MODE(mode) \ > > + REG_FIELD_PREP(XY_FAST_COPY_BLT_D0_SRC_TILING_MASK, mode) > > +#define XY_FAST_COPY_BLT_D0_DST_TILE_MODE(mode) \ > > + REG_FIELD_PREP(XY_FAST_COPY_BLT_D0_DST_TILING_MASK, mode) > > +#define LINEAR 0 > > +#define TILE_X 0x1 > > +#define XMAJOR 0x1 > > +#define YMAJOR 0x2 > > +#define TILE_64 0x3 > > +#define XY_FAST_COPY_BLT_D1_SRC_TILE4 REG_BIT(31) > > +#define XY_FAST_COPY_BLT_D1_DST_TILE4 REG_BIT(30) > > +#define BLIT_CCTL_SRC_MOCS_MASK REG_GENMASK(6, 0) > > +#define BLIT_CCTL_DST_MOCS_MASK REG_GENMASK(14, 8) > > +/* Note: MOCS value = (index << 1) */ > > +#define BLIT_CCTL_SRC_MOCS(idx) \ > > + REG_FIELD_PREP(BLIT_CCTL_SRC_MOCS_MASK, (idx) << 1) > > +#define BLIT_CCTL_DST_MOCS(idx) \ > > + REG_FIELD_PREP(BLIT_CCTL_DST_MOCS_MASK, (idx) << 1) > > + > > +#define SRC_COPY_BLT_CMD (2 << 29 | 0x43 << 22) > > +#define GEN9_XY_FAST_COPY_BLT_CMD (2 << 29 | 0x42 << 22) > > +#define XY_SRC_COPY_BLT_CMD (2 << 29 | 0x53 << 22) > > +#define XY_MONO_SRC_COPY_IMM_BLT (2 << 29 | 0x71 << 22 | 5) > > +#define BLT_WRITE_A (2<<20) > > +#define BLT_WRITE_RGB (1<<20) > > +#define BLT_WRITE_RGBA (BLT_WRITE_RGB | BLT_WRITE_A) > > +#define BLT_DEPTH_8 (0<<24) > > +#define BLT_DEPTH_16_565 (1<<24) > > +#define BLT_DEPTH_16_1555 (2<<24) > > +#define BLT_DEPTH_32 (3<<24) > > +#define BLT_ROP_SRC_COPY (0xcc<<16) > > +#define BLT_ROP_COLOR_COPY (0xf0<<16) > > +#define XY_SRC_COPY_BLT_SRC_TILED (1<<15) /* 965+ only */ > > +#define XY_SRC_COPY_BLT_DST_TILED (1<<11) /* 965+ only */ > > +#define CMD_OP_DISPLAYBUFFER_INFO ((0x0<<29)|(0x14<<23)|2) > > +#define ASYNC_FLIP (1<<22) > > +#define DISPLAY_PLANE_A (0<<20) > > +#define DISPLAY_PLANE_B (1<<20) > > +#define GFX_OP_PIPE_CONTROL(len) ((0x3<<29)|(0x3<<27)|(0x2<<24)|((len)-2)) > > +#define PIPE_CONTROL_COMMAND_CACHE_INVALIDATE (1<<29) /* gen11+ */ > > +#define PIPE_CONTROL_TILE_CACHE_FLUSH (1<<28) /* gen11+ */ > > +#define PIPE_CONTROL_FLUSH_L3 (1<<27) > > +#define PIPE_CONTROL_AMFS_FLUSH (1<<25) /* gen12+ */ > > +#define PIPE_CONTROL_GLOBAL_GTT_IVB (1<<24) /* gen7+ */ > > +#define PIPE_CONTROL_MMIO_WRITE (1<<23) > > +#define PIPE_CONTROL_STORE_DATA_INDEX (1<<21) > > +#define PIPE_CONTROL_CS_STALL (1<<20) > > +#define PIPE_CONTROL_GLOBAL_SNAPSHOT_RESET (1<<19) > > +#define PIPE_CONTROL_TLB_INVALIDATE (1<<18) > > +#define PIPE_CONTROL_PSD_SYNC (1<<17) /* gen11+ */ > > +#define PIPE_CONTROL_MEDIA_STATE_CLEAR (1<<16) > > +#define PIPE_CONTROL_WRITE_TIMESTAMP (3<<14) > > +#define PIPE_CONTROL_QW_WRITE (1<<14) > > +#define PIPE_CONTROL_POST_SYNC_OP_MASK (3<<14) > > +#define PIPE_CONTROL_DEPTH_STALL (1<<13) > > +#define PIPE_CONTROL_WRITE_FLUSH (1<<12) > > +#define PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH (1<<12) /* gen6+ */ > > +#define PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE (1<<11) /* MBZ on ILK */ > > +#define PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE (1<<10) /* GM45+ only */ > > +#define PIPE_CONTROL_INDIRECT_STATE_DISABLE (1<<9) > > +#define PIPE_CONTROL0_HDC_PIPELINE_FLUSH REG_BIT(9) /* gen12 */ > > +#define PIPE_CONTROL_NOTIFY (1<<8) > > +#define PIPE_CONTROL_FLUSH_ENABLE (1<<7) /* gen7+ */ > > +#define PIPE_CONTROL_DC_FLUSH_ENABLE (1<<5) > > +#define PIPE_CONTROL_VF_CACHE_INVALIDATE (1<<4) > > +#define PIPE_CONTROL_CONST_CACHE_INVALIDATE (1<<3) > > +#define PIPE_CONTROL_STATE_CACHE_INVALIDATE (1<<2) > > +#define PIPE_CONTROL_STALL_AT_SCOREBOARD (1<<1) > > +#define PIPE_CONTROL_DEPTH_CACHE_FLUSH (1<<0) > > +#define PIPE_CONTROL_GLOBAL_GTT (1<<2) /* in addr dword */ > > + > > +/* > > + * 3D-related flags that can't be set on _engines_ that lack access to the 3D > > + * pipeline (i.e., CCS engines). > > + */ > > +#define PIPE_CONTROL_3D_ENGINE_FLAGS (\ > > + PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH | \ > > + PIPE_CONTROL_DEPTH_CACHE_FLUSH | \ > > + PIPE_CONTROL_TILE_CACHE_FLUSH | \ > > + PIPE_CONTROL_DEPTH_STALL | \ > > + PIPE_CONTROL_STALL_AT_SCOREBOARD | \ > > + PIPE_CONTROL_PSD_SYNC | \ > > + PIPE_CONTROL_AMFS_FLUSH | \ > > + PIPE_CONTROL_VF_CACHE_INVALIDATE | \ > > + PIPE_CONTROL_GLOBAL_SNAPSHOT_RESET) > > + > > +/* 3D-related flags that can't be set on _platforms_ that lack a 3D pipeline */ > > +#define PIPE_CONTROL_3D_ARCH_FLAGS ( \ > > + PIPE_CONTROL_3D_ENGINE_FLAGS | \ > > + PIPE_CONTROL_INDIRECT_STATE_DISABLE | \ > > + PIPE_CONTROL_FLUSH_ENABLE | \ > > + PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE | \ > > + PIPE_CONTROL_DC_FLUSH_ENABLE) > > + > > +#define MI_MATH(x) MI_INSTR(0x1a, (x) - 1) > > +#define MI_MATH_INSTR(opcode, op1, op2) ((opcode) << 20 | (op1) << 10 | (op2)) > > +/* Opcodes for MI_MATH_INSTR */ > > +#define MI_MATH_NOOP MI_MATH_INSTR(0x000, 0x0, 0x0) > > +#define MI_MATH_LOAD(op1, op2) MI_MATH_INSTR(0x080, op1, op2) > > +#define MI_MATH_LOADINV(op1, op2) MI_MATH_INSTR(0x480, op1, op2) > > +#define MI_MATH_LOAD0(op1) MI_MATH_INSTR(0x081, op1) > > +#define MI_MATH_LOAD1(op1) MI_MATH_INSTR(0x481, op1) > > +#define MI_MATH_ADD MI_MATH_INSTR(0x100, 0x0, 0x0) > > +#define MI_MATH_SUB MI_MATH_INSTR(0x101, 0x0, 0x0) > > +#define MI_MATH_AND MI_MATH_INSTR(0x102, 0x0, 0x0) > > +#define MI_MATH_OR MI_MATH_INSTR(0x103, 0x0, 0x0) > > +#define MI_MATH_XOR MI_MATH_INSTR(0x104, 0x0, 0x0) > > +#define MI_MATH_STORE(op1, op2) MI_MATH_INSTR(0x180, op1, op2) > > +#define MI_MATH_STOREINV(op1, op2) MI_MATH_INSTR(0x580, op1, op2) > > +/* Registers used as operands in MI_MATH_INSTR */ > > +#define MI_MATH_REG(x) (x) > > +#define MI_MATH_REG_SRCA 0x20 > > +#define MI_MATH_REG_SRCB 0x21 > > +#define MI_MATH_REG_ACCU 0x31 > > +#define MI_MATH_REG_ZF 0x32 > > +#define MI_MATH_REG_CF 0x33 > > + > > +/* > > + * Media instructions used by the kernel > > + */ > > +#define MEDIA_INSTR(pipe, op, sub_op, flags) \ > > + (__INSTR(INSTR_RC_CLIENT) | (pipe) << INSTR_SUBCLIENT_SHIFT | \ > > + (op) << INSTR_26_TO_24_SHIFT | (sub_op) << 16 | (flags)) > > + > > +#define MFX_WAIT MEDIA_INSTR(1, 0, 0, 0) > > +#define MFX_WAIT_DW0_MFX_SYNC_CONTROL_FLAG REG_BIT(8) > > +#define MFX_WAIT_DW0_PXP_SYNC_CONTROL_FLAG REG_BIT(9) > > + > > +#define CRYPTO_KEY_EXCHANGE MEDIA_INSTR(2, 6, 9, 0) > > + > > +/* > > + * Commands used only by the command parser > > + */ > > +#define MI_SET_PREDICATE MI_INSTR(0x01, 0) > > +#define MI_ARB_CHECK MI_INSTR(0x05, 0) > > +#define MI_RS_CONTROL MI_INSTR(0x06, 0) > > +#define MI_URB_ATOMIC_ALLOC MI_INSTR(0x09, 0) > > +#define MI_PREDICATE MI_INSTR(0x0C, 0) > > +#define MI_RS_CONTEXT MI_INSTR(0x0F, 0) > > +#define MI_TOPOLOGY_FILTER MI_INSTR(0x0D, 0) > > +#define MI_LOAD_SCAN_LINES_EXCL MI_INSTR(0x13, 0) > > +#define MI_URB_CLEAR MI_INSTR(0x19, 0) > > +#define MI_UPDATE_GTT MI_INSTR(0x23, 0) > > +#define MI_CLFLUSH MI_INSTR(0x27, 0) > > +#define MI_REPORT_PERF_COUNT MI_INSTR(0x28, 0) > > +#define MI_REPORT_PERF_COUNT_GGTT (1<<0) > > +#define MI_RS_STORE_DATA_IMM MI_INSTR(0x2B, 0) > > +#define MI_LOAD_URB_MEM MI_INSTR(0x2C, 0) > > +#define MI_STORE_URB_MEM MI_INSTR(0x2D, 0) > > +#define MI_CONDITIONAL_BATCH_BUFFER_END MI_INSTR(0x36, 0) > > +#define MI_DO_COMPARE REG_BIT(21) > > + > > +#define STATE_BASE_ADDRESS \ > > + ((0x3 << 29) | (0x0 << 27) | (0x1 << 24) | (0x1 << 16)) > > +#define BASE_ADDRESS_MODIFY REG_BIT(0) > > +#define PIPELINE_SELECT \ > > + ((0x3 << 29) | (0x1 << 27) | (0x1 << 24) | (0x4 << 16)) > > +#define PIPELINE_SELECT_MEDIA REG_BIT(0) > > +#define GFX_OP_3DSTATE_VF_STATISTICS \ > > + ((0x3 << 29) | (0x1 << 27) | (0x0 << 24) | (0xB << 16)) > > +#define MEDIA_VFE_STATE \ > > + ((0x3 << 29) | (0x2 << 27) | (0x0 << 24) | (0x0 << 16)) > > +#define MEDIA_VFE_STATE_MMIO_ACCESS_MASK (0x18) > > +#define MEDIA_INTERFACE_DESCRIPTOR_LOAD \ > > + ((0x3 << 29) | (0x2 << 27) | (0x0 << 24) | (0x2 << 16)) > > +#define MEDIA_OBJECT \ > > + ((0x3 << 29) | (0x2 << 27) | (0x1 << 24) | (0x0 << 16)) > > +#define GPGPU_OBJECT ((0x3<<29)|(0x2<<27)|(0x1<<24)|(0x4<<16)) > > +#define GPGPU_WALKER ((0x3<<29)|(0x2<<27)|(0x1<<24)|(0x5<<16)) > > +#define GFX_OP_3DSTATE_DX9_CONSTANTF_VS \ > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x39<<16)) > > +#define GFX_OP_3DSTATE_DX9_CONSTANTF_PS \ > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x3A<<16)) > > +#define GFX_OP_3DSTATE_SO_DECL_LIST \ > > + ((0x3<<29)|(0x3<<27)|(0x1<<24)|(0x17<<16)) > > + > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_VS \ > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x43<<16)) > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_GS \ > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x44<<16)) > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_HS \ > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x45<<16)) > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_DS \ > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x46<<16)) > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_PS \ > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x47<<16)) > > + > > +#define COLOR_BLT ((0x2<<29)|(0x40<<22)) > > +#define SRC_COPY_BLT ((0x2<<29)|(0x43<<22)) > > + > > +#define GSC_INSTR(opcode, data, flags) \ > > + (__INSTR(INSTR_GSC_CLIENT) | (opcode) << 22 | (data) << 9 | (flags)) > > + > > +#define GSC_FW_LOAD GSC_INSTR(1, 0, 2) > > +#define HECI1_FW_LIMIT_VALID (1 << 31) > > + > > +/* > > + * Used to convert any address to canonical form. > > + * Starting from gen8, some commands (e.g. STATE_BASE_ADDRESS, > > + * MI_LOAD_REGISTER_MEM and others, see Broadwell PRM Vol2a) require the > > + * addresses to be in a canonical form: > > + * "GraphicsAddress[63:48] are ignored by the HW and assumed to be in correct > > + * canonical form [63:48] == [47]." > > + */ > > +#define GEN8_HIGH_ADDRESS_BIT 47 > > +static inline u64 gen8_canonical_addr(u64 address) > > +{ > > + return sign_extend64(address, GEN8_HIGH_ADDRESS_BIT); > > +} > > + > > +static inline u64 gen8_noncanonical_addr(u64 address) > > +{ > > + return address & GENMASK_ULL(GEN8_HIGH_ADDRESS_BIT, 0); > > +} > > + > > +static inline u32 *__gen6_emit_bb_start(u32 *cs, u32 addr, unsigned int flags) > > +{ > > + *cs++ = MI_BATCH_BUFFER_START | flags; > > + *cs++ = addr; > > + > > + return cs; > > +} > > + > > +#endif /* _INTEL_GPU_COMMANDS_H_ */ > > diff --git a/include/linux/bitops.h b/include/linux/bitops.h > > new file mode 100644 > > index 0000000000..1bbe60c83c > > --- /dev/null > > +++ b/include/linux/bitops.h > > @@ -0,0 +1,8 @@ > > +/* SPDX-License-Identifier: MIT */ > > + > > +#ifndef _HAX_LINUX_BITOPS_H_ > > +#define _HAX_LINUX_BITOPS_H_ > ----------- ^ > I would prefer here normal word. > My intention was to inform the reader that code implements some non-standard thing to prompt to read commit message. But I won't resist to have _LINUX_BITOPS_H_ here. I wondered to put scaffold definitions here, but location might be confusint. > Please add some explanation why we deletegate these to > linux_scaffold.h > You mean explanation in the file or in the commit message? > > + > > +#include <linux_scaffold.h> > > + > > +#endif /* _HAX_LINUX_BITOPS_H_ */ > > diff --git a/include/linux_scaffold.h b/include/linux_scaffold.h > > new file mode 100644 > > index 0000000000..fe304330e5 > > --- /dev/null > > +++ b/include/linux_scaffold.h > > @@ -0,0 +1,50 @@ > > +/* SPDX-License-Identifier: MIT */ > > + > > +#ifndef _INTEL_GPU_COMMANDS_SCAFFOLD_H_ > > +#define _INTEL_GPU_COMMANDS_SCAFFOLD_H_ > > + > > +#include <linux/const.h> > ------------ ^ > I would prefer to have this in igt includes, you can copy them > to igt_const.h or maybe copy it to drm-uapi ? If you're including intel_gpu_commands.h only it must be fully resolveable from this header. So definitely we need to have it in intel_gpu_commands.h include chain. And this is minimalistic include set. > > Or maybe just copy it here and remove this include ? > > > + > > +#include <stdint.h> > > + > > +typedef uint8_t u8; > > +typedef uint16_t u16; > > +typedef uint32_t u32; > > +typedef uint64_t u64; > > + > > +typedef int8_t s8; > > +typedef int16_t s16; > > +typedef int32_t s32; > > +typedef int64_t s64; > > Above typedefs looks like a good candidate to igt_types.h > I see panfrost-misc.h defines this already, so I'm sure generic igt header should define those types. > > + > > +static s64 sign_extend64(u64 value, int index) > -------- ^ inline > Ok. > > +{ > > + int shift = 63 - index; > > + return (s64)(value << shift) >> shift; > > +} > > + > > +/* Make IGT build with Kernels < 4.17 */ > > +#ifndef _AC > > +# define _AC(X,Y) __AC(X,Y) > ----------------------- ^ > imho you should also write definition for __AC the same way > May you elaborate? __AC comes from <linux/const.h> so I don't get what you mean. > > +#endif > > +#ifndef _UL > > +# define _UL(x) (_AC(x, UL)) > > +#endif > > +#ifndef _ULL > > +# define _ULL(x) (_AC(x, ULL)) > > +#endif > > + > > +#define GENMASK(h, l) \ > > + (((~_UL(0)) - (_UL(1) << (l)) + 1) & \ > > + (~_UL(0) >> (BITS_PER_LONG - 1 - (h)))) > > + > > +#define GENMASK_ULL(h, l) \ > > + (((~_ULL(0)) - (_ULL(1) << (l)) + 1) & \ > > + (~_ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h)))) > > + > > +#define BITS_PER_BYTE 8 > > +#define BITS_PER_TYPE(t) (sizeof(t) * BITS_PER_BYTE) > > +#define BITS_PER_LONG BITS_PER_TYPE(long) > > +#define BITS_PER_LONG_LONG BITS_PER_TYPE(long long) > > + > > +#endif /* _INTEL_GPU_COMMANDS_SCAFFOLD_H_ */ > > diff --git a/meson.build b/meson.build > > index e7a68503d7..4dc720bc25 100644 > > --- a/meson.build > > +++ b/meson.build > > @@ -85,7 +85,7 @@ with_libdrm = get_option('libdrm_drivers') > > > > build_info = ['Build type: ' + get_option('buildtype')] > > > > -inc = include_directories('include/drm-uapi', 'include/linux-uapi', 'lib', 'lib/stubs/syscalls', '.') > > +inc = include_directories('include', 'include/drm-uapi', 'include/linux-uapi', 'lib', 'lib/stubs/syscalls', '.') > ----------------------------- ^ > This looks strange here. You want to pack "linux" directory to for example include/drm-uapi dir? Will look weird a bit but if you insist. -- Zbigniew > > Regards, > Kamil > > > > > inc_for_gtkdoc = include_directories('lib') > > > > -- > > 2.34.1 > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 1/2] intel_gpu_commands: Use kernel copy commands definition 2023-03-06 15:05 ` Zbigniew Kempczyński @ 2023-03-07 9:22 ` Kamil Konieczny 2023-03-07 10:11 ` Zbigniew Kempczyński 0 siblings, 1 reply; 11+ messages in thread From: Kamil Konieczny @ 2023-03-07 9:22 UTC (permalink / raw) To: igt-dev Hi Zbigniew, On 2023-03-06 at 16:05:34 +0100, Zbigniew Kempczyński wrote: > On Mon, Mar 06, 2023 at 03:11:00PM +0100, Kamil Konieczny wrote: > > Hi Zbigniew, > > > > please improve commit description in Subject: > > intel_gpu_commands: Use kernel copy commands definition > > ------------------------------ ^ > > > > imho better word wold be gpu, so it will read: > > Ok, agree. > > > > > intel_gpu_commands: Use kernel gpu commands definition > > > > On 2023-03-03 at 13:55:20 +0100, Zbigniew Kempczyński wrote: > > > i915 has nicely collected command macros in one file. We want to use > > > this pattern (file) and remove duplicated definitions. Unfortunately > > > command file uses includes which don't exists in userspace, so we > > > need to import minimal set of kernel includes to ensure we will have > > > verbatim copy in the future. > > > > > > Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> > > > Cc: Petri Latvala <adrinael@adrinael.net> > > > Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com> > > > --- > > > include/intel_gpu_commands.h | 470 +++++++++++++++++++++++++++++++++++ > > > include/linux/bitops.h | 8 + > > > include/linux_scaffold.h | 50 ++++ > > > meson.build | 2 +- > > > 4 files changed, 529 insertions(+), 1 deletion(-) > > > create mode 100644 include/intel_gpu_commands.h > > > create mode 100644 include/linux/bitops.h > > > create mode 100644 include/linux_scaffold.h > > > > > > diff --git a/include/intel_gpu_commands.h b/include/intel_gpu_commands.h > > > new file mode 100644 > > > index 0000000000..e10507fa71 > > > --- /dev/null > > > +++ b/include/intel_gpu_commands.h > > > @@ -0,0 +1,470 @@ > > > +/* SPDX-License-Identifier: MIT*/ > > > +/* > > > + * Copyright © 2003-2018 Intel Corporation > > > + */ > > > + > > > +#ifndef _INTEL_GPU_COMMANDS_H_ > > > +#define _INTEL_GPU_COMMANDS_H_ > > > + > > > +#include <linux/bitops.h> > > > + > > > +/* > > > + * Target address alignments required for GPU access e.g. > > > + * MI_STORE_DWORD_IMM. > > > + */ > > > +#define alignof_dword 4 > > > +#define alignof_qword 8 > > > + > > > +/* > > > + * Instruction field definitions used by the command parser > > > + */ > > > +#define INSTR_CLIENT_SHIFT 29 > > > +#define INSTR_MI_CLIENT 0x0 > > > +#define INSTR_BC_CLIENT 0x2 > > > +#define INSTR_GSC_CLIENT 0x2 /* MTL+ */ > > > +#define INSTR_RC_CLIENT 0x3 > > > +#define INSTR_SUBCLIENT_SHIFT 27 > > > +#define INSTR_SUBCLIENT_MASK 0x18000000 > > > +#define INSTR_MEDIA_SUBCLIENT 0x2 > > > +#define INSTR_26_TO_24_MASK 0x7000000 > > > +#define INSTR_26_TO_24_SHIFT 24 > > > + > > > +#define __INSTR(client) ((client) << INSTR_CLIENT_SHIFT) > > > + > > > +/* > > > + * Memory interface instructions used by the kernel > > > + */ > > > +#define MI_INSTR(opcode, flags) \ > > > + (__INSTR(INSTR_MI_CLIENT) | (opcode) << 23 | (flags)) > > > +/* Many MI commands use bit 22 of the header dword for GGTT vs PPGTT */ > > > +#define MI_GLOBAL_GTT (1<<22) > > > + > > > +#define MI_NOOP MI_INSTR(0, 0) > > > +#define MI_SET_PREDICATE MI_INSTR(0x01, 0) > > > +#define MI_SET_PREDICATE_DISABLE (0 << 0) > > > +#define MI_USER_INTERRUPT MI_INSTR(0x02, 0) > > > +#define MI_WAIT_FOR_EVENT MI_INSTR(0x03, 0) > > > +#define MI_WAIT_FOR_OVERLAY_FLIP (1<<16) > > > +#define MI_WAIT_FOR_PLANE_B_FLIP (1<<6) > > > +#define MI_WAIT_FOR_PLANE_A_FLIP (1<<2) > > > +#define MI_WAIT_FOR_PLANE_A_SCANLINES (1<<1) > > > +#define MI_FLUSH MI_INSTR(0x04, 0) > > > +#define MI_READ_FLUSH (1 << 0) > > > +#define MI_EXE_FLUSH (1 << 1) > > > +#define MI_NO_WRITE_FLUSH (1 << 2) > > > +#define MI_SCENE_COUNT (1 << 3) /* just increment scene count */ > > > +#define MI_END_SCENE (1 << 4) /* flush binner and incr scene count */ > > > +#define MI_INVALIDATE_ISP (1 << 5) /* invalidate indirect state pointers */ > > > +#define MI_REPORT_HEAD MI_INSTR(0x07, 0) > > > +#define MI_ARB_ON_OFF MI_INSTR(0x08, 0) > > > +#define MI_ARB_ENABLE (1<<0) > > > +#define MI_ARB_DISABLE (0<<0) > > > +#define MI_BATCH_BUFFER_END MI_INSTR(0x0a, 0) > > > +#define MI_SUSPEND_FLUSH MI_INSTR(0x0b, 0) > > > +#define MI_SUSPEND_FLUSH_EN (1<<0) > > > +#define MI_SET_APPID MI_INSTR(0x0e, 0) > > > +#define MI_SET_APPID_SESSION_ID(x) ((x) << 0) > > > +#define MI_OVERLAY_FLIP MI_INSTR(0x11, 0) > > > +#define MI_OVERLAY_CONTINUE (0x0<<21) > > > +#define MI_OVERLAY_ON (0x1<<21) > > > +#define MI_OVERLAY_OFF (0x2<<21) > > > +#define MI_LOAD_SCAN_LINES_INCL MI_INSTR(0x12, 0) > > > +#define MI_DISPLAY_FLIP MI_INSTR(0x14, 2) > > > +#define MI_DISPLAY_FLIP_I915 MI_INSTR(0x14, 1) > > > +#define MI_DISPLAY_FLIP_PLANE(n) ((n) << 20) > > > +/* IVB has funny definitions for which plane to flip. */ > > > +#define MI_DISPLAY_FLIP_IVB_PLANE_A (0 << 19) > > > +#define MI_DISPLAY_FLIP_IVB_PLANE_B (1 << 19) > > > +#define MI_DISPLAY_FLIP_IVB_SPRITE_A (2 << 19) > > > +#define MI_DISPLAY_FLIP_IVB_SPRITE_B (3 << 19) > > > +#define MI_DISPLAY_FLIP_IVB_PLANE_C (4 << 19) > > > +#define MI_DISPLAY_FLIP_IVB_SPRITE_C (5 << 19) > > > +/* SKL ones */ > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_1_A (0 << 8) > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_1_B (1 << 8) > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_1_C (2 << 8) > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_2_A (4 << 8) > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_2_B (5 << 8) > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_2_C (6 << 8) > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_3_A (7 << 8) > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_3_B (8 << 8) > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_3_C (9 << 8) > > > +#define MI_SEMAPHORE_MBOX MI_INSTR(0x16, 1) /* gen6, gen7 */ > > > +#define MI_SEMAPHORE_GLOBAL_GTT (1<<22) > > > +#define MI_SEMAPHORE_UPDATE (1<<21) > > > +#define MI_SEMAPHORE_COMPARE (1<<20) > > > +#define MI_SEMAPHORE_REGISTER (1<<18) > > > +#define MI_SEMAPHORE_SYNC_VR (0<<16) /* RCS wait for VCS (RVSYNC) */ > > > +#define MI_SEMAPHORE_SYNC_VER (1<<16) /* RCS wait for VECS (RVESYNC) */ > > > +#define MI_SEMAPHORE_SYNC_BR (2<<16) /* RCS wait for BCS (RBSYNC) */ > > > +#define MI_SEMAPHORE_SYNC_BV (0<<16) /* VCS wait for BCS (VBSYNC) */ > > > +#define MI_SEMAPHORE_SYNC_VEV (1<<16) /* VCS wait for VECS (VVESYNC) */ > > > +#define MI_SEMAPHORE_SYNC_RV (2<<16) /* VCS wait for RCS (VRSYNC) */ > > > +#define MI_SEMAPHORE_SYNC_RB (0<<16) /* BCS wait for RCS (BRSYNC) */ > > > +#define MI_SEMAPHORE_SYNC_VEB (1<<16) /* BCS wait for VECS (BVESYNC) */ > > > +#define MI_SEMAPHORE_SYNC_VB (2<<16) /* BCS wait for VCS (BVSYNC) */ > > > +#define MI_SEMAPHORE_SYNC_BVE (0<<16) /* VECS wait for BCS (VEBSYNC) */ > > > +#define MI_SEMAPHORE_SYNC_VVE (1<<16) /* VECS wait for VCS (VEVSYNC) */ > > > +#define MI_SEMAPHORE_SYNC_RVE (2<<16) /* VECS wait for RCS (VERSYNC) */ > > > +#define MI_SEMAPHORE_SYNC_INVALID (3<<16) > > > +#define MI_SEMAPHORE_SYNC_MASK (3<<16) > > > +#define MI_SET_CONTEXT MI_INSTR(0x18, 0) > > > +#define MI_MM_SPACE_GTT (1<<8) > > > +#define MI_MM_SPACE_PHYSICAL (0<<8) > > > +#define MI_SAVE_EXT_STATE_EN (1<<3) > > > +#define MI_RESTORE_EXT_STATE_EN (1<<2) > > > +#define MI_FORCE_RESTORE (1<<1) > > > +#define MI_RESTORE_INHIBIT (1<<0) > > > +#define HSW_MI_RS_SAVE_STATE_EN (1<<3) > > > +#define HSW_MI_RS_RESTORE_STATE_EN (1<<2) > > > +#define MI_SEMAPHORE_SIGNAL MI_INSTR(0x1b, 0) /* GEN8+ */ > > > +#define MI_SEMAPHORE_TARGET(engine) ((engine)<<15) > > > +#define MI_SEMAPHORE_WAIT MI_INSTR(0x1c, 2) /* GEN8+ */ > > > +#define MI_SEMAPHORE_WAIT_TOKEN MI_INSTR(0x1c, 3) /* GEN12+ */ > > > +#define MI_SEMAPHORE_POLL (1 << 15) > > > +#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > > > +#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > > > +#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > > > +#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > > > +#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > > > +#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > > > +#define MI_SEMAPHORE_TOKEN_MASK REG_GENMASK(9, 5) > > > +#define MI_SEMAPHORE_TOKEN_SHIFT 5 > > > +#define MI_STORE_DATA_IMM MI_INSTR(0x20, 0) > > > +#define MI_STORE_DWORD_IMM MI_INSTR(0x20, 1) > > > +#define MI_STORE_DWORD_IMM_GEN4 MI_INSTR(0x20, 2) > > > +#define MI_STORE_QWORD_IMM_GEN8 (MI_INSTR(0x20, 3) | REG_BIT(21)) > > > +#define MI_MEM_VIRTUAL (1 << 22) /* 945,g33,965 */ > > > +#define MI_USE_GGTT (1 << 22) /* g4x+ */ > > > +#define MI_STORE_DWORD_INDEX MI_INSTR(0x21, 1) > > > +#define MI_ATOMIC MI_INSTR(0x2f, 1) > > > +#define MI_ATOMIC_INLINE (MI_INSTR(0x2f, 9) | MI_ATOMIC_INLINE_DATA) > > > +#define MI_ATOMIC_GLOBAL_GTT (1 << 22) > > > +#define MI_ATOMIC_INLINE_DATA (1 << 18) > > > +#define MI_ATOMIC_CS_STALL (1 << 17) > > > +#define MI_ATOMIC_MOVE (0x4 << 8) > > > + > > > +/* > > > + * Official intel docs are somewhat sloppy concerning MI_LOAD_REGISTER_IMM: > > > + * - Always issue a MI_NOOP _before_ the MI_LOAD_REGISTER_IMM - otherwise hw > > > + * simply ignores the register load under certain conditions. > > > + * - One can actually load arbitrary many arbitrary registers: Simply issue x > > > + * address/value pairs. Don't overdue it, though, x <= 2^4 must hold! > > > + */ > > > +#define MI_LOAD_REGISTER_IMM(x) MI_INSTR(0x22, 2*(x)-1) > > > +/* Gen11+. addr = base + (ctx_restore ? offset & GENMASK(12,2) : offset) */ > > > +#define MI_LRI_LRM_CS_MMIO REG_BIT(19) > > > +#define MI_LRI_MMIO_REMAP_EN REG_BIT(17) > > > +#define MI_LRI_FORCE_POSTED (1<<12) > > > +#define MI_LOAD_REGISTER_IMM_MAX_REGS (126) > > > +#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 1) > > > +#define MI_STORE_REGISTER_MEM_GEN8 MI_INSTR(0x24, 2) > > > +#define MI_SRM_LRM_GLOBAL_GTT (1<<22) > > > +#define MI_FLUSH_DW MI_INSTR(0x26, 1) /* for GEN6 */ > > > +#define MI_FLUSH_DW_PROTECTED_MEM_EN (1 << 22) > > > +#define MI_FLUSH_DW_STORE_INDEX (1<<21) > > > +#define MI_INVALIDATE_TLB (1<<18) > > > +#define MI_FLUSH_DW_CCS (1<<16) > > > +#define MI_FLUSH_DW_OP_STOREDW (1<<14) > > > +#define MI_FLUSH_DW_OP_MASK (3<<14) > > > +#define MI_FLUSH_DW_LLC (1<<9) > > > +#define MI_FLUSH_DW_NOTIFY (1<<8) > > > +#define MI_INVALIDATE_BSD (1<<7) > > > +#define MI_FLUSH_DW_USE_GTT (1<<2) > > > +#define MI_FLUSH_DW_USE_PPGTT (0<<2) > > > +#define MI_LOAD_REGISTER_MEM MI_INSTR(0x29, 1) > > > +#define MI_LOAD_REGISTER_MEM_GEN8 MI_INSTR(0x29, 2) > > > +#define MI_LOAD_REGISTER_REG MI_INSTR(0x2A, 1) > > > +#define MI_LRR_SOURCE_CS_MMIO REG_BIT(18) > > > +#define MI_BATCH_BUFFER MI_INSTR(0x30, 1) > > > +#define MI_BATCH_NON_SECURE (1) > > > +/* for snb/ivb/vlv this also means "batch in ppgtt" when ppgtt is enabled. */ > > > +#define MI_BATCH_NON_SECURE_I965 (1<<8) > > > +#define MI_BATCH_PPGTT_HSW (1<<8) > > > +#define MI_BATCH_NON_SECURE_HSW (1<<13) > > > +#define MI_BATCH_BUFFER_START MI_INSTR(0x31, 0) > > > +#define MI_BATCH_GTT (2<<6) /* aliased with (1<<7) on gen4 */ > > > +#define MI_BATCH_BUFFER_START_GEN8 MI_INSTR(0x31, 1) > > > +#define MI_BATCH_RESOURCE_STREAMER REG_BIT(10) > > > +#define MI_BATCH_PREDICATE REG_BIT(15) /* HSW+ on RCS only*/ > > > + > > > +#define MI_OPCODE(x) (((x) >> 23) & 0x3f) > > > +#define IS_MI_LRI_CMD(x) (MI_OPCODE(x) == MI_OPCODE(MI_INSTR(0x22, 0))) > > > +#define MI_LRI_LEN(x) (((x) & 0xff) + 1) > > > + > > > +/* > > > + * 3D instructions used by the kernel > > > + */ > > > +#define GFX_INSTR(opcode, flags) ((0x3 << 29) | ((opcode) << 24) | (flags)) > > > + > > > +#define GEN9_MEDIA_POOL_STATE ((0x3 << 29) | (0x2 << 27) | (0x5 << 16) | 4) > > > +#define GEN9_MEDIA_POOL_ENABLE (1 << 31) > > > +#define GFX_OP_RASTER_RULES ((0x3<<29)|(0x7<<24)) > > > +#define GFX_OP_SCISSOR ((0x3<<29)|(0x1c<<24)|(0x10<<19)) > > > +#define SC_UPDATE_SCISSOR (0x1<<1) > > > +#define SC_ENABLE_MASK (0x1<<0) > > > +#define SC_ENABLE (0x1<<0) > > > +#define GFX_OP_LOAD_INDIRECT ((0x3<<29)|(0x1d<<24)|(0x7<<16)) > > > +#define GFX_OP_SCISSOR_INFO ((0x3<<29)|(0x1d<<24)|(0x81<<16)|(0x1)) > > > +#define SCI_YMIN_MASK (0xffff<<16) > > > +#define SCI_XMIN_MASK (0xffff<<0) > > > +#define SCI_YMAX_MASK (0xffff<<16) > > > +#define SCI_XMAX_MASK (0xffff<<0) > > > +#define GFX_OP_SCISSOR_ENABLE ((0x3<<29)|(0x1c<<24)|(0x10<<19)) > > > +#define GFX_OP_SCISSOR_RECT ((0x3<<29)|(0x1d<<24)|(0x81<<16)|1) > > > +#define GFX_OP_COLOR_FACTOR ((0x3<<29)|(0x1d<<24)|(0x1<<16)|0x0) > > > +#define GFX_OP_STIPPLE ((0x3<<29)|(0x1d<<24)|(0x83<<16)) > > > +#define GFX_OP_MAP_INFO ((0x3<<29)|(0x1d<<24)|0x4) > > > +#define GFX_OP_DESTBUFFER_VARS ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0) > > > +#define GFX_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1) > > > +#define GFX_OP_DRAWRECT_INFO ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3)) > > > +#define GFX_OP_DRAWRECT_INFO_I965 ((0x7900<<16)|0x2) > > > + > > > +#define XY_CTRL_SURF_INSTR_SIZE 5 > > > +#define MI_FLUSH_DW_SIZE 3 > > > +#define XY_CTRL_SURF_COPY_BLT ((2 << 29) | (0x48 << 22) | 3) > > > +#define SRC_ACCESS_TYPE_SHIFT 21 > > > +#define DST_ACCESS_TYPE_SHIFT 20 > > > +#define CCS_SIZE_MASK 0x3FF > > > +#define CCS_SIZE_SHIFT 8 > > > +#define XY_CTRL_SURF_MOCS_MASK GENMASK(31, 25) > > > +#define NUM_CCS_BYTES_PER_BLOCK 256 > > > +#define NUM_BYTES_PER_CCS_BYTE 256 > > > +#define NUM_CCS_BLKS_PER_XFER 1024 > > > +#define INDIRECT_ACCESS 0 > > > +#define DIRECT_ACCESS 1 > > > + > > > +#define COLOR_BLT_CMD (2 << 29 | 0x40 << 22 | (5 - 2)) > > > +#define XY_COLOR_BLT_CMD (2 << 29 | 0x50 << 22) > > > +#define XY_FAST_COLOR_BLT_CMD (2 << 29 | 0x44 << 22) > > > +#define XY_FAST_COLOR_BLT_DEPTH_32 (2 << 19) > > > +#define XY_FAST_COLOR_BLT_DW 16 > > > +#define XY_FAST_COLOR_BLT_MOCS_MASK GENMASK(27, 21) > > > +#define XY_FAST_COLOR_BLT_MEM_TYPE_SHIFT 31 > > > + > > > +#define XY_FAST_COPY_BLT_D0_SRC_TILING_MASK REG_GENMASK(21, 20) > > > +#define XY_FAST_COPY_BLT_D0_DST_TILING_MASK REG_GENMASK(14, 13) > > > +#define XY_FAST_COPY_BLT_D0_SRC_TILE_MODE(mode) \ > > > + REG_FIELD_PREP(XY_FAST_COPY_BLT_D0_SRC_TILING_MASK, mode) > > > +#define XY_FAST_COPY_BLT_D0_DST_TILE_MODE(mode) \ > > > + REG_FIELD_PREP(XY_FAST_COPY_BLT_D0_DST_TILING_MASK, mode) > > > +#define LINEAR 0 > > > +#define TILE_X 0x1 > > > +#define XMAJOR 0x1 > > > +#define YMAJOR 0x2 > > > +#define TILE_64 0x3 > > > +#define XY_FAST_COPY_BLT_D1_SRC_TILE4 REG_BIT(31) > > > +#define XY_FAST_COPY_BLT_D1_DST_TILE4 REG_BIT(30) > > > +#define BLIT_CCTL_SRC_MOCS_MASK REG_GENMASK(6, 0) > > > +#define BLIT_CCTL_DST_MOCS_MASK REG_GENMASK(14, 8) > > > +/* Note: MOCS value = (index << 1) */ > > > +#define BLIT_CCTL_SRC_MOCS(idx) \ > > > + REG_FIELD_PREP(BLIT_CCTL_SRC_MOCS_MASK, (idx) << 1) > > > +#define BLIT_CCTL_DST_MOCS(idx) \ > > > + REG_FIELD_PREP(BLIT_CCTL_DST_MOCS_MASK, (idx) << 1) > > > + > > > +#define SRC_COPY_BLT_CMD (2 << 29 | 0x43 << 22) > > > +#define GEN9_XY_FAST_COPY_BLT_CMD (2 << 29 | 0x42 << 22) > > > +#define XY_SRC_COPY_BLT_CMD (2 << 29 | 0x53 << 22) > > > +#define XY_MONO_SRC_COPY_IMM_BLT (2 << 29 | 0x71 << 22 | 5) > > > +#define BLT_WRITE_A (2<<20) > > > +#define BLT_WRITE_RGB (1<<20) > > > +#define BLT_WRITE_RGBA (BLT_WRITE_RGB | BLT_WRITE_A) > > > +#define BLT_DEPTH_8 (0<<24) > > > +#define BLT_DEPTH_16_565 (1<<24) > > > +#define BLT_DEPTH_16_1555 (2<<24) > > > +#define BLT_DEPTH_32 (3<<24) > > > +#define BLT_ROP_SRC_COPY (0xcc<<16) > > > +#define BLT_ROP_COLOR_COPY (0xf0<<16) > > > +#define XY_SRC_COPY_BLT_SRC_TILED (1<<15) /* 965+ only */ > > > +#define XY_SRC_COPY_BLT_DST_TILED (1<<11) /* 965+ only */ > > > +#define CMD_OP_DISPLAYBUFFER_INFO ((0x0<<29)|(0x14<<23)|2) > > > +#define ASYNC_FLIP (1<<22) > > > +#define DISPLAY_PLANE_A (0<<20) > > > +#define DISPLAY_PLANE_B (1<<20) > > > +#define GFX_OP_PIPE_CONTROL(len) ((0x3<<29)|(0x3<<27)|(0x2<<24)|((len)-2)) > > > +#define PIPE_CONTROL_COMMAND_CACHE_INVALIDATE (1<<29) /* gen11+ */ > > > +#define PIPE_CONTROL_TILE_CACHE_FLUSH (1<<28) /* gen11+ */ > > > +#define PIPE_CONTROL_FLUSH_L3 (1<<27) > > > +#define PIPE_CONTROL_AMFS_FLUSH (1<<25) /* gen12+ */ > > > +#define PIPE_CONTROL_GLOBAL_GTT_IVB (1<<24) /* gen7+ */ > > > +#define PIPE_CONTROL_MMIO_WRITE (1<<23) > > > +#define PIPE_CONTROL_STORE_DATA_INDEX (1<<21) > > > +#define PIPE_CONTROL_CS_STALL (1<<20) > > > +#define PIPE_CONTROL_GLOBAL_SNAPSHOT_RESET (1<<19) > > > +#define PIPE_CONTROL_TLB_INVALIDATE (1<<18) > > > +#define PIPE_CONTROL_PSD_SYNC (1<<17) /* gen11+ */ > > > +#define PIPE_CONTROL_MEDIA_STATE_CLEAR (1<<16) > > > +#define PIPE_CONTROL_WRITE_TIMESTAMP (3<<14) > > > +#define PIPE_CONTROL_QW_WRITE (1<<14) > > > +#define PIPE_CONTROL_POST_SYNC_OP_MASK (3<<14) > > > +#define PIPE_CONTROL_DEPTH_STALL (1<<13) > > > +#define PIPE_CONTROL_WRITE_FLUSH (1<<12) > > > +#define PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH (1<<12) /* gen6+ */ > > > +#define PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE (1<<11) /* MBZ on ILK */ > > > +#define PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE (1<<10) /* GM45+ only */ > > > +#define PIPE_CONTROL_INDIRECT_STATE_DISABLE (1<<9) > > > +#define PIPE_CONTROL0_HDC_PIPELINE_FLUSH REG_BIT(9) /* gen12 */ > > > +#define PIPE_CONTROL_NOTIFY (1<<8) > > > +#define PIPE_CONTROL_FLUSH_ENABLE (1<<7) /* gen7+ */ > > > +#define PIPE_CONTROL_DC_FLUSH_ENABLE (1<<5) > > > +#define PIPE_CONTROL_VF_CACHE_INVALIDATE (1<<4) > > > +#define PIPE_CONTROL_CONST_CACHE_INVALIDATE (1<<3) > > > +#define PIPE_CONTROL_STATE_CACHE_INVALIDATE (1<<2) > > > +#define PIPE_CONTROL_STALL_AT_SCOREBOARD (1<<1) > > > +#define PIPE_CONTROL_DEPTH_CACHE_FLUSH (1<<0) > > > +#define PIPE_CONTROL_GLOBAL_GTT (1<<2) /* in addr dword */ > > > + > > > +/* > > > + * 3D-related flags that can't be set on _engines_ that lack access to the 3D > > > + * pipeline (i.e., CCS engines). > > > + */ > > > +#define PIPE_CONTROL_3D_ENGINE_FLAGS (\ > > > + PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH | \ > > > + PIPE_CONTROL_DEPTH_CACHE_FLUSH | \ > > > + PIPE_CONTROL_TILE_CACHE_FLUSH | \ > > > + PIPE_CONTROL_DEPTH_STALL | \ > > > + PIPE_CONTROL_STALL_AT_SCOREBOARD | \ > > > + PIPE_CONTROL_PSD_SYNC | \ > > > + PIPE_CONTROL_AMFS_FLUSH | \ > > > + PIPE_CONTROL_VF_CACHE_INVALIDATE | \ > > > + PIPE_CONTROL_GLOBAL_SNAPSHOT_RESET) > > > + > > > +/* 3D-related flags that can't be set on _platforms_ that lack a 3D pipeline */ > > > +#define PIPE_CONTROL_3D_ARCH_FLAGS ( \ > > > + PIPE_CONTROL_3D_ENGINE_FLAGS | \ > > > + PIPE_CONTROL_INDIRECT_STATE_DISABLE | \ > > > + PIPE_CONTROL_FLUSH_ENABLE | \ > > > + PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE | \ > > > + PIPE_CONTROL_DC_FLUSH_ENABLE) > > > + > > > +#define MI_MATH(x) MI_INSTR(0x1a, (x) - 1) > > > +#define MI_MATH_INSTR(opcode, op1, op2) ((opcode) << 20 | (op1) << 10 | (op2)) > > > +/* Opcodes for MI_MATH_INSTR */ > > > +#define MI_MATH_NOOP MI_MATH_INSTR(0x000, 0x0, 0x0) > > > +#define MI_MATH_LOAD(op1, op2) MI_MATH_INSTR(0x080, op1, op2) > > > +#define MI_MATH_LOADINV(op1, op2) MI_MATH_INSTR(0x480, op1, op2) > > > +#define MI_MATH_LOAD0(op1) MI_MATH_INSTR(0x081, op1) > > > +#define MI_MATH_LOAD1(op1) MI_MATH_INSTR(0x481, op1) > > > +#define MI_MATH_ADD MI_MATH_INSTR(0x100, 0x0, 0x0) > > > +#define MI_MATH_SUB MI_MATH_INSTR(0x101, 0x0, 0x0) > > > +#define MI_MATH_AND MI_MATH_INSTR(0x102, 0x0, 0x0) > > > +#define MI_MATH_OR MI_MATH_INSTR(0x103, 0x0, 0x0) > > > +#define MI_MATH_XOR MI_MATH_INSTR(0x104, 0x0, 0x0) > > > +#define MI_MATH_STORE(op1, op2) MI_MATH_INSTR(0x180, op1, op2) > > > +#define MI_MATH_STOREINV(op1, op2) MI_MATH_INSTR(0x580, op1, op2) > > > +/* Registers used as operands in MI_MATH_INSTR */ > > > +#define MI_MATH_REG(x) (x) > > > +#define MI_MATH_REG_SRCA 0x20 > > > +#define MI_MATH_REG_SRCB 0x21 > > > +#define MI_MATH_REG_ACCU 0x31 > > > +#define MI_MATH_REG_ZF 0x32 > > > +#define MI_MATH_REG_CF 0x33 > > > + > > > +/* > > > + * Media instructions used by the kernel > > > + */ > > > +#define MEDIA_INSTR(pipe, op, sub_op, flags) \ > > > + (__INSTR(INSTR_RC_CLIENT) | (pipe) << INSTR_SUBCLIENT_SHIFT | \ > > > + (op) << INSTR_26_TO_24_SHIFT | (sub_op) << 16 | (flags)) > > > + > > > +#define MFX_WAIT MEDIA_INSTR(1, 0, 0, 0) > > > +#define MFX_WAIT_DW0_MFX_SYNC_CONTROL_FLAG REG_BIT(8) > > > +#define MFX_WAIT_DW0_PXP_SYNC_CONTROL_FLAG REG_BIT(9) > > > + > > > +#define CRYPTO_KEY_EXCHANGE MEDIA_INSTR(2, 6, 9, 0) > > > + > > > +/* > > > + * Commands used only by the command parser > > > + */ > > > +#define MI_SET_PREDICATE MI_INSTR(0x01, 0) > > > +#define MI_ARB_CHECK MI_INSTR(0x05, 0) > > > +#define MI_RS_CONTROL MI_INSTR(0x06, 0) > > > +#define MI_URB_ATOMIC_ALLOC MI_INSTR(0x09, 0) > > > +#define MI_PREDICATE MI_INSTR(0x0C, 0) > > > +#define MI_RS_CONTEXT MI_INSTR(0x0F, 0) > > > +#define MI_TOPOLOGY_FILTER MI_INSTR(0x0D, 0) > > > +#define MI_LOAD_SCAN_LINES_EXCL MI_INSTR(0x13, 0) > > > +#define MI_URB_CLEAR MI_INSTR(0x19, 0) > > > +#define MI_UPDATE_GTT MI_INSTR(0x23, 0) > > > +#define MI_CLFLUSH MI_INSTR(0x27, 0) > > > +#define MI_REPORT_PERF_COUNT MI_INSTR(0x28, 0) > > > +#define MI_REPORT_PERF_COUNT_GGTT (1<<0) > > > +#define MI_RS_STORE_DATA_IMM MI_INSTR(0x2B, 0) > > > +#define MI_LOAD_URB_MEM MI_INSTR(0x2C, 0) > > > +#define MI_STORE_URB_MEM MI_INSTR(0x2D, 0) > > > +#define MI_CONDITIONAL_BATCH_BUFFER_END MI_INSTR(0x36, 0) > > > +#define MI_DO_COMPARE REG_BIT(21) > > > + > > > +#define STATE_BASE_ADDRESS \ > > > + ((0x3 << 29) | (0x0 << 27) | (0x1 << 24) | (0x1 << 16)) > > > +#define BASE_ADDRESS_MODIFY REG_BIT(0) > > > +#define PIPELINE_SELECT \ > > > + ((0x3 << 29) | (0x1 << 27) | (0x1 << 24) | (0x4 << 16)) > > > +#define PIPELINE_SELECT_MEDIA REG_BIT(0) > > > +#define GFX_OP_3DSTATE_VF_STATISTICS \ > > > + ((0x3 << 29) | (0x1 << 27) | (0x0 << 24) | (0xB << 16)) > > > +#define MEDIA_VFE_STATE \ > > > + ((0x3 << 29) | (0x2 << 27) | (0x0 << 24) | (0x0 << 16)) > > > +#define MEDIA_VFE_STATE_MMIO_ACCESS_MASK (0x18) > > > +#define MEDIA_INTERFACE_DESCRIPTOR_LOAD \ > > > + ((0x3 << 29) | (0x2 << 27) | (0x0 << 24) | (0x2 << 16)) > > > +#define MEDIA_OBJECT \ > > > + ((0x3 << 29) | (0x2 << 27) | (0x1 << 24) | (0x0 << 16)) > > > +#define GPGPU_OBJECT ((0x3<<29)|(0x2<<27)|(0x1<<24)|(0x4<<16)) > > > +#define GPGPU_WALKER ((0x3<<29)|(0x2<<27)|(0x1<<24)|(0x5<<16)) > > > +#define GFX_OP_3DSTATE_DX9_CONSTANTF_VS \ > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x39<<16)) > > > +#define GFX_OP_3DSTATE_DX9_CONSTANTF_PS \ > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x3A<<16)) > > > +#define GFX_OP_3DSTATE_SO_DECL_LIST \ > > > + ((0x3<<29)|(0x3<<27)|(0x1<<24)|(0x17<<16)) > > > + > > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_VS \ > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x43<<16)) > > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_GS \ > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x44<<16)) > > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_HS \ > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x45<<16)) > > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_DS \ > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x46<<16)) > > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_PS \ > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x47<<16)) > > > + > > > +#define COLOR_BLT ((0x2<<29)|(0x40<<22)) > > > +#define SRC_COPY_BLT ((0x2<<29)|(0x43<<22)) > > > + > > > +#define GSC_INSTR(opcode, data, flags) \ > > > + (__INSTR(INSTR_GSC_CLIENT) | (opcode) << 22 | (data) << 9 | (flags)) > > > + > > > +#define GSC_FW_LOAD GSC_INSTR(1, 0, 2) > > > +#define HECI1_FW_LIMIT_VALID (1 << 31) > > > + > > > +/* > > > + * Used to convert any address to canonical form. > > > + * Starting from gen8, some commands (e.g. STATE_BASE_ADDRESS, > > > + * MI_LOAD_REGISTER_MEM and others, see Broadwell PRM Vol2a) require the > > > + * addresses to be in a canonical form: > > > + * "GraphicsAddress[63:48] are ignored by the HW and assumed to be in correct > > > + * canonical form [63:48] == [47]." > > > + */ > > > +#define GEN8_HIGH_ADDRESS_BIT 47 > > > +static inline u64 gen8_canonical_addr(u64 address) > > > +{ > > > + return sign_extend64(address, GEN8_HIGH_ADDRESS_BIT); > > > +} > > > + > > > +static inline u64 gen8_noncanonical_addr(u64 address) > > > +{ > > > + return address & GENMASK_ULL(GEN8_HIGH_ADDRESS_BIT, 0); > > > +} > > > + > > > +static inline u32 *__gen6_emit_bb_start(u32 *cs, u32 addr, unsigned int flags) > > > +{ > > > + *cs++ = MI_BATCH_BUFFER_START | flags; > > > + *cs++ = addr; > > > + > > > + return cs; > > > +} > > > + > > > +#endif /* _INTEL_GPU_COMMANDS_H_ */ > > > diff --git a/include/linux/bitops.h b/include/linux/bitops.h > > > new file mode 100644 > > > index 0000000000..1bbe60c83c > > > --- /dev/null > > > +++ b/include/linux/bitops.h > > > @@ -0,0 +1,8 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > + > > > +#ifndef _HAX_LINUX_BITOPS_H_ > > > +#define _HAX_LINUX_BITOPS_H_ > > ----------- ^ > > I would prefer here normal word. > > > > My intention was to inform the reader that code implements > some non-standard thing to prompt to read commit message. > But I won't resist to have _LINUX_BITOPS_H_ here. > I wondered to put scaffold definitions here, but location > might be confusint. > > > Please add some explanation why we deletegate these to > > linux_scaffold.h > > > > You mean explanation in the file or in the commit message? In the file. > > > > + > > > +#include <linux_scaffold.h> > > > + > > > +#endif /* _HAX_LINUX_BITOPS_H_ */ > > > diff --git a/include/linux_scaffold.h b/include/linux_scaffold.h > > > new file mode 100644 > > > index 0000000000..fe304330e5 > > > --- /dev/null > > > +++ b/include/linux_scaffold.h > > > @@ -0,0 +1,50 @@ > > > +/* SPDX-License-Identifier: MIT */ > > > + > > > +#ifndef _INTEL_GPU_COMMANDS_SCAFFOLD_H_ > > > +#define _INTEL_GPU_COMMANDS_SCAFFOLD_H_ > > > + > > > +#include <linux/const.h> > > ------------ ^ > > I would prefer to have this in igt includes, you can copy them > > to igt_const.h or maybe copy it to drm-uapi ? > > If you're including intel_gpu_commands.h only it must be fully > resolveable from this header. So definitely we need to have > it in intel_gpu_commands.h include chain. And this is > minimalistic include set. I am thinking about FreeBSD, it will not compile there. > > > > > Or maybe just copy it here and remove this include ? > > > > > + > > > +#include <stdint.h> > > > + > > > +typedef uint8_t u8; > > > +typedef uint16_t u16; > > > +typedef uint32_t u32; > > > +typedef uint64_t u64; > > > + > > > +typedef int8_t s8; > > > +typedef int16_t s16; > > > +typedef int32_t s32; > > > +typedef int64_t s64; > > > > Above typedefs looks like a good candidate to igt_types.h > > > > I see panfrost-misc.h defines this already, so I'm sure > generic igt header should define those types. > It is not a blocker and may be done later, your choice. > > > + > > > +static s64 sign_extend64(u64 value, int index) > > -------- ^ inline > > > > Ok. > > > > +{ > > > + int shift = 63 - index; > > > + return (s64)(value << shift) >> shift; > > > +} > > > + > > > +/* Make IGT build with Kernels < 4.17 */ > > > +#ifndef _AC > > > +# define _AC(X,Y) __AC(X,Y) > > ----------------------- ^ > > imho you should also write definition for __AC the same way > > > > May you elaborate? __AC comes from <linux/const.h> so I don't > get what you mean. You need <linux/const.h> only for string glue macro, so maybe: # define _AC(X,Y) X##Y and drop include <linux/const.h> ? Btw if #ifndef, then maybe something like: #ifndef _AC # define _AC(X,Y) X##Y #else # error "_AC macro already defined" #endif to prevent some silent macro redefinitions and hard to spot bugs? > > > > +#endif > > > +#ifndef _UL > > > +# define _UL(x) (_AC(x, UL)) > > > +#endif > > > +#ifndef _ULL > > > +# define _ULL(x) (_AC(x, ULL)) > > > +#endif > > > + > > > +#define GENMASK(h, l) \ > > > + (((~_UL(0)) - (_UL(1) << (l)) + 1) & \ > > > + (~_UL(0) >> (BITS_PER_LONG - 1 - (h)))) > > > + > > > +#define GENMASK_ULL(h, l) \ > > > + (((~_ULL(0)) - (_ULL(1) << (l)) + 1) & \ > > > + (~_ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h)))) > > > + > > > +#define BITS_PER_BYTE 8 > > > +#define BITS_PER_TYPE(t) (sizeof(t) * BITS_PER_BYTE) > > > +#define BITS_PER_LONG BITS_PER_TYPE(long) > > > +#define BITS_PER_LONG_LONG BITS_PER_TYPE(long long) > > > + > > > +#endif /* _INTEL_GPU_COMMANDS_SCAFFOLD_H_ */ > > > diff --git a/meson.build b/meson.build > > > index e7a68503d7..4dc720bc25 100644 > > > --- a/meson.build > > > +++ b/meson.build > > > @@ -85,7 +85,7 @@ with_libdrm = get_option('libdrm_drivers') > > > > > > build_info = ['Build type: ' + get_option('buildtype')] > > > > > > -inc = include_directories('include/drm-uapi', 'include/linux-uapi', 'lib', 'lib/stubs/syscalls', '.') > > > +inc = include_directories('include', 'include/drm-uapi', 'include/linux-uapi', 'lib', 'lib/stubs/syscalls', '.') > > ----------------------------- ^ > > This looks strange here. > > You want to pack "linux" directory to for example include/drm-uapi dir? > Will look weird a bit but if you insist. > > -- > Zbigniew Ok, you are right, there are new files so thats why it is needed here. Regards, Kamil > > > > > Regards, > > Kamil > > > > > > > > inc_for_gtkdoc = include_directories('lib') > > > > > > -- > > > 2.34.1 > > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 1/2] intel_gpu_commands: Use kernel copy commands definition 2023-03-07 9:22 ` Kamil Konieczny @ 2023-03-07 10:11 ` Zbigniew Kempczyński 0 siblings, 0 replies; 11+ messages in thread From: Zbigniew Kempczyński @ 2023-03-07 10:11 UTC (permalink / raw) To: Kamil Konieczny, igt-dev, Petri Latvala, Zbigniew Kempczyński On Tue, Mar 07, 2023 at 10:22:49AM +0100, Kamil Konieczny wrote: > Hi Zbigniew, > > On 2023-03-06 at 16:05:34 +0100, Zbigniew Kempczyński wrote: > > On Mon, Mar 06, 2023 at 03:11:00PM +0100, Kamil Konieczny wrote: > > > Hi Zbigniew, > > > > > > please improve commit description in Subject: > > > intel_gpu_commands: Use kernel copy commands definition > > > ------------------------------ ^ > > > > > > imho better word wold be gpu, so it will read: > > > > Ok, agree. > > > > > > > > intel_gpu_commands: Use kernel gpu commands definition > > > > > > On 2023-03-03 at 13:55:20 +0100, Zbigniew Kempczyński wrote: > > > > i915 has nicely collected command macros in one file. We want to use > > > > this pattern (file) and remove duplicated definitions. Unfortunately > > > > command file uses includes which don't exists in userspace, so we > > > > need to import minimal set of kernel includes to ensure we will have > > > > verbatim copy in the future. > > > > > > > > Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> > > > > Cc: Petri Latvala <adrinael@adrinael.net> > > > > Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com> > > > > --- > > > > include/intel_gpu_commands.h | 470 +++++++++++++++++++++++++++++++++++ > > > > include/linux/bitops.h | 8 + > > > > include/linux_scaffold.h | 50 ++++ > > > > meson.build | 2 +- > > > > 4 files changed, 529 insertions(+), 1 deletion(-) > > > > create mode 100644 include/intel_gpu_commands.h > > > > create mode 100644 include/linux/bitops.h > > > > create mode 100644 include/linux_scaffold.h > > > > > > > > diff --git a/include/intel_gpu_commands.h b/include/intel_gpu_commands.h > > > > new file mode 100644 > > > > index 0000000000..e10507fa71 > > > > --- /dev/null > > > > +++ b/include/intel_gpu_commands.h > > > > @@ -0,0 +1,470 @@ > > > > +/* SPDX-License-Identifier: MIT*/ > > > > +/* > > > > + * Copyright © 2003-2018 Intel Corporation > > > > + */ > > > > + > > > > +#ifndef _INTEL_GPU_COMMANDS_H_ > > > > +#define _INTEL_GPU_COMMANDS_H_ > > > > + > > > > +#include <linux/bitops.h> > > > > + > > > > +/* > > > > + * Target address alignments required for GPU access e.g. > > > > + * MI_STORE_DWORD_IMM. > > > > + */ > > > > +#define alignof_dword 4 > > > > +#define alignof_qword 8 > > > > + > > > > +/* > > > > + * Instruction field definitions used by the command parser > > > > + */ > > > > +#define INSTR_CLIENT_SHIFT 29 > > > > +#define INSTR_MI_CLIENT 0x0 > > > > +#define INSTR_BC_CLIENT 0x2 > > > > +#define INSTR_GSC_CLIENT 0x2 /* MTL+ */ > > > > +#define INSTR_RC_CLIENT 0x3 > > > > +#define INSTR_SUBCLIENT_SHIFT 27 > > > > +#define INSTR_SUBCLIENT_MASK 0x18000000 > > > > +#define INSTR_MEDIA_SUBCLIENT 0x2 > > > > +#define INSTR_26_TO_24_MASK 0x7000000 > > > > +#define INSTR_26_TO_24_SHIFT 24 > > > > + > > > > +#define __INSTR(client) ((client) << INSTR_CLIENT_SHIFT) > > > > + > > > > +/* > > > > + * Memory interface instructions used by the kernel > > > > + */ > > > > +#define MI_INSTR(opcode, flags) \ > > > > + (__INSTR(INSTR_MI_CLIENT) | (opcode) << 23 | (flags)) > > > > +/* Many MI commands use bit 22 of the header dword for GGTT vs PPGTT */ > > > > +#define MI_GLOBAL_GTT (1<<22) > > > > + > > > > +#define MI_NOOP MI_INSTR(0, 0) > > > > +#define MI_SET_PREDICATE MI_INSTR(0x01, 0) > > > > +#define MI_SET_PREDICATE_DISABLE (0 << 0) > > > > +#define MI_USER_INTERRUPT MI_INSTR(0x02, 0) > > > > +#define MI_WAIT_FOR_EVENT MI_INSTR(0x03, 0) > > > > +#define MI_WAIT_FOR_OVERLAY_FLIP (1<<16) > > > > +#define MI_WAIT_FOR_PLANE_B_FLIP (1<<6) > > > > +#define MI_WAIT_FOR_PLANE_A_FLIP (1<<2) > > > > +#define MI_WAIT_FOR_PLANE_A_SCANLINES (1<<1) > > > > +#define MI_FLUSH MI_INSTR(0x04, 0) > > > > +#define MI_READ_FLUSH (1 << 0) > > > > +#define MI_EXE_FLUSH (1 << 1) > > > > +#define MI_NO_WRITE_FLUSH (1 << 2) > > > > +#define MI_SCENE_COUNT (1 << 3) /* just increment scene count */ > > > > +#define MI_END_SCENE (1 << 4) /* flush binner and incr scene count */ > > > > +#define MI_INVALIDATE_ISP (1 << 5) /* invalidate indirect state pointers */ > > > > +#define MI_REPORT_HEAD MI_INSTR(0x07, 0) > > > > +#define MI_ARB_ON_OFF MI_INSTR(0x08, 0) > > > > +#define MI_ARB_ENABLE (1<<0) > > > > +#define MI_ARB_DISABLE (0<<0) > > > > +#define MI_BATCH_BUFFER_END MI_INSTR(0x0a, 0) > > > > +#define MI_SUSPEND_FLUSH MI_INSTR(0x0b, 0) > > > > +#define MI_SUSPEND_FLUSH_EN (1<<0) > > > > +#define MI_SET_APPID MI_INSTR(0x0e, 0) > > > > +#define MI_SET_APPID_SESSION_ID(x) ((x) << 0) > > > > +#define MI_OVERLAY_FLIP MI_INSTR(0x11, 0) > > > > +#define MI_OVERLAY_CONTINUE (0x0<<21) > > > > +#define MI_OVERLAY_ON (0x1<<21) > > > > +#define MI_OVERLAY_OFF (0x2<<21) > > > > +#define MI_LOAD_SCAN_LINES_INCL MI_INSTR(0x12, 0) > > > > +#define MI_DISPLAY_FLIP MI_INSTR(0x14, 2) > > > > +#define MI_DISPLAY_FLIP_I915 MI_INSTR(0x14, 1) > > > > +#define MI_DISPLAY_FLIP_PLANE(n) ((n) << 20) > > > > +/* IVB has funny definitions for which plane to flip. */ > > > > +#define MI_DISPLAY_FLIP_IVB_PLANE_A (0 << 19) > > > > +#define MI_DISPLAY_FLIP_IVB_PLANE_B (1 << 19) > > > > +#define MI_DISPLAY_FLIP_IVB_SPRITE_A (2 << 19) > > > > +#define MI_DISPLAY_FLIP_IVB_SPRITE_B (3 << 19) > > > > +#define MI_DISPLAY_FLIP_IVB_PLANE_C (4 << 19) > > > > +#define MI_DISPLAY_FLIP_IVB_SPRITE_C (5 << 19) > > > > +/* SKL ones */ > > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_1_A (0 << 8) > > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_1_B (1 << 8) > > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_1_C (2 << 8) > > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_2_A (4 << 8) > > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_2_B (5 << 8) > > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_2_C (6 << 8) > > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_3_A (7 << 8) > > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_3_B (8 << 8) > > > > +#define MI_DISPLAY_FLIP_SKL_PLANE_3_C (9 << 8) > > > > +#define MI_SEMAPHORE_MBOX MI_INSTR(0x16, 1) /* gen6, gen7 */ > > > > +#define MI_SEMAPHORE_GLOBAL_GTT (1<<22) > > > > +#define MI_SEMAPHORE_UPDATE (1<<21) > > > > +#define MI_SEMAPHORE_COMPARE (1<<20) > > > > +#define MI_SEMAPHORE_REGISTER (1<<18) > > > > +#define MI_SEMAPHORE_SYNC_VR (0<<16) /* RCS wait for VCS (RVSYNC) */ > > > > +#define MI_SEMAPHORE_SYNC_VER (1<<16) /* RCS wait for VECS (RVESYNC) */ > > > > +#define MI_SEMAPHORE_SYNC_BR (2<<16) /* RCS wait for BCS (RBSYNC) */ > > > > +#define MI_SEMAPHORE_SYNC_BV (0<<16) /* VCS wait for BCS (VBSYNC) */ > > > > +#define MI_SEMAPHORE_SYNC_VEV (1<<16) /* VCS wait for VECS (VVESYNC) */ > > > > +#define MI_SEMAPHORE_SYNC_RV (2<<16) /* VCS wait for RCS (VRSYNC) */ > > > > +#define MI_SEMAPHORE_SYNC_RB (0<<16) /* BCS wait for RCS (BRSYNC) */ > > > > +#define MI_SEMAPHORE_SYNC_VEB (1<<16) /* BCS wait for VECS (BVESYNC) */ > > > > +#define MI_SEMAPHORE_SYNC_VB (2<<16) /* BCS wait for VCS (BVSYNC) */ > > > > +#define MI_SEMAPHORE_SYNC_BVE (0<<16) /* VECS wait for BCS (VEBSYNC) */ > > > > +#define MI_SEMAPHORE_SYNC_VVE (1<<16) /* VECS wait for VCS (VEVSYNC) */ > > > > +#define MI_SEMAPHORE_SYNC_RVE (2<<16) /* VECS wait for RCS (VERSYNC) */ > > > > +#define MI_SEMAPHORE_SYNC_INVALID (3<<16) > > > > +#define MI_SEMAPHORE_SYNC_MASK (3<<16) > > > > +#define MI_SET_CONTEXT MI_INSTR(0x18, 0) > > > > +#define MI_MM_SPACE_GTT (1<<8) > > > > +#define MI_MM_SPACE_PHYSICAL (0<<8) > > > > +#define MI_SAVE_EXT_STATE_EN (1<<3) > > > > +#define MI_RESTORE_EXT_STATE_EN (1<<2) > > > > +#define MI_FORCE_RESTORE (1<<1) > > > > +#define MI_RESTORE_INHIBIT (1<<0) > > > > +#define HSW_MI_RS_SAVE_STATE_EN (1<<3) > > > > +#define HSW_MI_RS_RESTORE_STATE_EN (1<<2) > > > > +#define MI_SEMAPHORE_SIGNAL MI_INSTR(0x1b, 0) /* GEN8+ */ > > > > +#define MI_SEMAPHORE_TARGET(engine) ((engine)<<15) > > > > +#define MI_SEMAPHORE_WAIT MI_INSTR(0x1c, 2) /* GEN8+ */ > > > > +#define MI_SEMAPHORE_WAIT_TOKEN MI_INSTR(0x1c, 3) /* GEN12+ */ > > > > +#define MI_SEMAPHORE_POLL (1 << 15) > > > > +#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > > > > +#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > > > > +#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > > > > +#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > > > > +#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > > > > +#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > > > > +#define MI_SEMAPHORE_TOKEN_MASK REG_GENMASK(9, 5) > > > > +#define MI_SEMAPHORE_TOKEN_SHIFT 5 > > > > +#define MI_STORE_DATA_IMM MI_INSTR(0x20, 0) > > > > +#define MI_STORE_DWORD_IMM MI_INSTR(0x20, 1) > > > > +#define MI_STORE_DWORD_IMM_GEN4 MI_INSTR(0x20, 2) > > > > +#define MI_STORE_QWORD_IMM_GEN8 (MI_INSTR(0x20, 3) | REG_BIT(21)) > > > > +#define MI_MEM_VIRTUAL (1 << 22) /* 945,g33,965 */ > > > > +#define MI_USE_GGTT (1 << 22) /* g4x+ */ > > > > +#define MI_STORE_DWORD_INDEX MI_INSTR(0x21, 1) > > > > +#define MI_ATOMIC MI_INSTR(0x2f, 1) > > > > +#define MI_ATOMIC_INLINE (MI_INSTR(0x2f, 9) | MI_ATOMIC_INLINE_DATA) > > > > +#define MI_ATOMIC_GLOBAL_GTT (1 << 22) > > > > +#define MI_ATOMIC_INLINE_DATA (1 << 18) > > > > +#define MI_ATOMIC_CS_STALL (1 << 17) > > > > +#define MI_ATOMIC_MOVE (0x4 << 8) > > > > + > > > > +/* > > > > + * Official intel docs are somewhat sloppy concerning MI_LOAD_REGISTER_IMM: > > > > + * - Always issue a MI_NOOP _before_ the MI_LOAD_REGISTER_IMM - otherwise hw > > > > + * simply ignores the register load under certain conditions. > > > > + * - One can actually load arbitrary many arbitrary registers: Simply issue x > > > > + * address/value pairs. Don't overdue it, though, x <= 2^4 must hold! > > > > + */ > > > > +#define MI_LOAD_REGISTER_IMM(x) MI_INSTR(0x22, 2*(x)-1) > > > > +/* Gen11+. addr = base + (ctx_restore ? offset & GENMASK(12,2) : offset) */ > > > > +#define MI_LRI_LRM_CS_MMIO REG_BIT(19) > > > > +#define MI_LRI_MMIO_REMAP_EN REG_BIT(17) > > > > +#define MI_LRI_FORCE_POSTED (1<<12) > > > > +#define MI_LOAD_REGISTER_IMM_MAX_REGS (126) > > > > +#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 1) > > > > +#define MI_STORE_REGISTER_MEM_GEN8 MI_INSTR(0x24, 2) > > > > +#define MI_SRM_LRM_GLOBAL_GTT (1<<22) > > > > +#define MI_FLUSH_DW MI_INSTR(0x26, 1) /* for GEN6 */ > > > > +#define MI_FLUSH_DW_PROTECTED_MEM_EN (1 << 22) > > > > +#define MI_FLUSH_DW_STORE_INDEX (1<<21) > > > > +#define MI_INVALIDATE_TLB (1<<18) > > > > +#define MI_FLUSH_DW_CCS (1<<16) > > > > +#define MI_FLUSH_DW_OP_STOREDW (1<<14) > > > > +#define MI_FLUSH_DW_OP_MASK (3<<14) > > > > +#define MI_FLUSH_DW_LLC (1<<9) > > > > +#define MI_FLUSH_DW_NOTIFY (1<<8) > > > > +#define MI_INVALIDATE_BSD (1<<7) > > > > +#define MI_FLUSH_DW_USE_GTT (1<<2) > > > > +#define MI_FLUSH_DW_USE_PPGTT (0<<2) > > > > +#define MI_LOAD_REGISTER_MEM MI_INSTR(0x29, 1) > > > > +#define MI_LOAD_REGISTER_MEM_GEN8 MI_INSTR(0x29, 2) > > > > +#define MI_LOAD_REGISTER_REG MI_INSTR(0x2A, 1) > > > > +#define MI_LRR_SOURCE_CS_MMIO REG_BIT(18) > > > > +#define MI_BATCH_BUFFER MI_INSTR(0x30, 1) > > > > +#define MI_BATCH_NON_SECURE (1) > > > > +/* for snb/ivb/vlv this also means "batch in ppgtt" when ppgtt is enabled. */ > > > > +#define MI_BATCH_NON_SECURE_I965 (1<<8) > > > > +#define MI_BATCH_PPGTT_HSW (1<<8) > > > > +#define MI_BATCH_NON_SECURE_HSW (1<<13) > > > > +#define MI_BATCH_BUFFER_START MI_INSTR(0x31, 0) > > > > +#define MI_BATCH_GTT (2<<6) /* aliased with (1<<7) on gen4 */ > > > > +#define MI_BATCH_BUFFER_START_GEN8 MI_INSTR(0x31, 1) > > > > +#define MI_BATCH_RESOURCE_STREAMER REG_BIT(10) > > > > +#define MI_BATCH_PREDICATE REG_BIT(15) /* HSW+ on RCS only*/ > > > > + > > > > +#define MI_OPCODE(x) (((x) >> 23) & 0x3f) > > > > +#define IS_MI_LRI_CMD(x) (MI_OPCODE(x) == MI_OPCODE(MI_INSTR(0x22, 0))) > > > > +#define MI_LRI_LEN(x) (((x) & 0xff) + 1) > > > > + > > > > +/* > > > > + * 3D instructions used by the kernel > > > > + */ > > > > +#define GFX_INSTR(opcode, flags) ((0x3 << 29) | ((opcode) << 24) | (flags)) > > > > + > > > > +#define GEN9_MEDIA_POOL_STATE ((0x3 << 29) | (0x2 << 27) | (0x5 << 16) | 4) > > > > +#define GEN9_MEDIA_POOL_ENABLE (1 << 31) > > > > +#define GFX_OP_RASTER_RULES ((0x3<<29)|(0x7<<24)) > > > > +#define GFX_OP_SCISSOR ((0x3<<29)|(0x1c<<24)|(0x10<<19)) > > > > +#define SC_UPDATE_SCISSOR (0x1<<1) > > > > +#define SC_ENABLE_MASK (0x1<<0) > > > > +#define SC_ENABLE (0x1<<0) > > > > +#define GFX_OP_LOAD_INDIRECT ((0x3<<29)|(0x1d<<24)|(0x7<<16)) > > > > +#define GFX_OP_SCISSOR_INFO ((0x3<<29)|(0x1d<<24)|(0x81<<16)|(0x1)) > > > > +#define SCI_YMIN_MASK (0xffff<<16) > > > > +#define SCI_XMIN_MASK (0xffff<<0) > > > > +#define SCI_YMAX_MASK (0xffff<<16) > > > > +#define SCI_XMAX_MASK (0xffff<<0) > > > > +#define GFX_OP_SCISSOR_ENABLE ((0x3<<29)|(0x1c<<24)|(0x10<<19)) > > > > +#define GFX_OP_SCISSOR_RECT ((0x3<<29)|(0x1d<<24)|(0x81<<16)|1) > > > > +#define GFX_OP_COLOR_FACTOR ((0x3<<29)|(0x1d<<24)|(0x1<<16)|0x0) > > > > +#define GFX_OP_STIPPLE ((0x3<<29)|(0x1d<<24)|(0x83<<16)) > > > > +#define GFX_OP_MAP_INFO ((0x3<<29)|(0x1d<<24)|0x4) > > > > +#define GFX_OP_DESTBUFFER_VARS ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0) > > > > +#define GFX_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1) > > > > +#define GFX_OP_DRAWRECT_INFO ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3)) > > > > +#define GFX_OP_DRAWRECT_INFO_I965 ((0x7900<<16)|0x2) > > > > + > > > > +#define XY_CTRL_SURF_INSTR_SIZE 5 > > > > +#define MI_FLUSH_DW_SIZE 3 > > > > +#define XY_CTRL_SURF_COPY_BLT ((2 << 29) | (0x48 << 22) | 3) > > > > +#define SRC_ACCESS_TYPE_SHIFT 21 > > > > +#define DST_ACCESS_TYPE_SHIFT 20 > > > > +#define CCS_SIZE_MASK 0x3FF > > > > +#define CCS_SIZE_SHIFT 8 > > > > +#define XY_CTRL_SURF_MOCS_MASK GENMASK(31, 25) > > > > +#define NUM_CCS_BYTES_PER_BLOCK 256 > > > > +#define NUM_BYTES_PER_CCS_BYTE 256 > > > > +#define NUM_CCS_BLKS_PER_XFER 1024 > > > > +#define INDIRECT_ACCESS 0 > > > > +#define DIRECT_ACCESS 1 > > > > + > > > > +#define COLOR_BLT_CMD (2 << 29 | 0x40 << 22 | (5 - 2)) > > > > +#define XY_COLOR_BLT_CMD (2 << 29 | 0x50 << 22) > > > > +#define XY_FAST_COLOR_BLT_CMD (2 << 29 | 0x44 << 22) > > > > +#define XY_FAST_COLOR_BLT_DEPTH_32 (2 << 19) > > > > +#define XY_FAST_COLOR_BLT_DW 16 > > > > +#define XY_FAST_COLOR_BLT_MOCS_MASK GENMASK(27, 21) > > > > +#define XY_FAST_COLOR_BLT_MEM_TYPE_SHIFT 31 > > > > + > > > > +#define XY_FAST_COPY_BLT_D0_SRC_TILING_MASK REG_GENMASK(21, 20) > > > > +#define XY_FAST_COPY_BLT_D0_DST_TILING_MASK REG_GENMASK(14, 13) > > > > +#define XY_FAST_COPY_BLT_D0_SRC_TILE_MODE(mode) \ > > > > + REG_FIELD_PREP(XY_FAST_COPY_BLT_D0_SRC_TILING_MASK, mode) > > > > +#define XY_FAST_COPY_BLT_D0_DST_TILE_MODE(mode) \ > > > > + REG_FIELD_PREP(XY_FAST_COPY_BLT_D0_DST_TILING_MASK, mode) > > > > +#define LINEAR 0 > > > > +#define TILE_X 0x1 > > > > +#define XMAJOR 0x1 > > > > +#define YMAJOR 0x2 > > > > +#define TILE_64 0x3 > > > > +#define XY_FAST_COPY_BLT_D1_SRC_TILE4 REG_BIT(31) > > > > +#define XY_FAST_COPY_BLT_D1_DST_TILE4 REG_BIT(30) > > > > +#define BLIT_CCTL_SRC_MOCS_MASK REG_GENMASK(6, 0) > > > > +#define BLIT_CCTL_DST_MOCS_MASK REG_GENMASK(14, 8) > > > > +/* Note: MOCS value = (index << 1) */ > > > > +#define BLIT_CCTL_SRC_MOCS(idx) \ > > > > + REG_FIELD_PREP(BLIT_CCTL_SRC_MOCS_MASK, (idx) << 1) > > > > +#define BLIT_CCTL_DST_MOCS(idx) \ > > > > + REG_FIELD_PREP(BLIT_CCTL_DST_MOCS_MASK, (idx) << 1) > > > > + > > > > +#define SRC_COPY_BLT_CMD (2 << 29 | 0x43 << 22) > > > > +#define GEN9_XY_FAST_COPY_BLT_CMD (2 << 29 | 0x42 << 22) > > > > +#define XY_SRC_COPY_BLT_CMD (2 << 29 | 0x53 << 22) > > > > +#define XY_MONO_SRC_COPY_IMM_BLT (2 << 29 | 0x71 << 22 | 5) > > > > +#define BLT_WRITE_A (2<<20) > > > > +#define BLT_WRITE_RGB (1<<20) > > > > +#define BLT_WRITE_RGBA (BLT_WRITE_RGB | BLT_WRITE_A) > > > > +#define BLT_DEPTH_8 (0<<24) > > > > +#define BLT_DEPTH_16_565 (1<<24) > > > > +#define BLT_DEPTH_16_1555 (2<<24) > > > > +#define BLT_DEPTH_32 (3<<24) > > > > +#define BLT_ROP_SRC_COPY (0xcc<<16) > > > > +#define BLT_ROP_COLOR_COPY (0xf0<<16) > > > > +#define XY_SRC_COPY_BLT_SRC_TILED (1<<15) /* 965+ only */ > > > > +#define XY_SRC_COPY_BLT_DST_TILED (1<<11) /* 965+ only */ > > > > +#define CMD_OP_DISPLAYBUFFER_INFO ((0x0<<29)|(0x14<<23)|2) > > > > +#define ASYNC_FLIP (1<<22) > > > > +#define DISPLAY_PLANE_A (0<<20) > > > > +#define DISPLAY_PLANE_B (1<<20) > > > > +#define GFX_OP_PIPE_CONTROL(len) ((0x3<<29)|(0x3<<27)|(0x2<<24)|((len)-2)) > > > > +#define PIPE_CONTROL_COMMAND_CACHE_INVALIDATE (1<<29) /* gen11+ */ > > > > +#define PIPE_CONTROL_TILE_CACHE_FLUSH (1<<28) /* gen11+ */ > > > > +#define PIPE_CONTROL_FLUSH_L3 (1<<27) > > > > +#define PIPE_CONTROL_AMFS_FLUSH (1<<25) /* gen12+ */ > > > > +#define PIPE_CONTROL_GLOBAL_GTT_IVB (1<<24) /* gen7+ */ > > > > +#define PIPE_CONTROL_MMIO_WRITE (1<<23) > > > > +#define PIPE_CONTROL_STORE_DATA_INDEX (1<<21) > > > > +#define PIPE_CONTROL_CS_STALL (1<<20) > > > > +#define PIPE_CONTROL_GLOBAL_SNAPSHOT_RESET (1<<19) > > > > +#define PIPE_CONTROL_TLB_INVALIDATE (1<<18) > > > > +#define PIPE_CONTROL_PSD_SYNC (1<<17) /* gen11+ */ > > > > +#define PIPE_CONTROL_MEDIA_STATE_CLEAR (1<<16) > > > > +#define PIPE_CONTROL_WRITE_TIMESTAMP (3<<14) > > > > +#define PIPE_CONTROL_QW_WRITE (1<<14) > > > > +#define PIPE_CONTROL_POST_SYNC_OP_MASK (3<<14) > > > > +#define PIPE_CONTROL_DEPTH_STALL (1<<13) > > > > +#define PIPE_CONTROL_WRITE_FLUSH (1<<12) > > > > +#define PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH (1<<12) /* gen6+ */ > > > > +#define PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE (1<<11) /* MBZ on ILK */ > > > > +#define PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE (1<<10) /* GM45+ only */ > > > > +#define PIPE_CONTROL_INDIRECT_STATE_DISABLE (1<<9) > > > > +#define PIPE_CONTROL0_HDC_PIPELINE_FLUSH REG_BIT(9) /* gen12 */ > > > > +#define PIPE_CONTROL_NOTIFY (1<<8) > > > > +#define PIPE_CONTROL_FLUSH_ENABLE (1<<7) /* gen7+ */ > > > > +#define PIPE_CONTROL_DC_FLUSH_ENABLE (1<<5) > > > > +#define PIPE_CONTROL_VF_CACHE_INVALIDATE (1<<4) > > > > +#define PIPE_CONTROL_CONST_CACHE_INVALIDATE (1<<3) > > > > +#define PIPE_CONTROL_STATE_CACHE_INVALIDATE (1<<2) > > > > +#define PIPE_CONTROL_STALL_AT_SCOREBOARD (1<<1) > > > > +#define PIPE_CONTROL_DEPTH_CACHE_FLUSH (1<<0) > > > > +#define PIPE_CONTROL_GLOBAL_GTT (1<<2) /* in addr dword */ > > > > + > > > > +/* > > > > + * 3D-related flags that can't be set on _engines_ that lack access to the 3D > > > > + * pipeline (i.e., CCS engines). > > > > + */ > > > > +#define PIPE_CONTROL_3D_ENGINE_FLAGS (\ > > > > + PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH | \ > > > > + PIPE_CONTROL_DEPTH_CACHE_FLUSH | \ > > > > + PIPE_CONTROL_TILE_CACHE_FLUSH | \ > > > > + PIPE_CONTROL_DEPTH_STALL | \ > > > > + PIPE_CONTROL_STALL_AT_SCOREBOARD | \ > > > > + PIPE_CONTROL_PSD_SYNC | \ > > > > + PIPE_CONTROL_AMFS_FLUSH | \ > > > > + PIPE_CONTROL_VF_CACHE_INVALIDATE | \ > > > > + PIPE_CONTROL_GLOBAL_SNAPSHOT_RESET) > > > > + > > > > +/* 3D-related flags that can't be set on _platforms_ that lack a 3D pipeline */ > > > > +#define PIPE_CONTROL_3D_ARCH_FLAGS ( \ > > > > + PIPE_CONTROL_3D_ENGINE_FLAGS | \ > > > > + PIPE_CONTROL_INDIRECT_STATE_DISABLE | \ > > > > + PIPE_CONTROL_FLUSH_ENABLE | \ > > > > + PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE | \ > > > > + PIPE_CONTROL_DC_FLUSH_ENABLE) > > > > + > > > > +#define MI_MATH(x) MI_INSTR(0x1a, (x) - 1) > > > > +#define MI_MATH_INSTR(opcode, op1, op2) ((opcode) << 20 | (op1) << 10 | (op2)) > > > > +/* Opcodes for MI_MATH_INSTR */ > > > > +#define MI_MATH_NOOP MI_MATH_INSTR(0x000, 0x0, 0x0) > > > > +#define MI_MATH_LOAD(op1, op2) MI_MATH_INSTR(0x080, op1, op2) > > > > +#define MI_MATH_LOADINV(op1, op2) MI_MATH_INSTR(0x480, op1, op2) > > > > +#define MI_MATH_LOAD0(op1) MI_MATH_INSTR(0x081, op1) > > > > +#define MI_MATH_LOAD1(op1) MI_MATH_INSTR(0x481, op1) > > > > +#define MI_MATH_ADD MI_MATH_INSTR(0x100, 0x0, 0x0) > > > > +#define MI_MATH_SUB MI_MATH_INSTR(0x101, 0x0, 0x0) > > > > +#define MI_MATH_AND MI_MATH_INSTR(0x102, 0x0, 0x0) > > > > +#define MI_MATH_OR MI_MATH_INSTR(0x103, 0x0, 0x0) > > > > +#define MI_MATH_XOR MI_MATH_INSTR(0x104, 0x0, 0x0) > > > > +#define MI_MATH_STORE(op1, op2) MI_MATH_INSTR(0x180, op1, op2) > > > > +#define MI_MATH_STOREINV(op1, op2) MI_MATH_INSTR(0x580, op1, op2) > > > > +/* Registers used as operands in MI_MATH_INSTR */ > > > > +#define MI_MATH_REG(x) (x) > > > > +#define MI_MATH_REG_SRCA 0x20 > > > > +#define MI_MATH_REG_SRCB 0x21 > > > > +#define MI_MATH_REG_ACCU 0x31 > > > > +#define MI_MATH_REG_ZF 0x32 > > > > +#define MI_MATH_REG_CF 0x33 > > > > + > > > > +/* > > > > + * Media instructions used by the kernel > > > > + */ > > > > +#define MEDIA_INSTR(pipe, op, sub_op, flags) \ > > > > + (__INSTR(INSTR_RC_CLIENT) | (pipe) << INSTR_SUBCLIENT_SHIFT | \ > > > > + (op) << INSTR_26_TO_24_SHIFT | (sub_op) << 16 | (flags)) > > > > + > > > > +#define MFX_WAIT MEDIA_INSTR(1, 0, 0, 0) > > > > +#define MFX_WAIT_DW0_MFX_SYNC_CONTROL_FLAG REG_BIT(8) > > > > +#define MFX_WAIT_DW0_PXP_SYNC_CONTROL_FLAG REG_BIT(9) > > > > + > > > > +#define CRYPTO_KEY_EXCHANGE MEDIA_INSTR(2, 6, 9, 0) > > > > + > > > > +/* > > > > + * Commands used only by the command parser > > > > + */ > > > > +#define MI_SET_PREDICATE MI_INSTR(0x01, 0) > > > > +#define MI_ARB_CHECK MI_INSTR(0x05, 0) > > > > +#define MI_RS_CONTROL MI_INSTR(0x06, 0) > > > > +#define MI_URB_ATOMIC_ALLOC MI_INSTR(0x09, 0) > > > > +#define MI_PREDICATE MI_INSTR(0x0C, 0) > > > > +#define MI_RS_CONTEXT MI_INSTR(0x0F, 0) > > > > +#define MI_TOPOLOGY_FILTER MI_INSTR(0x0D, 0) > > > > +#define MI_LOAD_SCAN_LINES_EXCL MI_INSTR(0x13, 0) > > > > +#define MI_URB_CLEAR MI_INSTR(0x19, 0) > > > > +#define MI_UPDATE_GTT MI_INSTR(0x23, 0) > > > > +#define MI_CLFLUSH MI_INSTR(0x27, 0) > > > > +#define MI_REPORT_PERF_COUNT MI_INSTR(0x28, 0) > > > > +#define MI_REPORT_PERF_COUNT_GGTT (1<<0) > > > > +#define MI_RS_STORE_DATA_IMM MI_INSTR(0x2B, 0) > > > > +#define MI_LOAD_URB_MEM MI_INSTR(0x2C, 0) > > > > +#define MI_STORE_URB_MEM MI_INSTR(0x2D, 0) > > > > +#define MI_CONDITIONAL_BATCH_BUFFER_END MI_INSTR(0x36, 0) > > > > +#define MI_DO_COMPARE REG_BIT(21) > > > > + > > > > +#define STATE_BASE_ADDRESS \ > > > > + ((0x3 << 29) | (0x0 << 27) | (0x1 << 24) | (0x1 << 16)) > > > > +#define BASE_ADDRESS_MODIFY REG_BIT(0) > > > > +#define PIPELINE_SELECT \ > > > > + ((0x3 << 29) | (0x1 << 27) | (0x1 << 24) | (0x4 << 16)) > > > > +#define PIPELINE_SELECT_MEDIA REG_BIT(0) > > > > +#define GFX_OP_3DSTATE_VF_STATISTICS \ > > > > + ((0x3 << 29) | (0x1 << 27) | (0x0 << 24) | (0xB << 16)) > > > > +#define MEDIA_VFE_STATE \ > > > > + ((0x3 << 29) | (0x2 << 27) | (0x0 << 24) | (0x0 << 16)) > > > > +#define MEDIA_VFE_STATE_MMIO_ACCESS_MASK (0x18) > > > > +#define MEDIA_INTERFACE_DESCRIPTOR_LOAD \ > > > > + ((0x3 << 29) | (0x2 << 27) | (0x0 << 24) | (0x2 << 16)) > > > > +#define MEDIA_OBJECT \ > > > > + ((0x3 << 29) | (0x2 << 27) | (0x1 << 24) | (0x0 << 16)) > > > > +#define GPGPU_OBJECT ((0x3<<29)|(0x2<<27)|(0x1<<24)|(0x4<<16)) > > > > +#define GPGPU_WALKER ((0x3<<29)|(0x2<<27)|(0x1<<24)|(0x5<<16)) > > > > +#define GFX_OP_3DSTATE_DX9_CONSTANTF_VS \ > > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x39<<16)) > > > > +#define GFX_OP_3DSTATE_DX9_CONSTANTF_PS \ > > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x3A<<16)) > > > > +#define GFX_OP_3DSTATE_SO_DECL_LIST \ > > > > + ((0x3<<29)|(0x3<<27)|(0x1<<24)|(0x17<<16)) > > > > + > > > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_VS \ > > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x43<<16)) > > > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_GS \ > > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x44<<16)) > > > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_HS \ > > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x45<<16)) > > > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_DS \ > > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x46<<16)) > > > > +#define GFX_OP_3DSTATE_BINDING_TABLE_EDIT_PS \ > > > > + ((0x3<<29)|(0x3<<27)|(0x0<<24)|(0x47<<16)) > > > > + > > > > +#define COLOR_BLT ((0x2<<29)|(0x40<<22)) > > > > +#define SRC_COPY_BLT ((0x2<<29)|(0x43<<22)) > > > > + > > > > +#define GSC_INSTR(opcode, data, flags) \ > > > > + (__INSTR(INSTR_GSC_CLIENT) | (opcode) << 22 | (data) << 9 | (flags)) > > > > + > > > > +#define GSC_FW_LOAD GSC_INSTR(1, 0, 2) > > > > +#define HECI1_FW_LIMIT_VALID (1 << 31) > > > > + > > > > +/* > > > > + * Used to convert any address to canonical form. > > > > + * Starting from gen8, some commands (e.g. STATE_BASE_ADDRESS, > > > > + * MI_LOAD_REGISTER_MEM and others, see Broadwell PRM Vol2a) require the > > > > + * addresses to be in a canonical form: > > > > + * "GraphicsAddress[63:48] are ignored by the HW and assumed to be in correct > > > > + * canonical form [63:48] == [47]." > > > > + */ > > > > +#define GEN8_HIGH_ADDRESS_BIT 47 > > > > +static inline u64 gen8_canonical_addr(u64 address) > > > > +{ > > > > + return sign_extend64(address, GEN8_HIGH_ADDRESS_BIT); > > > > +} > > > > + > > > > +static inline u64 gen8_noncanonical_addr(u64 address) > > > > +{ > > > > + return address & GENMASK_ULL(GEN8_HIGH_ADDRESS_BIT, 0); > > > > +} > > > > + > > > > +static inline u32 *__gen6_emit_bb_start(u32 *cs, u32 addr, unsigned int flags) > > > > +{ > > > > + *cs++ = MI_BATCH_BUFFER_START | flags; > > > > + *cs++ = addr; > > > > + > > > > + return cs; > > > > +} > > > > + > > > > +#endif /* _INTEL_GPU_COMMANDS_H_ */ > > > > diff --git a/include/linux/bitops.h b/include/linux/bitops.h > > > > new file mode 100644 > > > > index 0000000000..1bbe60c83c > > > > --- /dev/null > > > > +++ b/include/linux/bitops.h > > > > @@ -0,0 +1,8 @@ > > > > +/* SPDX-License-Identifier: MIT */ > > > > + > > > > +#ifndef _HAX_LINUX_BITOPS_H_ > > > > +#define _HAX_LINUX_BITOPS_H_ > > > ----------- ^ > > > I would prefer here normal word. > > > > > > > My intention was to inform the reader that code implements > > some non-standard thing to prompt to read commit message. > > But I won't resist to have _LINUX_BITOPS_H_ here. > > I wondered to put scaffold definitions here, but location > > might be confusint. > > > > > Please add some explanation why we deletegate these to > > > linux_scaffold.h > > > > > > > You mean explanation in the file or in the commit message? > > In the file. > Ok, I will use _LINUX_BITOPS_H and add comment. > > > > > > + > > > > +#include <linux_scaffold.h> > > > > + > > > > +#endif /* _HAX_LINUX_BITOPS_H_ */ > > > > diff --git a/include/linux_scaffold.h b/include/linux_scaffold.h > > > > new file mode 100644 > > > > index 0000000000..fe304330e5 > > > > --- /dev/null > > > > +++ b/include/linux_scaffold.h > > > > @@ -0,0 +1,50 @@ > > > > +/* SPDX-License-Identifier: MIT */ > > > > + > > > > +#ifndef _INTEL_GPU_COMMANDS_SCAFFOLD_H_ > > > > +#define _INTEL_GPU_COMMANDS_SCAFFOLD_H_ > > > > + > > > > +#include <linux/const.h> > > > ------------ ^ > > > I would prefer to have this in igt includes, you can copy them > > > to igt_const.h or maybe copy it to drm-uapi ? > > > > If you're including intel_gpu_commands.h only it must be fully > > resolveable from this header. So definitely we need to have > > it in intel_gpu_commands.h include chain. And this is > > minimalistic include set. > > I am thinking about FreeBSD, it will not compile there. > > > > > > > > > Or maybe just copy it here and remove this include ? > > > > > > > + > > > > +#include <stdint.h> > > > > + > > > > +typedef uint8_t u8; > > > > +typedef uint16_t u16; > > > > +typedef uint32_t u32; > > > > +typedef uint64_t u64; > > > > + > > > > +typedef int8_t s8; > > > > +typedef int16_t s16; > > > > +typedef int32_t s32; > > > > +typedef int64_t s64; > > > > > > Above typedefs looks like a good candidate to igt_types.h > > > > > > > I see panfrost-misc.h defines this already, so I'm sure > > generic igt header should define those types. > > > > It is not a blocker and may be done later, your choice. > > > > > + > > > > +static s64 sign_extend64(u64 value, int index) > > > -------- ^ inline > > > > > > > Ok. > > > > > > +{ > > > > + int shift = 63 - index; > > > > + return (s64)(value << shift) >> shift; > > > > +} > > > > + > > > > +/* Make IGT build with Kernels < 4.17 */ > > > > +#ifndef _AC > > > > +# define _AC(X,Y) __AC(X,Y) > > > ----------------------- ^ > > > imho you should also write definition for __AC the same way > > > > > > > May you elaborate? __AC comes from <linux/const.h> so I don't > > get what you mean. > > You need <linux/const.h> only for string glue macro, so maybe: > > # define _AC(X,Y) X##Y > > and drop include <linux/const.h> ? > > Btw if #ifndef, then maybe something like: > > #ifndef _AC > # define _AC(X,Y) X##Y > #else > # error "_AC macro already defined" > #endif > > to prevent some silent macro redefinitions and hard to spot bugs? > Ok, putting _AC() here and drop <linux/const.h> sounds good to me. > > > > > > +#endif > > > > +#ifndef _UL > > > > +# define _UL(x) (_AC(x, UL)) > > > > +#endif > > > > +#ifndef _ULL > > > > +# define _ULL(x) (_AC(x, ULL)) > > > > +#endif > > > > + > > > > +#define GENMASK(h, l) \ > > > > + (((~_UL(0)) - (_UL(1) << (l)) + 1) & \ > > > > + (~_UL(0) >> (BITS_PER_LONG - 1 - (h)))) > > > > + > > > > +#define GENMASK_ULL(h, l) \ > > > > + (((~_ULL(0)) - (_ULL(1) << (l)) + 1) & \ > > > > + (~_ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h)))) > > > > + > > > > +#define BITS_PER_BYTE 8 > > > > +#define BITS_PER_TYPE(t) (sizeof(t) * BITS_PER_BYTE) > > > > +#define BITS_PER_LONG BITS_PER_TYPE(long) > > > > +#define BITS_PER_LONG_LONG BITS_PER_TYPE(long long) > > > > + > > > > +#endif /* _INTEL_GPU_COMMANDS_SCAFFOLD_H_ */ > > > > diff --git a/meson.build b/meson.build > > > > index e7a68503d7..4dc720bc25 100644 > > > > --- a/meson.build > > > > +++ b/meson.build > > > > @@ -85,7 +85,7 @@ with_libdrm = get_option('libdrm_drivers') > > > > > > > > build_info = ['Build type: ' + get_option('buildtype')] > > > > > > > > -inc = include_directories('include/drm-uapi', 'include/linux-uapi', 'lib', 'lib/stubs/syscalls', '.') > > > > +inc = include_directories('include', 'include/drm-uapi', 'include/linux-uapi', 'lib', 'lib/stubs/syscalls', '.') > > > ----------------------------- ^ > > > This looks strange here. > > > > You want to pack "linux" directory to for example include/drm-uapi dir? > > Will look weird a bit but if you insist. > > > > -- > > Zbigniew > > Ok, you are right, there are new files so thats why it is needed > here. > Thank you for the review. I will alter the code and resend. -- Zbigniew > Regards, > Kamil > > > > > > > > > Regards, > > > Kamil > > > > > > > > > > > inc_for_gtkdoc = include_directories('lib') > > > > > > > > -- > > > > 2.34.1 > > > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* [igt-dev] [PATCH i-g-t 2/2] igt: Remove duplicated macros 2023-03-03 12:55 [igt-dev] [PATCH i-g-t 0/2] Start using intel_gpu_commands.h header Zbigniew Kempczyński 2023-03-03 12:55 ` [igt-dev] [PATCH i-g-t 1/2] intel_gpu_commands: Use kernel copy commands definition Zbigniew Kempczyński @ 2023-03-03 12:55 ` Zbigniew Kempczyński 2023-03-06 15:30 ` Kamil Konieczny 2023-03-03 13:44 ` [igt-dev] ✓ Fi.CI.BAT: success for Start using intel_gpu_commands.h header Patchwork 2023-03-06 20:14 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork 3 siblings, 1 reply; 11+ messages in thread From: Zbigniew Kempczyński @ 2023-03-03 12:55 UTC (permalink / raw) To: igt-dev Introducing intel_gpu_commands.h requires removing all conflicting macros definitions with altering the code (mostly command length). For all commands used in IGT but not in the kernel (yet) add intel_gpu_commands_staging.h which will keep all commands used here only. Next import of command macros might finish verbatim copy + removing from staging in one commit to compile cleanly. Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> Cc: Petri Latvala <adrinael@adrinael.net> Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com> --- benchmarks/gem_wsim.c | 6 +-- include/intel_gpu_commands_staging.h | 18 +++++++ include/linux/bitops.h | 4 +- lib/gen4_render.h | 2 - lib/gen7_media.h | 2 - lib/gen7_render.h | 3 -- lib/gen8_media.h | 2 - lib/huc_copy.c | 6 +-- lib/huc_copy.h | 2 +- lib/i830_reg.h | 16 ------ lib/i915/i915_blt.h | 4 +- lib/i915/i915_crc.c | 15 +++--- lib/igt_draw.c | 4 +- lib/igt_dummyload.c | 2 +- lib/igt_store.c | 2 +- lib/intel_allocator.h | 8 +-- lib/intel_aux_pgtable.c | 5 +- lib/intel_batchbuffer.c | 12 ++--- lib/intel_bufops.c | 7 +++ lib/intel_reg.h | 69 ++---------------------- lib/ioctl_wrappers.h | 4 +- lib/rendercopy_gen9.c | 9 ++-- tests/i915/api_intel_bb.c | 2 +- tests/i915/gem_blits.c | 20 ++++--- tests/i915/gem_busy.c | 8 +-- tests/i915/gem_ccs.c | 2 +- tests/i915/gem_ctx_shared.c | 4 +- tests/i915/gem_exec_async.c | 2 +- tests/i915/gem_exec_balancer.c | 23 +++----- tests/i915/gem_exec_capture.c | 4 +- tests/i915/gem_exec_endless.c | 13 +---- tests/i915/gem_exec_fair.c | 18 +++---- tests/i915/gem_exec_fence.c | 43 ++++++--------- tests/i915/gem_exec_flush.c | 6 +-- tests/i915/gem_exec_gttfill.c | 2 +- tests/i915/gem_exec_nop.c | 4 +- tests/i915/gem_exec_parallel.c | 2 +- tests/i915/gem_exec_params.c | 4 +- tests/i915/gem_exec_reloc.c | 29 ++++------ tests/i915/gem_exec_schedule.c | 43 ++++++--------- tests/i915/gem_exec_store.c | 6 +-- tests/i915/gem_exec_suspend.c | 2 +- tests/i915/gem_exec_whisper.c | 2 +- tests/i915/gem_pipe_control_store_loop.c | 11 ++-- tests/i915/gem_pxp.c | 7 +-- tests/i915/gem_ringfill.c | 2 +- tests/i915/gem_softpin.c | 16 +----- tests/i915/gem_sync.c | 16 +++--- tests/i915/gem_userptr_blits.c | 6 +-- tests/i915/gem_vm_create.c | 2 +- tests/i915/gem_watchdog.c | 6 +-- tests/i915/gem_workarounds.c | 2 +- tests/i915/gen7_exec_parse.c | 34 ++++++------ tests/i915/gen9_exec_parse.c | 47 +++++----------- tests/i915/i915_module_load.c | 2 +- tests/i915/perf.c | 17 +----- tests/i915/perf_pmu.c | 18 +++---- tests/i915/sysfs_timeslice_duration.c | 17 ++---- tests/prime_vgem.c | 2 +- tools/intel_audio_dump.c | 1 + tools/intel_reg.c | 2 +- 61 files changed, 231 insertions(+), 418 deletions(-) create mode 100644 include/intel_gpu_commands_staging.h diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c index 2d60135817..7b5e62a3be 100644 --- a/benchmarks/gem_wsim.c +++ b/benchmarks/gem_wsim.c @@ -1426,7 +1426,7 @@ static unsigned int create_bb(struct w_step *w, int self) cs = ptr = gem_mmap__wc(fd, w->bb_handle, 0, 4096, PROT_WRITE); /* Store initial 64b timestamp: start */ - *cs++ = MI_LOAD_REGISTER_IMM | MI_CS_MMIO_DST; + *cs++ = MI_LOAD_REGISTER_IMM(1) | MI_CS_MMIO_DST; *cs++ = CS_GPR(START_TS) + 4; *cs++ = 0; *cs++ = MI_LOAD_REGISTER_REG | MI_CS_MMIO_DST | MI_CS_MMIO_SRC; @@ -1441,7 +1441,7 @@ static unsigned int create_bb(struct w_step *w, int self) *cs++ = MI_ARB_CHECK; /* Store this 64b timestamp: now */ - *cs++ = MI_LOAD_REGISTER_IMM | MI_CS_MMIO_DST; + *cs++ = MI_LOAD_REGISTER_IMM(1) | MI_CS_MMIO_DST; *cs++ = CS_GPR(NOW_TS) + 4; *cs++ = 0; *cs++ = MI_LOAD_REGISTER_REG | MI_CS_MMIO_DST | MI_CS_MMIO_SRC; @@ -1456,7 +1456,7 @@ static unsigned int create_bb(struct w_step *w, int self) *cs++ = MI_MATH_STOREINV(MI_MATH_REG(NOW_TS), MI_MATH_REG_ACCU); /* Save delta for indirect read by COND_BBE */ - *cs++ = MI_STORE_REGISTER_MEM | (1 + use_64b) | MI_CS_MMIO_DST; + *cs++ = MI_STORE_REGISTER_MEM_CMD | (1 + use_64b) | MI_CS_MMIO_DST; *cs++ = CS_GPR(NOW_TS); w->reloc[r].target_handle = self; w->reloc[r].offset = offset_in_page(cs); diff --git a/include/intel_gpu_commands_staging.h b/include/intel_gpu_commands_staging.h new file mode 100644 index 0000000000..74b4fb6553 --- /dev/null +++ b/include/intel_gpu_commands_staging.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: MIT*/ +/* + * Copyright © 2022 Intel Corporation + */ + +#ifndef _INTEL_GPU_COMMANDS_STAGING_H_ +#define _INTEL_GPU_COMMANDS_STAGING_H_ + +#include "linux_scaffold.h" + +/* Length-free commands */ +#define MI_SEMAPHORE_WAIT_CMD (0x1c << 23) +#define MI_STORE_DWORD_IMM_CMD (0x20 << 23) +#define MI_STORE_REGISTER_MEM_CMD (0x24 << 23) +#define MI_FLUSH_DW_CMD (0x26 << 23) +#define MI_LOAD_REGISTER_MEM_CMD (0x29 << 23) + +#endif /* _INTEL_GPU_COMMANDS_STAGING_H_ */ diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 1bbe60c83c..7416dfa451 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -3,6 +3,8 @@ #ifndef _HAX_LINUX_BITOPS_H_ #define _HAX_LINUX_BITOPS_H_ -#include <linux_scaffold.h> +#include "linux_scaffold.h" + +#define REG_BIT(x) (1ul << (x)) #endif /* _HAX_LINUX_BITOPS_H_ */ diff --git a/lib/gen4_render.h b/lib/gen4_render.h index 7d8bc659a7..bbbddd346e 100644 --- a/lib/gen4_render.h +++ b/lib/gen4_render.h @@ -25,14 +25,12 @@ #define GEN4_CS_URB_STATE GEN4_3D(0, 0, 1) #define GEN4_STATE_BASE_ADDRESS GEN4_3D(0, 1, 1) -# define BASE_ADDRESS_MODIFY (1 << 0) #define GEN4_STATE_SIP GEN4_3D(0, 1, 2) #define GEN4_PIPELINE_SELECT GEN4_3D(0, 1, 4) #define G4X_PIPELINE_SELECT GEN4_3D(1, 1, 4) # define PIPELINE_SELECT_3D 0 -# define PIPELINE_SELECT_MEDIA 1 #define GEN4_3DSTATE_PIPELINED_POINTERS GEN4_3D(3, 0, 0) # define GEN4_GS_DISABLE 0 diff --git a/lib/gen7_media.h b/lib/gen7_media.h index e81b5523a7..b5e49cae9e 100644 --- a/lib/gen7_media.h +++ b/lib/gen7_media.h @@ -14,11 +14,9 @@ #define GEN7_PIPELINE_SELECT GFXPIPE(1, 1, 4) # define PIPELINE_SELECT_3D (0 << 0) -# define PIPELINE_SELECT_MEDIA (1 << 0) # define PIPELINE_SELECT_GPGPU (2 << 0) #define GEN7_STATE_BASE_ADDRESS GFXPIPE(0, 1, 1) -# define BASE_ADDRESS_MODIFY (1 << 0) #define GEN7_MEDIA_VFE_STATE GFXPIPE(2, 0, 0) #define GEN7_MEDIA_CURBE_LOAD GFXPIPE(2, 0, 1) diff --git a/lib/gen7_render.h b/lib/gen7_render.h index 5dfc04d4bc..d09ba6dad1 100644 --- a/lib/gen7_render.h +++ b/lib/gen7_render.h @@ -170,9 +170,6 @@ /* DW1 */ # define GEN7_PUSH_CONSTANT_BUFFER_OFFSET_SHIFT 16 -/* for GEN7_STATE_BASE_ADDRESS */ -#define BASE_ADDRESS_MODIFY (1 << 0) - /* for GEN7_PIPE_CONTROL */ #define GEN7_PIPE_CONTROL_CS_STALL (1 << 20) #define GEN7_PIPE_CONTROL_STALL_AT_SCOREBOARD (1 << 1) diff --git a/lib/gen8_media.h b/lib/gen8_media.h index 1643794156..d2a049a1ec 100644 --- a/lib/gen8_media.h +++ b/lib/gen8_media.h @@ -14,10 +14,8 @@ #define GEN8_PIPELINE_SELECT GFXPIPE(1, 1, 4) # define PIPELINE_SELECT_3D (0 << 0) -# define PIPELINE_SELECT_MEDIA (1 << 0) #define GEN8_STATE_BASE_ADDRESS GFXPIPE(0, 1, 1) -# define BASE_ADDRESS_MODIFY (1 << 0) #define GEN8_MEDIA_VFE_STATE GFXPIPE(2, 0, 0) #define GEN8_MEDIA_CURBE_LOAD GFXPIPE(2, 0, 1) diff --git a/lib/huc_copy.c b/lib/huc_copy.c index 6ec68864b7..bf8254c612 100644 --- a/lib/huc_copy.c +++ b/lib/huc_copy.c @@ -80,14 +80,14 @@ gen9_huc_copyfunc(int fd, uint64_t ahnd, buf[i++] = 0; buf[i++] = 0x3; - buf[i++] = MFX_WAIT; - buf[i++] = MFX_WAIT; + buf[i++] = HUC_MFX_WAIT; + buf[i++] = HUC_MFX_WAIT; buf[i++] = HUC_PIPE_MODE_SELECT; buf[i++] = 0; buf[i++] = 0; - buf[i++] = MFX_WAIT; + buf[i++] = HUC_MFX_WAIT; memset(reloc, 0, sizeof(reloc)); diff --git a/lib/huc_copy.h b/lib/huc_copy.h index 69d1409335..1789e87359 100644 --- a/lib/huc_copy.h +++ b/lib/huc_copy.h @@ -31,7 +31,7 @@ #include "intel_reg.h" #define PARALLEL_VIDEO_PIPE (0x3<<29) -#define MFX_WAIT (PARALLEL_VIDEO_PIPE|(0x1<<27)|(0x1<<8)) +#define HUC_MFX_WAIT (PARALLEL_VIDEO_PIPE|(0x1<<27)|(0x1<<8)) #define HUC_IMEM_STATE (PARALLEL_VIDEO_PIPE|(0x2<<27)|(0xb<<23)|(0x1<<16)|0x3) #define HUC_PIPE_MODE_SELECT (PARALLEL_VIDEO_PIPE|(0x2<<27)|(0xb<<23)|0x1) diff --git a/lib/i830_reg.h b/lib/i830_reg.h index b8ad2ac00f..3c0b9b5bd0 100644 --- a/lib/i830_reg.h +++ b/lib/i830_reg.h @@ -30,12 +30,7 @@ #define I830_SET_FIELD( var, mask, value ) (var &= ~(mask), var |= value) -/* Flush */ -#define MI_FLUSH (0x04<<23) -#define MI_FLUSH_DW (0x26<<23) - #define MI_WRITE_DIRTY_STATE (1<<4) -#define MI_END_SCENE (1<<3) #define MI_GLOBAL_SNAPSHOT_COUNT_RESET (1<<3) #define MI_INHIBIT_RENDER_CACHE_FLUSH (1<<2) #define MI_STATE_INSTRUCTION_CACHE_FLUSH (1<<1) @@ -43,15 +38,11 @@ /* broadwater flush bits */ #define BRW_MI_GLOBAL_SNAPSHOT_RESET (1 << 3) -#define MI_BATCH_BUFFER_END (0xA << 23) - /* Noop */ -#define MI_NOOP 0x00 #define MI_NOOP_WRITE_ID (1<<22) #define MI_NOOP_ID_MASK (1<<22 - 1) /* Wait for Events */ -#define MI_WAIT_FOR_EVENT (0x03<<23) #define MI_WAIT_FOR_PIPEB_SVBLANK (1<<18) #define MI_WAIT_FOR_PIPEA_SVBLANK (1<<17) #define MI_WAIT_FOR_OVERLAY_FLIP (1<<16) @@ -61,12 +52,10 @@ #define MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW (1<<1) /* Set the scan line for MI_WAIT_FOR_PIPE?_SCAN_LINE_WINDOW */ -#define MI_LOAD_SCAN_LINES_INCL (0x12<<23) #define MI_LOAD_SCAN_LINES_DISPLAY_PIPEA (0) #define MI_LOAD_SCAN_LINES_DISPLAY_PIPEB (0x1<<20) /* BLT commands */ -#define COLOR_BLT_CMD ((2<<29)|(0x40<<22)|(0x3)) #define COLOR_BLT_WRITE_ALPHA (1<<21) #define COLOR_BLT_WRITE_RGB (1<<20) @@ -76,16 +65,11 @@ #define XY_SETUP_CLIP_BLT_CMD ((2<<29)|(3<<22)|1) -#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)) #define XY_SRC_COPY_BLT_WRITE_ALPHA (1<<21) #define XY_SRC_COPY_BLT_WRITE_RGB (1<<20) #define XY_SRC_COPY_BLT_SRC_TILED (1<<15) #define XY_SRC_COPY_BLT_DST_TILED (1<<11) -#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)|0x4) -#define SRC_COPY_BLT_WRITE_ALPHA (1<<21) -#define SRC_COPY_BLT_WRITE_RGB (1<<20) - #define XY_PAT_BLT_IMMEDIATE ((2<<29)|(0x72<<22)) #define XY_MONO_PAT_BLT_CMD ((0x2<<29)|(0x52<<22)|0x7) diff --git a/lib/i915/i915_blt.h b/lib/i915/i915_blt.h index c535961e8a..63951db753 100644 --- a/lib/i915/i915_blt.h +++ b/lib/i915/i915_blt.h @@ -135,8 +135,8 @@ struct blt_block_copy_data_ext { }; enum blt_access_type { - INDIRECT_ACCESS, - DIRECT_ACCESS, + BLT_INDIRECT_ACCESS, + BLT_DIRECT_ACCESS, }; struct blt_ctrl_surf_copy_object { diff --git a/lib/i915/i915_crc.c b/lib/i915/i915_crc.c index 7d68f8e5c4..9564b7327d 100644 --- a/lib/i915/i915_crc.c +++ b/lib/i915/i915_crc.c @@ -9,7 +9,6 @@ #include "gem_create.h" #include "gem_engine_topology.h" #include "gem_mman.h" -#include "i830_reg.h" #include "i915_drm.h" #include "intel_reg.h" #include "intel_chipset.h" @@ -36,13 +35,13 @@ } while (0) #define LOAD_REGISTER_IMM32(__reg, __imm1) do { \ - *bb++ = MI_LOAD_REGISTER_IMM | MI_CS_MMIO_DST; \ + *bb++ = MI_LOAD_REGISTER_IMM(1) | MI_CS_MMIO_DST; \ *bb++ = (__reg); \ *bb++ = (__imm1); \ } while (0) #define LOAD_REGISTER_IMM64(__reg, __imm1, __imm2) do { \ - *bb++ = (MI_LOAD_REGISTER_IMM + 2) | MI_CS_MMIO_DST; \ + *bb++ = MI_LOAD_REGISTER_IMM(2) | MI_CS_MMIO_DST; \ *bb++ = (__reg); \ *bb++ = (__imm1); \ *bb++ = (__reg) + 4; \ @@ -50,29 +49,29 @@ } while (0) #define LOAD_REGISTER_MEM(__reg, __offset) do { \ - *bb++ = MI_LOAD_REGISTER_MEM | MI_CS_MMIO_DST | 2; \ + *bb++ = MI_LOAD_REGISTER_MEM_CMD | MI_CS_MMIO_DST | 2; \ *bb++ = (__reg); \ *bb++ = (__offset); \ *bb++ = (__offset) >> 32; \ } while (0) #define LOAD_REGISTER_MEM_WPARID(__reg, __offset) do { \ - *bb++ = MI_LOAD_REGISTER_MEM | MI_CS_MMIO_DST | MI_WPARID_ENABLE_GEN12 | 2; \ + *bb++ = MI_LOAD_REGISTER_MEM_CMD | MI_CS_MMIO_DST | MI_WPARID_ENABLE_GEN12 | 2; \ *bb++ = (__reg); \ *bb++ = (__offset); \ *bb++ = (__offset) >> 32; \ } while (0) #define STORE_REGISTER_MEM(__reg, __offset) do { \ - *bb++ = MI_STORE_REGISTER_MEM | MI_CS_MMIO_DST | 2; \ + *bb++ = MI_STORE_REGISTER_MEM_GEN8 | MI_CS_MMIO_DST; \ *bb++ = (__reg); \ *bb++ = (__offset); \ *bb++ = (__offset) >> 32; \ } while (0) #define STORE_REGISTER_MEM_PREDICATED(__reg, __offset) do { \ - *bb++ = MI_STORE_REGISTER_MEM | MI_CS_MMIO_DST | \ - MI_STORE_PREDICATE_ENABLE_GEN12 | 2; \ + *bb++ = MI_STORE_REGISTER_MEM_GEN8 | MI_CS_MMIO_DST | \ + MI_STORE_PREDICATE_ENABLE_GEN12; \ *bb++ = (__reg); \ *bb++ = (__offset); \ *bb++ = (__offset) >> 32; \ diff --git a/lib/igt_draw.c b/lib/igt_draw.c index 58ce0539be..ac512fac5a 100644 --- a/lib/igt_draw.c +++ b/lib/igt_draw.c @@ -385,12 +385,12 @@ static void switch_blt_tiling(struct intel_bb *ibb, uint32_t tiling, bool on) /* To change the tile register, insert an MI_FLUSH_DW followed by an * MI_LOAD_REGISTER_IMM */ - intel_bb_out(ibb, MI_FLUSH_DW | 2); + intel_bb_out(ibb, MI_FLUSH_DW_CMD | 2); intel_bb_out(ibb, 0x0); intel_bb_out(ibb, 0x0); intel_bb_out(ibb, 0x0); - intel_bb_out(ibb, MI_LOAD_REGISTER_IMM); + intel_bb_out(ibb, MI_LOAD_REGISTER_IMM(1)); intel_bb_out(ibb, 0x22200); /* BCS_SWCTRL */ intel_bb_out(ibb, bcs_swctrl); intel_bb_out(ibb, MI_NOOP); diff --git a/lib/igt_dummyload.c b/lib/igt_dummyload.c index 5f3c6b10c7..b3dc18ee7d 100644 --- a/lib/igt_dummyload.c +++ b/lib/igt_dummyload.c @@ -256,7 +256,7 @@ emit_recursive_batch(igt_spin_t *spin, r->offset = sizeof(uint32_t) * 1; r->delta = sizeof(uint32_t) * SPIN_POLL_START_IDX; - *cs++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + *cs++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { *cs++ = r->presumed_offset + r->delta; diff --git a/lib/igt_store.c b/lib/igt_store.c index 98c6c4fbd1..538405e7f5 100644 --- a/lib/igt_store.c +++ b/lib/igt_store.c @@ -76,7 +76,7 @@ void igt_store_word(int fd, uint64_t ahnd, const intel_ctx_t *ctx, obj[BATCH].offset = bb_offset; obj[BATCH].flags |= EXEC_OBJECT_PINNED; } - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { uint64_t addr = target_gpu_addr + delta; batch[++i] = lower_32_bits(addr); diff --git a/lib/intel_allocator.h b/lib/intel_allocator.h index 28e1165540..a6bf573e9d 100644 --- a/lib/intel_allocator.h +++ b/lib/intel_allocator.h @@ -12,6 +12,7 @@ #include <stdint.h> #include <stdatomic.h> #include "i915/gem_submission.h" +#include "intel_reg.h" /** * SECTION:intel_allocator @@ -217,13 +218,6 @@ void intel_allocator_print(uint64_t allocator_handle); #define GEN8_GTT_ADDRESS_WIDTH 48 -static inline uint64_t sign_extend64(uint64_t x, int high) -{ - int shift = 63 - high; - - return (int64_t)(x << shift) >> shift; -} - static inline uint64_t CANONICAL(uint64_t offset) { return sign_extend64(offset, GEN8_GTT_ADDRESS_WIDTH - 1); diff --git a/lib/intel_aux_pgtable.c b/lib/intel_aux_pgtable.c index 7556351a02..5205687080 100644 --- a/lib/intel_aux_pgtable.c +++ b/lib/intel_aux_pgtable.c @@ -9,7 +9,6 @@ #include "i915/gem_mman.h" -#define BITS_PER_LONG_LONG (sizeof(long long) * 8) #define BITMASK(e, s) ((~0ULL << (s)) & \ (~0ULL >> (BITS_PER_LONG_LONG - 1 - (e)))) @@ -644,11 +643,11 @@ gen12_emit_aux_pgtable_state(struct intel_bb *ibb, uint32_t state, bool render) if (!state) return; - intel_bb_out(ibb, MI_LOAD_REGISTER_MEM | MI_MMIO_REMAP_ENABLE_GEN12 | 2); + intel_bb_out(ibb, MI_LOAD_REGISTER_MEM_CMD | MI_MMIO_REMAP_ENABLE_GEN12 | 2); intel_bb_out(ibb, table_base_reg); intel_bb_emit_reloc(ibb, ibb->handle, 0, 0, state, ibb->batch_offset); - intel_bb_out(ibb, MI_LOAD_REGISTER_MEM | MI_MMIO_REMAP_ENABLE_GEN12 | 2); + intel_bb_out(ibb, MI_LOAD_REGISTER_MEM_CMD | MI_MMIO_REMAP_ENABLE_GEN12 | 2); intel_bb_out(ibb, table_base_reg + 4); intel_bb_emit_reloc(ibb, ibb->handle, 0, 0, state + 4, ibb->batch_offset); } diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c index 59c788e683..8695f1b7ac 100644 --- a/lib/intel_batchbuffer.c +++ b/lib/intel_batchbuffer.c @@ -378,7 +378,7 @@ void igt_blitter_src_copy(int fd, if ((src_tiling | dst_tiling) >= I915_TILING_Y) { unsigned int mask; - batch[i++] = MI_LOAD_REGISTER_IMM; + batch[i++] = MI_LOAD_REGISTER_IMM(1); batch[i++] = BCS_SWCTRL; mask = (BCS_SRC_Y | BCS_DST_Y) << 16; @@ -407,12 +407,12 @@ void igt_blitter_src_copy(int fd, if ((src_tiling | dst_tiling) >= I915_TILING_Y) { igt_assert(gen >= 6); - batch[i++] = MI_FLUSH_DW | 2; + batch[i++] = MI_FLUSH_DW_CMD | 2; batch[i++] = 0; batch[i++] = 0; batch[i++] = 0; - batch[i++] = MI_LOAD_REGISTER_IMM; + batch[i++] = MI_LOAD_REGISTER_IMM(1); batch[i++] = BCS_SWCTRL; batch[i++] = (BCS_SRC_Y | BCS_DST_Y) << 16; } @@ -2413,7 +2413,7 @@ void intel_bb_emit_blt_copy(struct intel_bb *ibb, } if ((src->tiling | dst->tiling) >= I915_TILING_Y) { - intel_bb_out(ibb, MI_LOAD_REGISTER_IMM); + intel_bb_out(ibb, MI_LOAD_REGISTER_IMM(1)); intel_bb_out(ibb, BCS_SWCTRL); mask = (BCS_SRC_Y | BCS_DST_Y) << 16; @@ -2450,12 +2450,12 @@ void intel_bb_emit_blt_copy(struct intel_bb *ibb, if ((src->tiling | dst->tiling) >= I915_TILING_Y) { igt_assert(ibb->gen >= 6); - intel_bb_out(ibb, MI_FLUSH_DW | 2); + intel_bb_out(ibb, MI_FLUSH_DW_CMD | 2); intel_bb_out(ibb, 0); intel_bb_out(ibb, 0); intel_bb_out(ibb, 0); - intel_bb_out(ibb, MI_LOAD_REGISTER_IMM); + intel_bb_out(ibb, MI_LOAD_REGISTER_IMM(1)); intel_bb_out(ibb, BCS_SWCTRL); intel_bb_out(ibb, (BCS_SRC_Y | BCS_DST_Y) << 16); } diff --git a/lib/intel_bufops.c b/lib/intel_bufops.c index 72c2189e05..cdc7a1698b 100644 --- a/lib/intel_bufops.c +++ b/lib/intel_bufops.c @@ -83,6 +83,13 @@ #define DEBUGFN() #endif +#undef TILE_NONE +#undef TILE_X +#undef TILE_Y +#undef TILE_Yf +#undef TILE_Ys +#undef TILE_4 + #define TILE_DEF(x) (1 << (x)) #define TILE_NONE TILE_DEF(I915_TILING_NONE) #define TILE_X TILE_DEF(I915_TILING_X) diff --git a/lib/intel_reg.h b/lib/intel_reg.h index 6f7559ad9f..3bf3676dc5 100644 --- a/lib/intel_reg.h +++ b/lib/intel_reg.h @@ -44,6 +44,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _I810_REG_H #define _I810_REG_H +#include "intel_gpu_commands.h" +#include "intel_gpu_commands_staging.h" + /* I/O register offsets */ #define CRX_MDA 0x3B4 @@ -2534,7 +2537,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define I855_CLOCK_166_250 (3 << 0) /* BLT commands */ -#define COLOR_BLT_CMD ((2<<29)|(0x40<<22)|(0x3)) #define COLOR_BLT_WRITE_ALPHA (1<<21) #define COLOR_BLT_WRITE_RGB (1<<20) @@ -2545,15 +2547,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define XY_SETUP_CLIP_BLT_CMD ((2<<29)|(3<<22)|1) -#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)) #define XY_SRC_COPY_BLT_WRITE_ALPHA (1<<21) #define XY_SRC_COPY_BLT_WRITE_RGB (1<<20) -#define XY_SRC_COPY_BLT_SRC_TILED (1<<15) -#define XY_SRC_COPY_BLT_DST_TILED (1<<11) - -#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)|0x4) -#define SRC_COPY_BLT_WRITE_ALPHA (1<<21) -#define SRC_COPY_BLT_WRITE_RGB (1<<20) #define XY_PAT_BLT_IMMEDIATE ((2<<29)|(0x72<<22)) @@ -2591,15 +2586,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define XY_FAST_COPY_COLOR_DEPTH_64 (4 << 24) #define XY_FAST_COPY_COLOR_DEPTH_128 (5 << 24) -#define MI_STORE_DWORD_IMM ((0x20<<23)|2) -#define MI_MEM_VIRTUAL (1 << 22) /* 965+ only */ - -#define MI_SET_CONTEXT (0x18<<23) #define CTXT_NO_RESTORE (1) #define CTXT_PALETTE_SAVE_DISABLE (1<<3) #define CTXT_PALETTE_RESTORE_DISABLE (1<<2) -#define MI_SET_APPID (0x0E << 23) #define APPID_CTXREST_INHIBIT (1 << 9) #define APPID_CTXSAVE_INHIBIT (1 << 8) #define APPTYPE(n) ((n) << 7) @@ -2616,36 +2606,26 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define MI_VERTEX_BUFFER_DISABLE (1) /* Overlay Flip */ -#define MI_OVERLAY_FLIP (0x11<<23) #define MI_OVERLAY_FLIP_CONTINUE (0<<21) #define MI_OVERLAY_FLIP_ON (1<<21) #define MI_OVERLAY_FLIP_OFF (2<<21) /* Wait for Events */ -#define MI_WAIT_FOR_EVENT (0x03<<23) #define MI_WAIT_FOR_PIPEB_SVBLANK (1<<18) #define MI_WAIT_FOR_PIPEA_SVBLANK (1<<17) -#define MI_WAIT_FOR_OVERLAY_FLIP (1<<16) #define MI_WAIT_FOR_PIPEB_VBLANK (1<<7) #define MI_WAIT_FOR_PIPEA_VBLANK (1<<3) #define MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW (1<<5) #define MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW (1<<1) -#define MI_LOAD_SCAN_LINES_INCL (0x12<<23) -#define MI_LOAD_REGISTER_IMM ((0x22 << 23) | 1) -#define MI_LOAD_REGISTER_REG ((0x2A << 23) | 1) -#define MI_LOAD_REGISTER_MEM (0x29 << 23) #define MI_CS_MMIO_DST (1 << 19) #define MI_CS_MMIO_SRC (1 << 18) #define MI_MMIO_REMAP_ENABLE_GEN12 (1 << 17) #define MI_WPARID_ENABLE_GEN12 (1 << 16) -#define MI_STORE_REGISTER_MEM (0x24 << 23) #define MI_STORE_PREDICATE_ENABLE_GEN12 (1 << 21) /* Flush */ -#define MI_FLUSH (0x04<<23) #define MI_WRITE_DIRTY_STATE (1<<4) -#define MI_END_SCENE (1<<3) #define MI_GLOBAL_SNAPSHOT_COUNT_RESET (1<<3) #define MI_INHIBIT_RENDER_CACHE_FLUSH (1<<2) #define MI_STATE_INSTRUCTION_CACHE_FLUSH (1<<1) @@ -2654,27 +2634,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define BRW_MI_GLOBAL_SNAPSHOT_RESET (1 << 3) /* Noop */ -#define MI_NOOP 0x00 #define MI_NOOP_WRITE_ID (1<<22) #define MI_NOOP_ID_MASK (1<<22 - 1) -/* ARB Check */ -#define MI_ARB_CHECK (0x5 << 23) - #define STATE3D_COLOR_FACTOR ((0x3<<29)|(0x1d<<24)|(0x01<<16)) /* Atomics */ -#define MI_ATOMIC ((0x2f << 23) | 1) -#define MI_ATOMIC_INLINE_DATA (1 << 18) #define MI_ATOMIC_INC (0x5 << 8) #define MI_ATOMIC_ADD (0x7 << 8) /* Batch */ -#define MI_BATCH_BUFFER ((0x30 << 23) | 1) -#define MI_BATCH_BUFFER_START (0x31 << 23) -#define MI_BATCH_BUFFER_START_GEN8 ((0x31 << 13) | 1) -#define MI_BATCH_PREDICATE (1 << 15) /* HSW+ on RCS only*/ -#define MI_BATCH_BUFFER_END (0xA << 23) #define MI_COND_BATCH_BUFFER_END (0x36 << 23) #define MAD_GT_IDD (0 << 12) #define MAD_GT_OR_EQ_IDD (1 << 12) @@ -2682,45 +2651,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define MAD_LT_OR_EQ_IDD (3 << 12) #define MAD_EQ_IDD (4 << 12) #define MAD_NEQ_IDD (5 << 12) -#define MI_DO_COMPARE (1 << 21) - -#define MI_BATCH_NON_SECURE (1) -#define MI_BATCH_NON_SECURE_I965 (1 << 8) -#define MI_BATCH_NON_SECURE_HSW (1<<13) /* Additional bit for RCS */ /* Math */ -#define MI_INSTR(opcode, flags) (((opcode) << 23) | (flags)) -#define MI_MATH(x) MI_INSTR(0x1a, (x) - 1) -#define MI_MATH_INSTR(opcode, op1, op2) ((opcode) << 20 | (op1) << 10 | (op2)) -/* Opcodes for MI_MATH_INSTR */ -#define MI_MATH_NOOP MI_MATH_INSTR(0x000, 0x0, 0x0) -#define MI_MATH_LOAD(op1, op2) MI_MATH_INSTR(0x080, op1, op2) -#define MI_MATH_LOADINV(op1, op2) MI_MATH_INSTR(0x480, op1, op2) -#define MI_MATH_LOAD0(op1) MI_MATH_INSTR(0x081, op1) -#define MI_MATH_LOAD1(op1) MI_MATH_INSTR(0x481, op1) -#define MI_MATH_ADD MI_MATH_INSTR(0x100, 0x0, 0x0) -#define MI_MATH_SUB MI_MATH_INSTR(0x101, 0x0, 0x0) -#define MI_MATH_AND MI_MATH_INSTR(0x102, 0x0, 0x0) -#define MI_MATH_OR MI_MATH_INSTR(0x103, 0x0, 0x0) -#define MI_MATH_XOR MI_MATH_INSTR(0x104, 0x0, 0x0) -#define MI_MATH_STORE(op1, op2) MI_MATH_INSTR(0x180, op1, op2) -#define MI_MATH_STOREINV(op1, op2) MI_MATH_INSTR(0x580, op1, op2) /* DG2+ */ #define MI_MATH_SHL MI_MATH_INSTR(0x105, 0x0, 0x0) #define MI_MATH_SHR MI_MATH_INSTR(0x106, 0x0, 0x0) #define MI_MATH_SAR MI_MATH_INSTR(0x107, 0x0, 0x0) -/* Registers used as operands in MI_MATH_INSTR */ -#define MI_MATH_REG(x) (x) -#define MI_MATH_REG_SRCA 0x20 -#define MI_MATH_REG_SRCB 0x21 -#define MI_MATH_REG_ACCU 0x31 -#define MI_MATH_REG_ZF 0x32 -#define MI_MATH_REG_CF 0x33 - -/* DG2+ */ -#define MI_SET_PREDICATE MI_INSTR(0x1, 0) - #define MAX_DISPLAY_PIPES 2 typedef enum { diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h index cf228c2651..e4d7c0d408 100644 --- a/lib/ioctl_wrappers.h +++ b/lib/ioctl_wrappers.h @@ -173,9 +173,9 @@ static inline uint64_t to_user_pointer(const void *ptr) * * Casts a 64bit value from an ioctl into a pointer. */ -static inline void *from_user_pointer(uint64_t u64) +static inline void *from_user_pointer(uint64_t u64p) { - return (void *)(uintptr_t)u64; + return (void *)(uintptr_t)u64p; } /** diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c index d74f1c9996..650d095020 100644 --- a/lib/rendercopy_gen9.c +++ b/lib/rendercopy_gen9.c @@ -967,10 +967,7 @@ static void gen8_emit_primitive(struct intel_bb *ibb, uint32_t offset) intel_bb_out(ibb, 0); /* index buffer offset, ignored */ } -#define GFX_OP_PIPE_CONTROL ((3 << 29) | (3 << 27) | (2 << 24)) -#define PIPE_CONTROL_CS_STALL (1 << 20) #define PIPE_CONTROL_RENDER_TARGET_FLUSH (1 << 12) -#define PIPE_CONTROL_FLUSH_ENABLE (1 << 7) #define PIPE_CONTROL_DATA_CACHE_INVALIDATE (1 << 5) #define PIPE_CONTROL_PROTECTEDPATH_DISABLE (1 << 27) #define PIPE_CONTROL_PROTECTEDPATH_ENABLE (1 << 22) @@ -986,7 +983,7 @@ static void gen12_emit_pxp_state(struct intel_bb *ibb, bool enable, if (enable) { pipe_ctl_flags = PIPE_CONTROL_FLUSH_ENABLE; - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL); + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(2)); intel_bb_out(ibb, pipe_ctl_flags); set_app_id = MI_SET_APPID | @@ -1005,7 +1002,7 @@ static void gen12_emit_pxp_state(struct intel_bb *ibb, bool enable, PIPE_CONTROL_RENDER_TARGET_FLUSH | PIPE_CONTROL_DATA_CACHE_INVALIDATE | PIPE_CONTROL_POST_SYNC_OP); - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | 4); + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(6)); intel_bb_out(ibb, pipe_ctl_flags); intel_bb_emit_reloc(ibb, ibb->handle, 0, I915_GEM_DOMAIN_COMMAND, (enable ? pxp_write_op_offset : (pxp_write_op_offset+8)), @@ -1107,7 +1104,7 @@ void _gen9_render_op(struct intel_bb *ibb, if (fast_clear) { for (int i = 0; i < 4; i++) { - intel_bb_out(ibb, MI_STORE_DWORD_IMM); + intel_bb_out(ibb, MI_STORE_DWORD_IMM_GEN4); intel_bb_emit_reloc(ibb, dst->handle, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, dst->cc.offset + i*sizeof(float), diff --git a/tests/i915/api_intel_bb.c b/tests/i915/api_intel_bb.c index 7ccc00aa25..46633b0385 100644 --- a/tests/i915/api_intel_bb.c +++ b/tests/i915/api_intel_bb.c @@ -1154,7 +1154,7 @@ static void delta_check(struct buf_ops *bops) intel_bb_add_object(ibb, buf->handle, intel_buf_bo_size(buf), buf->addr.offset, 0, false); - intel_bb_out(ibb, MI_STORE_DWORD_IMM); + intel_bb_out(ibb, MI_STORE_DWORD_IMM_GEN4); intel_bb_emit_reloc(ibb, buf->handle, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, diff --git a/tests/i915/gem_blits.c b/tests/i915/gem_blits.c index d9296cf2d1..9ea3925c38 100644 --- a/tests/i915/gem_blits.c +++ b/tests/i915/gem_blits.c @@ -27,8 +27,6 @@ #include "igt.h" #include "igt_x86.h" -#define MI_FLUSH_DW (0x26 << 23) - #define BCS_SWCTRL 0x22200 #define BCS_SRC_Y (1 << 0) #define BCS_DST_Y (1 << 1) @@ -198,7 +196,7 @@ static void buffer_set_tiling(const struct device *device, if ((tiling | buffer->tiling) >= I915_TILING_Y) { unsigned int mask; - batch[i++] = MI_LOAD_REGISTER_IMM; + batch[i++] = MI_LOAD_REGISTER_IMM(1); batch[i++] = BCS_SWCTRL; mask = (BCS_SRC_Y | BCS_DST_Y) << 16; @@ -248,12 +246,12 @@ static void buffer_set_tiling(const struct device *device, if ((tiling | buffer->tiling) >= I915_TILING_Y) { igt_assert(device->gen >= 6); - batch[i++] = MI_FLUSH_DW | 2; + batch[i++] = MI_FLUSH_DW_CMD | 2; batch[i++] = 0; batch[i++] = 0; batch[i++] = 0; - batch[i++] = MI_LOAD_REGISTER_IMM; + batch[i++] = MI_LOAD_REGISTER_IMM(1); batch[i++] = BCS_SWCTRL; batch[i++] = (BCS_SRC_Y | BCS_DST_Y) << 16; } @@ -345,7 +343,7 @@ static bool blit_to_linear(const struct device *device, if (buffer->tiling >= I915_TILING_Y) { unsigned int mask; - batch[i++] = MI_LOAD_REGISTER_IMM; + batch[i++] = MI_LOAD_REGISTER_IMM(1); batch[i++] = BCS_SWCTRL; mask = (BCS_SRC_Y | BCS_DST_Y) << 16; @@ -388,12 +386,12 @@ static bool blit_to_linear(const struct device *device, if (buffer->tiling >= I915_TILING_Y) { igt_assert(device->gen >= 6); - batch[i++] = MI_FLUSH_DW | 2; + batch[i++] = MI_FLUSH_DW_CMD | 2; batch[i++] = 0; batch[i++] = 0; batch[i++] = 0; - batch[i++] = MI_LOAD_REGISTER_IMM; + batch[i++] = MI_LOAD_REGISTER_IMM(1); batch[i++] = BCS_SWCTRL; batch[i++] = (BCS_SRC_Y | BCS_DST_Y) << 16; } @@ -678,7 +676,7 @@ blit(const struct device *device, if ((src->tiling | dst->tiling) >= I915_TILING_Y) { unsigned int mask; - batch[i++] = MI_LOAD_REGISTER_IMM; + batch[i++] = MI_LOAD_REGISTER_IMM(1); batch[i++] = BCS_SWCTRL; mask = (BCS_SRC_Y | BCS_DST_Y) << 16; @@ -729,12 +727,12 @@ blit(const struct device *device, if ((src->tiling | dst->tiling) >= I915_TILING_Y) { igt_assert(device->gen >= 6); - batch[i++] = MI_FLUSH_DW | 2; + batch[i++] = MI_FLUSH_DW_CMD | 2; batch[i++] = 0; batch[i++] = 0; batch[i++] = 0; - batch[i++] = MI_LOAD_REGISTER_IMM; + batch[i++] = MI_LOAD_REGISTER_IMM(1); batch[i++] = BCS_SWCTRL; batch[i++] = (BCS_SRC_Y | BCS_DST_Y) << 16; } diff --git a/tests/i915/gem_busy.c b/tests/i915/gem_busy.c index f11fa877d3..08a500a9ec 100644 --- a/tests/i915/gem_busy.c +++ b/tests/i915/gem_busy.c @@ -235,10 +235,10 @@ static void one(int fd, const intel_ctx_t *ctx, static void xchg_u32(void *array, unsigned i, unsigned j) { - uint32_t *u32 = array; - uint32_t tmp = u32[i]; - u32[i] = u32[j]; - u32[j] = tmp; + uint32_t *ui32 = array; + uint32_t tmp = ui32[i]; + ui32[i] = ui32[j]; + ui32[j] = tmp; } static void close_race(int fd, const intel_ctx_t *ctx) diff --git a/tests/i915/gem_ccs.c b/tests/i915/gem_ccs.c index b7e8bda71b..44e35ee9b0 100644 --- a/tests/i915/gem_ccs.c +++ b/tests/i915/gem_ccs.c @@ -137,7 +137,7 @@ static void surf_copy(int i915, surf.i915 = i915; surf.print_bb = param.print_bb; set_surf_object(&surf.src, mid->handle, mid->region, mid->size, - uc_mocs, INDIRECT_ACCESS); + uc_mocs, BLT_INDIRECT_ACCESS); set_surf_object(&surf.dst, ccs, REGION_SMEM, ccssize, uc_mocs, DIRECT_ACCESS); bb_size = 4096; diff --git a/tests/i915/gem_ctx_shared.c b/tests/i915/gem_ctx_shared.c index 18d8cc013d..3d73db581c 100644 --- a/tests/i915/gem_ctx_shared.c +++ b/tests/i915/gem_ctx_shared.c @@ -309,7 +309,7 @@ static void exec_shared_gtt(int i915, const intel_ctx_cfg_t *cfg, batch = gem_create(i915, 4096); i = 0; - cs[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + cs[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { cs[++i] = obj.offset; cs[++i] = obj.offset >> 32; @@ -564,7 +564,7 @@ static void store_dword(int i915, uint64_t ahnd, const intel_ctx_t *ctx, obj[2].relocation_count = !ahnd ? 1 : 0; i = 0; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = reloc.presumed_offset + reloc.delta; batch[++i] = 0; diff --git a/tests/i915/gem_exec_async.c b/tests/i915/gem_exec_async.c index d50fe45ec5..173bc4648a 100644 --- a/tests/i915/gem_exec_async.c +++ b/tests/i915/gem_exec_async.c @@ -73,7 +73,7 @@ static void store_dword(int fd, int id, const intel_ctx_t *ctx, obj[1].relocation_count = !id ? 1 : 0; i = 0; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = target_offset + offset; batch[++i] = (target_offset + offset) >> 32; diff --git a/tests/i915/gem_exec_balancer.c b/tests/i915/gem_exec_balancer.c index d7acdca190..1c655e583c 100644 --- a/tests/i915/gem_exec_balancer.c +++ b/tests/i915/gem_exec_balancer.c @@ -41,15 +41,6 @@ IGT_TEST_DESCRIPTION("Exercise in-kernel load-balancing"); -#define MI_SEMAPHORE_WAIT (0x1c << 23) -#define MI_SEMAPHORE_POLL (1 << 15) -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) - #define INSTANCE_COUNT (1 << I915_PMU_SAMPLE_INSTANCE_BITS) static size_t sizeof_load_balance(int count) @@ -589,7 +580,7 @@ static uint32_t create_semaphore_to_spinner(int i915, igt_spin_t *spin) /* Wait until the spinner is running */ addr = spin->obj[0].offset + 4 * SPIN_POLL_START_IDX; - *cs++ = MI_SEMAPHORE_WAIT | + *cs++ = MI_SEMAPHORE_WAIT_CMD | MI_SEMAPHORE_POLL | MI_SEMAPHORE_SAD_NEQ_SDD | (4 - 2); @@ -600,7 +591,7 @@ static uint32_t create_semaphore_to_spinner(int i915, igt_spin_t *spin) /* Then cancel the spinner */ addr = spin->obj[IGT_SPIN_BATCH].offset + offset_in_page(spin->condition); - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; *cs++ = addr; *cs++ = addr >> 32; *cs++ = MI_BATCH_BUFFER_END; @@ -1116,7 +1107,7 @@ static uint32_t sync_from(int i915, uint32_t addr, uint32_t target) cs = map = gem_mmap__device_coherent(i915, handle, 0, 4096, PROT_WRITE); /* cancel target spinner */ - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; *cs++ = target + 64; *cs++ = 0; *cs++ = 0; @@ -1131,7 +1122,7 @@ static uint32_t sync_from(int i915, uint32_t addr, uint32_t target) *cs++ = 0; /* self-heal */ - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; *cs++ = addr + 64; *cs++ = 0; *cs++ = MI_BATCH_BUFFER_START | 1 << 8 | 1; @@ -1162,13 +1153,13 @@ static uint32_t sync_to(int i915, uint32_t addr, uint32_t target) *cs++ = MI_NOOP; /* cancel their spin as a compliment */ - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; *cs++ = target + 64; *cs++ = 0; *cs++ = 0; /* self-heal */ - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; *cs++ = addr + 64; *cs++ = 0; *cs++ = MI_BATCH_BUFFER_START | 1 << 8 | 1; @@ -1906,7 +1897,7 @@ static uint32_t sema_create(int i915, uint64_t addr, uint32_t **x) for (int n = 1; n <= 32; n++) { uint32_t *cs = *x + n * 16; - *cs++ = MI_SEMAPHORE_WAIT | + *cs++ = MI_SEMAPHORE_WAIT_CMD | MI_SEMAPHORE_POLL | MI_SEMAPHORE_SAD_GTE_SDD | (4 - 2); diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c index 2db58266fd..d0499a8312 100644 --- a/tests/i915/gem_exec_capture.c +++ b/tests/i915/gem_exec_capture.c @@ -308,7 +308,7 @@ static void __capture1(int fd, int dir, uint64_t ahnd, const intel_ctx_t *ctx, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); i = 0; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = obj[SCRATCH].offset; batch[++i] = obj[SCRATCH].offset >> 32; @@ -498,7 +498,7 @@ __captureN(int fd, int dir, uint64_t ahnd, const intel_ctx_t *ctx, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); i = 0; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = obj[0].offset; batch[++i] = obj[0].offset >> 32; diff --git a/tests/i915/gem_exec_endless.c b/tests/i915/gem_exec_endless.c index 2c56cc2120..77719de83b 100644 --- a/tests/i915/gem_exec_endless.c +++ b/tests/i915/gem_exec_endless.c @@ -33,15 +33,6 @@ #define MAX_ENGINES 64 -#define MI_SEMAPHORE_WAIT (0x1c << 23) -#define MI_SEMAPHORE_POLL (1 << 15) -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) - static uint32_t batch_create(int i915) { const uint32_t bbe = MI_BATCH_BUFFER_END; @@ -133,7 +124,7 @@ static void __supervisor_run(struct supervisor *sv) sv->semaphore = cs + 1000; - *cs++ = MI_SEMAPHORE_WAIT | + *cs++ = MI_SEMAPHORE_WAIT_CMD | MI_SEMAPHORE_POLL | MI_SEMAPHORE_SAD_EQ_SDD | (4 - 2); @@ -142,7 +133,7 @@ static void __supervisor_run(struct supervisor *sv) *cs++ = 0; sv->terminate = cs; - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; *cs++ = offset_in_page(sv->semaphore); *cs++ = 0; *cs++ = 0; diff --git a/tests/i915/gem_exec_fair.c b/tests/i915/gem_exec_fair.c index 93a138ba47..8208ab404e 100644 --- a/tests/i915/gem_exec_fair.c +++ b/tests/i915/gem_exec_fair.c @@ -131,7 +131,7 @@ static void delay(int i915, cs = map = gem_mmap__device_coherent(i915, handle, 0, 4096, PROT_WRITE); - *cs++ = MI_LOAD_REGISTER_IMM; + *cs++ = MI_LOAD_REGISTER_IMM(1); *cs++ = CS_GPR(START_TS) + 4; *cs++ = 0; *cs++ = MI_LOAD_REGISTER_REG; @@ -144,7 +144,7 @@ static void delay(int i915, *cs++ = 0x5 << 23; /* MI_ARB_CHECK */ - *cs++ = MI_LOAD_REGISTER_IMM; + *cs++ = MI_LOAD_REGISTER_IMM(1); *cs++ = CS_GPR(NOW_TS) + 4; *cs++ = 0; *cs++ = MI_LOAD_REGISTER_REG; @@ -166,7 +166,7 @@ static void delay(int i915, /* Delay between SRM and COND_BBE to post the writes */ for (int n = 0; n < 8; n++) { - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; if (use_64b) { *cs++ = addr + 4064; *cs++ = addr >> 32; @@ -244,25 +244,25 @@ static void tslog(int i915, *cs++ = addr >> 32; /* Load the address + inc & mask variables */ - *cs++ = MI_LOAD_REGISTER_IMM; + *cs++ = MI_LOAD_REGISTER_IMM(1); *cs++ = CS_GPR(ADDR); addr_lo = cs; *cs++ = addr; - *cs++ = MI_LOAD_REGISTER_IMM; + *cs++ = MI_LOAD_REGISTER_IMM(1); *cs++ = CS_GPR(ADDR) + 4; *cs++ = addr >> 32; - *cs++ = MI_LOAD_REGISTER_IMM; + *cs++ = MI_LOAD_REGISTER_IMM(1); *cs++ = CS_GPR(INC); *cs++ = 4; - *cs++ = MI_LOAD_REGISTER_IMM; + *cs++ = MI_LOAD_REGISTER_IMM(1); *cs++ = CS_GPR(INC) + 4; *cs++ = 0; - *cs++ = MI_LOAD_REGISTER_IMM; + *cs++ = MI_LOAD_REGISTER_IMM(1); *cs++ = CS_GPR(MASK); *cs++ = 0xfffff7ff; - *cs++ = MI_LOAD_REGISTER_IMM; + *cs++ = MI_LOAD_REGISTER_IMM(1); *cs++ = CS_GPR(MASK) + 4; *cs++ = 0xffffffff; diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c index 6bf1cdb577..c2d874f84b 100644 --- a/tests/i915/gem_exec_fence.c +++ b/tests/i915/gem_exec_fence.c @@ -50,15 +50,6 @@ struct sync_merge_data { #define SYNC_IOC_MERGE _IOWR(SYNC_IOC_MAGIC, 3, struct sync_merge_data) #endif -#define MI_SEMAPHORE_WAIT (0x1c << 23) -#define MI_SEMAPHORE_POLL (1 << 15) -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) - static bool fence_busy(int fence) { return poll(&(struct pollfd){fence, POLLIN}, 1, 0) == 0; @@ -345,7 +336,7 @@ static uint32_t timeslicing_batches(int i915, uint32_t *offset) for (int step = 0; step < 8; step++) { if (pair) { cs[i++] = - MI_SEMAPHORE_WAIT | + MI_SEMAPHORE_WAIT_CMD | MI_SEMAPHORE_POLL | MI_SEMAPHORE_SAD_EQ_SDD | (4 - 2); @@ -354,14 +345,14 @@ static uint32_t timeslicing_batches(int i915, uint32_t *offset) cs[i++] = 0; } - cs[i++] = MI_STORE_DWORD_IMM; + cs[i++] = MI_STORE_DWORD_IMM_GEN4; cs[i++] = *offset; cs[i++] = 0; cs[i++] = x++; if (!pair) { cs[i++] = - MI_SEMAPHORE_WAIT | + MI_SEMAPHORE_WAIT_CMD | MI_SEMAPHORE_POLL | MI_SEMAPHORE_SAD_EQ_SDD | (4 - 2); @@ -452,7 +443,7 @@ static uint32_t submitN_batches(int i915, uint32_t offset, int count) for (int step = 0; step < 8; step++) { cs[i++] = - MI_SEMAPHORE_WAIT | + MI_SEMAPHORE_WAIT_CMD | MI_SEMAPHORE_POLL | MI_SEMAPHORE_SAD_EQ_SDD | (4 - 2); @@ -460,7 +451,7 @@ static uint32_t submitN_batches(int i915, uint32_t offset, int count) cs[i++] = offset; cs[i++] = 0; - cs[i++] = MI_STORE_DWORD_IMM; + cs[i++] = MI_STORE_DWORD_IMM_GEN4; cs[i++] = offset; cs[i++] = 0; cs[i++] = x + 1; @@ -606,7 +597,7 @@ static void test_parallel(int i915, const intel_ctx_t *ctx, } i = 0; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = scratch_offset + reloc.delta; batch[++i] = scratch_offset >> 32; @@ -726,7 +717,7 @@ static void test_concurrent(int i915, const intel_ctx_t *ctx, close(fence); i = 0; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = target_offset + reloc.delta; batch[++i] = target_offset >> 32; @@ -2464,21 +2455,21 @@ build_wait_bb(int i915, map = gem_mmap__device_coherent(i915, obj.handle, 0, 4096, PROT_WRITE); bb = map; - *bb++ = MI_LOAD_REGISTER_IMM; + *bb++ = MI_LOAD_REGISTER_IMM(1); *bb++ = mmio_base + HSW_CS_GPR(0); *bb++ = wait_value & 0xffffffff; - *bb++ = MI_LOAD_REGISTER_IMM; + *bb++ = MI_LOAD_REGISTER_IMM(1); *bb++ = mmio_base + HSW_CS_GPR(0) + 4; *bb++ = wait_value >> 32; *bb++ = MI_LOAD_REGISTER_REG; *bb++ = mmio_base + RING_TIMESTAMP; *bb++ = mmio_base + HSW_CS_GPR(1); - *bb++ = MI_LOAD_REGISTER_IMM; + *bb++ = MI_LOAD_REGISTER_IMM(1); *bb++ = mmio_base + HSW_CS_GPR(1) + 4; *bb++ = 0; - *bb++ = MI_LOAD_REGISTER_IMM; + *bb++ = MI_LOAD_REGISTER_IMM(1); *bb++ = mmio_base + HSW_CS_GPR(2) + 4; *bb++ = 0; relocs->delta = offset_in_page(bb); @@ -2563,23 +2554,23 @@ static void build_increment_engine_bb(struct inter_engine_batches *batch, { uint32_t *bb = batch->increment_bb = calloc(1, 4096); - *bb++ = MI_LOAD_REGISTER_MEM | 2; + *bb++ = MI_LOAD_REGISTER_MEM_CMD | 2; *bb++ = mmio_base + HSW_CS_GPR(0); batch->read0_ptrs[0] = bb; *bb++ = 0; *bb++ = 0; - *bb++ = MI_LOAD_REGISTER_MEM | 2; + *bb++ = MI_LOAD_REGISTER_MEM_CMD | 2; *bb++ = mmio_base + HSW_CS_GPR(0) + 4; batch->read0_ptrs[1] = bb; *bb++ = 0; *bb++ = 0; - *bb++ = MI_LOAD_REGISTER_MEM | 2; + *bb++ = MI_LOAD_REGISTER_MEM_CMD | 2; *bb++ = mmio_base + HSW_CS_GPR(1); batch->read1_ptrs[0] = bb; *bb++ = 0; *bb++ = 0; - *bb++ = MI_LOAD_REGISTER_MEM | 2; + *bb++ = MI_LOAD_REGISTER_MEM_CMD | 2; *bb++ = mmio_base + HSW_CS_GPR(1) + 4; batch->read1_ptrs[1] = bb; *bb++ = 0; @@ -2591,12 +2582,12 @@ static void build_increment_engine_bb(struct inter_engine_batches *batch, *bb++ = MI_MATH_ADD; *bb++ = MI_MATH_STORE(MI_MATH_REG(0), MI_MATH_REG_ACCU); - *bb++ = MI_STORE_REGISTER_MEM | 2; + *bb++ = MI_STORE_REGISTER_MEM_GEN8; *bb++ = mmio_base + HSW_CS_GPR(0); batch->write_ptrs[0] = bb; *bb++ = 0; *bb++ = 0; - *bb++ = MI_STORE_REGISTER_MEM | 2; + *bb++ = MI_STORE_REGISTER_MEM_GEN8; *bb++ = mmio_base + HSW_CS_GPR(0) + 4; batch->write_ptrs[1] = bb; *bb++ = 0; diff --git a/tests/i915/gem_exec_flush.c b/tests/i915/gem_exec_flush.c index 40c58db2bb..bb120e0d6c 100644 --- a/tests/i915/gem_exec_flush.c +++ b/tests/i915/gem_exec_flush.c @@ -208,7 +208,7 @@ static void run(int fd, unsigned ring, int nchild, int timeout, reloc0[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; offset = obj[0].offset + reloc0[i].delta; - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { *b++ = offset; *b++ = offset >> 32; @@ -242,7 +242,7 @@ static void run(int fd, unsigned ring, int nchild, int timeout, reloc1[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; offset = obj[0].offset + reloc1[i].delta; - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { *b++ = offset; *b++ = offset >> 32; @@ -496,7 +496,7 @@ static void batch(int fd, unsigned ring, int nchild, int timeout, reloc.delta = i * sizeof(uint32_t); offset = reloc.presumed_offset + reloc.delta; - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { *b++ = offset; *b++ = offset >> 32; diff --git a/tests/i915/gem_exec_gttfill.c b/tests/i915/gem_exec_gttfill.c index 137277fe53..d6c8f21920 100644 --- a/tests/i915/gem_exec_gttfill.c +++ b/tests/i915/gem_exec_gttfill.c @@ -70,7 +70,7 @@ static void submit(int fd, uint64_t ahnd, unsigned int gen, reloc[1].read_domains = I915_GEM_DOMAIN_INSTRUCTION; n = 0; - batch[n] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[n] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[n] |= 1 << 21; batch[n]++; diff --git a/tests/i915/gem_exec_nop.c b/tests/i915/gem_exec_nop.c index f35cc8401f..497f57f082 100644 --- a/tests/i915/gem_exec_nop.c +++ b/tests/i915/gem_exec_nop.c @@ -144,7 +144,7 @@ static void poll_ring(int fd, const intel_ctx_t *ctx, r->delta = 4092; r->read_domains = I915_GEM_DOMAIN_RENDER; - *b = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + *b = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { *++b = r->delta; *++b = 0; @@ -272,7 +272,7 @@ static void poll_sequential(int fd, const intel_ctx_t *ctx, r->read_domains = I915_GEM_DOMAIN_RENDER; r->write_domain = I915_GEM_DOMAIN_RENDER; - *b = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + *b = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { *++b = r->delta; *++b = 0; diff --git a/tests/i915/gem_exec_parallel.c b/tests/i915/gem_exec_parallel.c index 429620884b..705b22cb9f 100644 --- a/tests/i915/gem_exec_parallel.c +++ b/tests/i915/gem_exec_parallel.c @@ -92,7 +92,7 @@ static void *thread(void *data) } i = 0; - batch[i] = MI_STORE_DWORD_IMM | (t->gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (t->gen < 6 ? 1 << 22 : 0); if (t->gen >= 8) { batch[++i] = 4*t->id; batch[++i] = 0; diff --git a/tests/i915/gem_exec_params.c b/tests/i915/gem_exec_params.c index fd86afa16d..d0805d330f 100644 --- a/tests/i915/gem_exec_params.c +++ b/tests/i915/gem_exec_params.c @@ -120,7 +120,7 @@ static void test_batch_first(int fd) map = gem_mmap__cpu(fd, obj[0].handle, 0, 4096, PROT_WRITE); gem_set_domain(fd, obj[0].handle, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); - map[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + map[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { map[++i] = obj[1].offset; map[++i] = obj[1].offset >> 32; @@ -152,7 +152,7 @@ static void test_batch_first(int fd) map = gem_mmap__cpu(fd, obj[2].handle, 0, 4096, PROT_WRITE); gem_set_domain(fd, obj[2].handle, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); - map[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + map[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { map[++i] = obj[1].offset; map[++i] = obj[1].offset >> 32; diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c index 7a354a32a1..3ce89ca649 100644 --- a/tests/i915/gem_exec_reloc.c +++ b/tests/i915/gem_exec_reloc.c @@ -79,7 +79,7 @@ static void write_dword(int fd, obj[1].handle = gem_create(fd, 4096); i = 0; - buf[i++] = MI_STORE_DWORD_IMM | (gen < 6 ? 1<<22 : 0); + buf[i++] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1<<22 : 0); if (gen >= 8) { buf[i++] = target_offset; buf[i++] = target_offset >> 32; @@ -314,7 +314,7 @@ static void active(int fd, const intel_ctx_t *ctx, unsigned engine) for (pass = 0; pass < 1024; pass++) { uint32_t batch[16]; int i = 0; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = 0; batch[++i] = 0; @@ -526,17 +526,6 @@ static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags) gem_close(fd, obj.handle); } -static inline uint64_t sign_extend(uint64_t x, int index) -{ - int shift = 63 - index; - return (int64_t)(x << shift) >> shift; -} - -static uint64_t gen8_canonical_address(uint64_t address) -{ - return sign_extend(address, 47); -} - static void basic_range(int fd, unsigned flags) { struct drm_i915_gem_relocation_entry reloc[128]; @@ -563,7 +552,7 @@ static void basic_range(int fd, unsigned flags) for (int i = 0; i <= count; i++) { obj[n].handle = gem_create(fd, 4096); obj[n].offset = (1ull << (i + 12)) - 4096; - obj[n].offset = gen8_canonical_address(obj[n].offset); + obj[n].offset = gen8_canonical_addr(obj[n].offset); obj[n].flags = EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS; gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe)); execbuf.buffers_ptr = to_user_pointer(&obj[n]); @@ -583,7 +572,7 @@ static void basic_range(int fd, unsigned flags) for (int i = 1; i < count; i++) { obj[n].handle = gem_create(fd, 4096); obj[n].offset = 1ull << (i + 12); - obj[n].offset = gen8_canonical_address(obj[n].offset); + obj[n].offset = gen8_canonical_addr(obj[n].offset); obj[n].flags = EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS; gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe)); execbuf.buffers_ptr = to_user_pointer(&obj[n]); @@ -714,10 +703,10 @@ static int flags_to_index(const struct intel_execution_engine2 *e) static void xchg_u32(void *array, unsigned i, unsigned j) { - uint32_t *u32 = array; - uint32_t tmp = u32[i]; - u32[i] = u32[j]; - u32[j] = tmp; + uint32_t *ui32 = array; + uint32_t tmp = ui32[i]; + ui32[i] = ui32[j]; + ui32[j] = tmp; } static void concurrent_child(int i915, const intel_ctx_t *ctx, @@ -790,7 +779,7 @@ static uint32_t create_concurrent_batch(int i915, unsigned int count) uint32_t *map, *cs; uint32_t cmd; - cmd = MI_STORE_DWORD_IMM; + cmd = MI_STORE_DWORD_IMM_GEN4; if (gen < 6) cmd |= 1 << 22; if (gen < 4) diff --git a/tests/i915/gem_exec_schedule.c b/tests/i915/gem_exec_schedule.c index 58b118c79e..ab1dd7749b 100644 --- a/tests/i915/gem_exec_schedule.c +++ b/tests/i915/gem_exec_schedule.c @@ -55,15 +55,6 @@ #define MAX_CONTEXTS 1024 #define MAX_ELSP_QLEN 16 -#define MI_SEMAPHORE_WAIT (0x1c << 23) -#define MI_SEMAPHORE_POLL (1 << 15) -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) - IGT_TEST_DESCRIPTION("Check that we can control the order of execution"); static unsigned int offset_in_page(void *addr) @@ -148,7 +139,7 @@ static uint32_t __store_dword(int fd, uint64_t ahnd, const intel_ctx_t *ctx, obj[2].relocation_count = !ahnd ? 1 : 0; i = 0; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = reloc.presumed_offset + reloc.delta; batch[++i] = (reloc.presumed_offset + reloc.delta) >> 32; @@ -521,7 +512,7 @@ static uint32_t timeslicing_batches(int i915, uint32_t *offset) for (int step = 0; step < 8; step++) { if (pair) { cs[i++] = - MI_SEMAPHORE_WAIT | + MI_SEMAPHORE_WAIT_CMD | MI_SEMAPHORE_POLL | MI_SEMAPHORE_SAD_EQ_SDD | (4 - 2); @@ -530,14 +521,14 @@ static uint32_t timeslicing_batches(int i915, uint32_t *offset) cs[i++] = 0; } - cs[i++] = MI_STORE_DWORD_IMM; + cs[i++] = MI_STORE_DWORD_IMM_GEN4; cs[i++] = *offset; cs[i++] = 0; cs[i++] = x++; if (!pair) { cs[i++] = - MI_SEMAPHORE_WAIT | + MI_SEMAPHORE_WAIT_CMD | MI_SEMAPHORE_POLL | MI_SEMAPHORE_SAD_EQ_SDD | (4 - 2); @@ -629,7 +620,7 @@ static uint32_t timesliceN_batches(int i915, uint32_t offset, int count) for (int step = 0; step < 8; step++) { cs[i++] = - MI_SEMAPHORE_WAIT | + MI_SEMAPHORE_WAIT_CMD | MI_SEMAPHORE_POLL | MI_SEMAPHORE_SAD_EQ_SDD | (4 - 2); @@ -637,7 +628,7 @@ static uint32_t timesliceN_batches(int i915, uint32_t offset, int count) cs[i++] = offset; cs[i++] = 0; - cs[i++] = MI_STORE_DWORD_IMM; + cs[i++] = MI_STORE_DWORD_IMM_GEN4; cs[i++] = offset; cs[i++] = 0; cs[i++] = x + 1; @@ -797,7 +788,7 @@ static void cancel_spinner(int i915, map = gem_mmap__device_coherent(i915, obj.handle, 0, 4096, PROT_WRITE); cs = map; - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; *cs++ = spin->obj[IGT_SPIN_BATCH].offset + offset_in_page(spin->condition); *cs++ = spin->obj[IGT_SPIN_BATCH].offset >> 32; @@ -1108,13 +1099,13 @@ static void semaphore_resolve(int i915, const intel_ctx_cfg_t *cfg, cs = map = gem_mmap__cpu(i915, handle, 0, 4096, PROT_WRITE); /* Set semaphore initially to 1 for polling and signaling */ - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; *cs++ = SEMAPHORE_ADDR; *cs++ = 0; *cs++ = 1; /* Wait until another batch writes to our semaphore */ - *cs++ = MI_SEMAPHORE_WAIT | + *cs++ = MI_SEMAPHORE_WAIT_CMD | MI_SEMAPHORE_POLL | MI_SEMAPHORE_SAD_EQ_SDD | (4 - 2); @@ -1123,7 +1114,7 @@ static void semaphore_resolve(int i915, const intel_ctx_cfg_t *cfg, *cs++ = 0; /* Then cancel the spinner */ - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; *cs++ = spin->obj[IGT_SPIN_BATCH].offset + offset_in_page(spin->condition); *cs++ = 0; @@ -1161,7 +1152,7 @@ static void semaphore_resolve(int i915, const intel_ctx_cfg_t *cfg, /* Now the semaphore is spinning, cancel it */ cancel = gem_create(i915, 4096); cs = map = gem_mmap__cpu(i915, cancel, 0, 4096, PROT_WRITE); - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; *cs++ = SEMAPHORE_ADDR; *cs++ = 0; *cs++ = 0; @@ -1203,7 +1194,7 @@ static void semaphore_noskip(int i915, const intel_ctx_cfg_t *cfg, const intel_ctx_t *ctx0, *ctx1; uint64_t ahnd; - igt_require(gen >= 6); /* MI_STORE_DWORD_IMM convenience */ + igt_require(gen >= 6); /* MI_STORE_DWORD_IMM_GEN4 convenience */ ctx0 = intel_ctx_create(i915, cfg); ctx1 = intel_ctx_create(i915, cfg); @@ -1233,7 +1224,7 @@ static void semaphore_noskip(int i915, const intel_ctx_cfg_t *cfg, cs = map = gem_mmap__cpu(i915, handle, 0, 4096, PROT_WRITE); /* Cancel the following spinner */ - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; if (gen >= 8) { *cs++ = spin->obj[IGT_SPIN_BATCH].offset + offset_in_page(spin->condition); @@ -1359,14 +1350,14 @@ noreorder(int i915, const intel_ctx_cfg_t *cfg, addr = spin->obj[IGT_SPIN_BATCH].offset + offset_in_page(spin->condition); if (gen >= 8) { - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; *cs++ = addr; addr >>= 32; } else if (gen >= 4) { - *cs++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + *cs++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); *cs++ = 0; } else { - *cs++ = (MI_STORE_DWORD_IMM | 1 << 22) - 1; + *cs++ = (MI_STORE_DWORD_IMM_GEN4 | 1 << 22) - 1; } *cs++ = addr; *cs++ = MI_BATCH_BUFFER_END; @@ -2294,7 +2285,7 @@ static void reorder_wide(int fd, const intel_ctx_cfg_t *cfg, unsigned ring) addr = reloc.presumed_offset + reloc.delta; i = execbuf.batch_start_offset / sizeof(uint32_t); - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = addr; batch[++i] = addr >> 32; diff --git a/tests/i915/gem_exec_store.c b/tests/i915/gem_exec_store.c index efb9907ebb..7d23bcd5b4 100644 --- a/tests/i915/gem_exec_store.c +++ b/tests/i915/gem_exec_store.c @@ -94,7 +94,7 @@ static void store_dword(int fd, const intel_ctx_t *ctx, } i = 0; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = obj[0].offset; batch[++i] = obj[0].offset >> 32; @@ -180,7 +180,7 @@ static void store_cachelines(int fd, const intel_ctx_t *ctx, reloc[n].write_domain = I915_GEM_DOMAIN_INSTRUCTION; dst_offset = CANONICAL(reloc[n].presumed_offset + reloc[n].delta); - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = dst_offset; batch[++i] = dst_offset >> 32; @@ -283,7 +283,7 @@ static void store_all(int fd, const intel_ctx_t *ctx) offset = sizeof(uint32_t); i = 0; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[address = ++i] = 0; batch[++i] = 0; diff --git a/tests/i915/gem_exec_suspend.c b/tests/i915/gem_exec_suspend.c index 3b59966a11..1dadf06df0 100644 --- a/tests/i915/gem_exec_suspend.c +++ b/tests/i915/gem_exec_suspend.c @@ -159,7 +159,7 @@ static void run_test(int fd, const intel_ctx_t *ctx, } b = 0; - buf[b] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + buf[b] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { buf[++b] = offset; buf[++b] = offset >> 32; diff --git a/tests/i915/gem_exec_whisper.c b/tests/i915/gem_exec_whisper.c index 616231aa96..29d96cdcaa 100644 --- a/tests/i915/gem_exec_whisper.c +++ b/tests/i915/gem_exec_whisper.c @@ -312,7 +312,7 @@ static void whisper(int fd, const intel_ctx_t *ctx, } i = 0; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = store.offset + loc; batch[++i] = (store.offset + loc) >> 32; diff --git a/tests/i915/gem_pipe_control_store_loop.c b/tests/i915/gem_pipe_control_store_loop.c index df3da9f5b2..59959a3742 100644 --- a/tests/i915/gem_pipe_control_store_loop.c +++ b/tests/i915/gem_pipe_control_store_loop.c @@ -48,7 +48,6 @@ IGT_TEST_DESCRIPTION("Test (TLB-)Coherency of pipe_control QW writes."); static struct buf_ops *bops; -#define GFX_OP_PIPE_CONTROL ((0x3<<29)|(0x3<<27)|(0x2<<24)|2) #define PIPE_CONTROL_WRITE_IMMEDIATE (1<<14) #define PIPE_CONTROL_WRITE_TIMESTAMP (3<<14) #define PIPE_CONTROL_DEPTH_STALL (1<<13) @@ -96,7 +95,7 @@ store_pipe_control_loop(bool preuse_buffer, int timeout) * support code will do that for us. */ if (ibb->gen >= 8) { intel_bb_add_intel_buf(ibb, target_buf, true); - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL + 1); + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(5)); intel_bb_out(ibb, PIPE_CONTROL_WRITE_IMMEDIATE); intel_bb_emit_reloc_fenced(ibb, target_buf->handle, I915_GEM_DOMAIN_INSTRUCTION, @@ -108,13 +107,13 @@ store_pipe_control_loop(bool preuse_buffer, int timeout) /* work-around hw issue, see intel_emit_post_sync_nonzero_flush * in mesa sources. */ intel_bb_add_intel_buf(ibb, target_buf, true); - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL); + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(4)); intel_bb_out(ibb, PIPE_CONTROL_CS_STALL | PIPE_CONTROL_STALL_AT_SCOREBOARD); intel_bb_out(ibb, 0); /* address */ intel_bb_out(ibb, 0); /* write data */ - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL); + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(4)); intel_bb_out(ibb, PIPE_CONTROL_WRITE_IMMEDIATE); intel_bb_emit_reloc(ibb, target_buf->handle, I915_GEM_DOMAIN_INSTRUCTION, @@ -124,10 +123,10 @@ store_pipe_control_loop(bool preuse_buffer, int timeout) intel_bb_out(ibb, val); /* write data */ } else if (ibb->gen >= 4) { intel_bb_add_intel_buf(ibb, target_buf, true); - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(4) | PIPE_CONTROL_WC_FLUSH | PIPE_CONTROL_TC_FLUSH | - PIPE_CONTROL_WRITE_IMMEDIATE | 2); + PIPE_CONTROL_WRITE_IMMEDIATE); intel_bb_emit_reloc(ibb, target_buf->handle, I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, diff --git a/tests/i915/gem_pxp.c b/tests/i915/gem_pxp.c index 0c4224483f..af657d0e1b 100644 --- a/tests/i915/gem_pxp.c +++ b/tests/i915/gem_pxp.c @@ -748,10 +748,7 @@ static void test_pxp_pwrcycle_teardown_keychange(int i915, struct powermgt_data igt_assert_eq(matched_after_keychange, 0); } -#define GFX_OP_PIPE_CONTROL ((3 << 29) | (3 << 27) | (2 << 24)) -#define PIPE_CONTROL_CS_STALL (1 << 20) #define PIPE_CONTROL_RENDER_TARGET_FLUSH (1 << 12) -#define PIPE_CONTROL_FLUSH_ENABLE (1 << 7) #define PIPE_CONTROL_DATA_CACHE_INVALIDATE (1 << 5) #define PIPE_CONTROL_PROTECTEDPATH_DISABLE (1 << 27) #define PIPE_CONTROL_PROTECTEDPATH_ENABLE (1 << 22) @@ -765,7 +762,7 @@ static void emit_pipectrl(struct intel_bb *ibb, struct intel_buf *fenceb, bool b uint32_t pipe_ctl_flags = 0; uint32_t ps_op_id; - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL); + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(4)); intel_bb_out(ibb, pipe_ctl_flags); if (before) @@ -776,7 +773,7 @@ static void emit_pipectrl(struct intel_bb *ibb, struct intel_buf *fenceb, bool b pipe_ctl_flags = (PIPE_CONTROL_FLUSH_ENABLE | PIPE_CONTROL_CS_STALL | PIPE_CONTROL_POST_SYNC_OP); - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | 4); + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(6)); intel_bb_out(ibb, pipe_ctl_flags); intel_bb_emit_reloc(ibb, fenceb->handle, 0, I915_GEM_DOMAIN_COMMAND, (before?0:8), fenceb->addr.offset); diff --git a/tests/i915/gem_ringfill.c b/tests/i915/gem_ringfill.c index 8ab00525ff..afcd7b73ed 100644 --- a/tests/i915/gem_ringfill.c +++ b/tests/i915/gem_ringfill.c @@ -158,7 +158,7 @@ static void setup_execbuf(int fd, const intel_ctx_t *ctx, reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; offset = obj[0].offset + reloc[i].delta; - *b++ = MI_STORE_DWORD_IMM; + *b++ = MI_STORE_DWORD_IMM_GEN4; if (gen >= 8) { *b++ = offset; *b++ = offset >> 32; diff --git a/tests/i915/gem_softpin.c b/tests/i915/gem_softpin.c index c29bfd43d9..7682f772a1 100644 --- a/tests/i915/gem_softpin.c +++ b/tests/i915/gem_softpin.c @@ -41,18 +41,6 @@ IGT_TEST_DESCRIPTION("Tests softpin feature with normal usage, invalid inputs" #define LIMIT_32b ((1ull << 32) - (1ull << 12)) -/* gen8_canonical_addr - * Used to convert any address into canonical form, i.e. [63:48] == [47]. - * Based on kernel's sign_extend64 implementation. - * @address - a virtual address -*/ -#define GEN8_HIGH_ADDRESS_BIT 47 -static uint64_t gen8_canonical_addr(uint64_t address) -{ - __u8 shift = 63 - GEN8_HIGH_ADDRESS_BIT; - return (__s64)(address << shift) >> shift; -} - #define INTERRUPTIBLE 0x1 static void test_invalid(int fd) @@ -653,7 +641,7 @@ static void test_noreloc(int fd, enum sleep sleep, unsigned flags) gem_set_domain(fd, object[i].handle, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); for (i = 0; i < ARRAY_SIZE(object) - 1; i++) { - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { *b++ = object[i].offset; *b++ = object[i].offset >> 32; @@ -922,7 +910,7 @@ static void submit(int fd, unsigned int gen, BATCH_ALIGNMENT); address = obj.offset + BATCH_SIZE - eb->batch_start_offset - 8; n = 0; - batch[n] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[n] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[n] |= 1 << 21; batch[n]++; diff --git a/tests/i915/gem_sync.c b/tests/i915/gem_sync.c index 07cabf7abc..e7dc6637ab 100644 --- a/tests/i915/gem_sync.c +++ b/tests/i915/gem_sync.c @@ -588,7 +588,7 @@ store_ring(int fd, const intel_ctx_t *ctx, unsigned ring, reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; offset = object[0].offset + reloc[i].delta; - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { *b++ = offset; *b++ = offset >> 32; @@ -698,7 +698,7 @@ switch_ring(int fd, const intel_ctx_t *ctx, unsigned ring, c->reloc[r].write_domain = I915_GEM_DOMAIN_INSTRUCTION; offset = c->object[0].offset + c->reloc[r].delta; - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { *b++ = offset; *b++ = offset >> 32; @@ -772,10 +772,10 @@ switch_ring(int fd, const intel_ctx_t *ctx, unsigned ring, static void xchg(void *array, unsigned i, unsigned j) { - uint32_t *u32 = array; - uint32_t tmp = u32[i]; - u32[i] = u32[j]; - u32[j] = tmp; + uint32_t *ui32 = array; + uint32_t tmp = ui32[i]; + ui32[i] = ui32[j]; + ui32[j] = tmp; } struct waiter { @@ -859,7 +859,7 @@ __store_many(int fd, const intel_ctx_t *ctx, unsigned ring, reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; offset = object[0].offset + reloc[i].delta; - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { *b++ = offset; *b++ = offset >> 32; @@ -1080,7 +1080,7 @@ store_all(int fd, const intel_ctx_t *ctx, int num_children, int timeout) reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; offset = object[0].offset + reloc[i].delta; - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { *b++ = offset; *b++ = offset >> 32; diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c index 483570d0ad..07a453229a 100644 --- a/tests/i915/gem_userptr_blits.c +++ b/tests/i915/gem_userptr_blits.c @@ -338,7 +338,7 @@ static void store_dword(int fd, uint32_t target, obj[1].relocation_count = 1; i = 0; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = offset; batch[++i] = 0; @@ -1318,7 +1318,7 @@ static void store_dword_rand(int i915, const intel_ctx_t *ctx, offset = reloc[n].presumed_offset + reloc[n].delta; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = offset; batch[++i] = offset >> 32; @@ -1379,7 +1379,7 @@ static void test_readonly(int i915) /* * We have only a 31bit delta which we use for generating - * the target address for MI_STORE_DWORD_IMM, so our maximum + * the target address for MI_STORE_DWORD_IMM_GEN4, so our maximum * usable object size is only 2GiB. For now. */ igt_nsec_elapsed(memset(&tv, 0, sizeof(tv))); diff --git a/tests/i915/gem_vm_create.c b/tests/i915/gem_vm_create.c index 3005d347c3..f47d8c5569 100644 --- a/tests/i915/gem_vm_create.c +++ b/tests/i915/gem_vm_create.c @@ -268,7 +268,7 @@ write_to_address(int fd, uint32_t ctx, uint64_t addr, uint32_t value) int i; i = 0; - cs[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + cs[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { cs[++i] = addr; cs[++i] = addr >> 32; diff --git a/tests/i915/gem_watchdog.c b/tests/i915/gem_watchdog.c index 01eb007694..27f3a2d7fd 100644 --- a/tests/i915/gem_watchdog.c +++ b/tests/i915/gem_watchdog.c @@ -332,7 +332,7 @@ static void delay(int i915, cs = map = gem_mmap__device_coherent(i915, handle, 0, 4096, PROT_WRITE); - *cs++ = MI_LOAD_REGISTER_IMM; + *cs++ = MI_LOAD_REGISTER_IMM(1); *cs++ = CS_GPR(START_TS) + 4; *cs++ = 0; *cs++ = MI_LOAD_REGISTER_REG; @@ -345,7 +345,7 @@ static void delay(int i915, *cs++ = 0x5 << 23; /* MI_ARB_CHECK */ - *cs++ = MI_LOAD_REGISTER_IMM; + *cs++ = MI_LOAD_REGISTER_IMM(1); *cs++ = CS_GPR(NOW_TS) + 4; *cs++ = 0; *cs++ = MI_LOAD_REGISTER_REG; @@ -367,7 +367,7 @@ static void delay(int i915, /* Delay between SRM and COND_BBE to post the writes */ for (int n = 0; n < 8; n++) { - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; if (use_64b) { *cs++ = addr + 4064; *cs++ = addr >> 32; diff --git a/tests/i915/gem_workarounds.c b/tests/i915/gem_workarounds.c index 5fb2d73fdd..30c68d1ac9 100644 --- a/tests/i915/gem_workarounds.c +++ b/tests/i915/gem_workarounds.c @@ -121,7 +121,7 @@ static int workaround_fail_count(int i915, const intel_ctx_t *ctx) out = base = gem_mmap__cpu(i915, obj[1].handle, 0, batch_sz, PROT_WRITE); for (int i = 0; i < num_wa_regs; i++) { - *out++ = MI_STORE_REGISTER_MEM | (1 + (gen >= 8)); + *out++ = MI_STORE_REGISTER_MEM_CMD | (1 + (gen >= 8)); *out++ = wa_regs[i].addr; reloc[i].target_handle = obj[0].handle; reloc[i].offset = (out - base) * sizeof(*out); diff --git a/tests/i915/gen7_exec_parse.c b/tests/i915/gen7_exec_parse.c index 69b768ed29..e9751ea73f 100644 --- a/tests/i915/gen7_exec_parse.c +++ b/tests/i915/gen7_exec_parse.c @@ -48,10 +48,6 @@ #define INSTR_CLIENT_SHIFT 29 #define INSTR_INVALID_CLIENT 0x7 -#define MI_ARB_ON_OFF (0x8 << 23) -#define MI_DISPLAY_FLIP ((0x14 << 23) | 1) - -#define GFX_OP_PIPE_CONTROL ((0x3<<29)|(0x3<<27)|(0x2<<24)|2) #define PIPE_CONTROL_QW_WRITE (1<<14) #define PIPE_CONTROL_LRI_POST_OP (1<<23) @@ -298,7 +294,7 @@ static void test_lri(int fd, uint32_t handle, struct test_lri *test) { uint32_t lri[] = { - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), test->reg, test->test_val, MI_BATCH_BUFFER_END, @@ -372,13 +368,13 @@ static void test_allocations(int fd) static void hsw_load_register_reg(void) { uint32_t init_gpr0[16] = { - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), HSW_CS_GPR0, 0xabcdabc0, /* leave [1:0] zero */ MI_BATCH_BUFFER_END, }; uint32_t store_gpr0[16] = { - MI_STORE_REGISTER_MEM | (3 - 2), + MI_STORE_REGISTER_MEM_CMD | (3 - 2), HSW_CS_GPR0, 0, /* reloc*/ MI_BATCH_BUFFER_END, @@ -475,7 +471,7 @@ igt_main igt_subtest("basic-allowed") { uint32_t pc[] = { - GFX_OP_PIPE_CONTROL, + GFX_OP_PIPE_CONTROL(4), PIPE_CONTROL_QW_WRITE, 0, /* To be patched */ 0x12000000, @@ -490,7 +486,7 @@ igt_main igt_subtest("basic-offset") { uint32_t pc[] = { - GFX_OP_PIPE_CONTROL, + GFX_OP_PIPE_CONTROL(4), PIPE_CONTROL_QW_WRITE, 0, /* To be patched */ 0x12000000, @@ -597,7 +593,7 @@ igt_main igt_subtest("bitmasks") { uint32_t pc[] = { - GFX_OP_PIPE_CONTROL, + GFX_OP_PIPE_CONTROL(4), (PIPE_CONTROL_QW_WRITE | PIPE_CONTROL_LRI_POST_OP), 0, /* To be patched */ @@ -631,13 +627,13 @@ igt_main igt_subtest("cmd-crossing-page") { uint32_t lri_ok[] = { - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), SO_WRITE_OFFSET_0, /* allowed register address */ 0xdcbaabc0, /* [1:0] MBZ */ MI_BATCH_BUFFER_END, }; uint32_t store_reg[] = { - MI_STORE_REGISTER_MEM | (3 - 2), + MI_STORE_REGISTER_MEM_CMD | (3 - 2), SO_WRITE_OFFSET_0, 0, /* reloc */ MI_BATCH_BUFFER_END, @@ -655,29 +651,29 @@ igt_main igt_subtest("oacontrol-tracking") { uint32_t lri_ok[] = { - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), OACONTROL, 0x31337000, - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), OACONTROL, 0x0, MI_BATCH_BUFFER_END, 0 }; uint32_t lri_bad[] = { - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), OACONTROL, 0x31337000, MI_BATCH_BUFFER_END, }; uint32_t lri_extra_bad[] = { - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), OACONTROL, 0x31337000, - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), OACONTROL, 0x0, - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), OACONTROL, 0x31337000, MI_BATCH_BUFFER_END, @@ -701,7 +697,7 @@ igt_main igt_subtest("chained-batch") { uint32_t pc[] = { - GFX_OP_PIPE_CONTROL, + GFX_OP_PIPE_CONTROL(4), PIPE_CONTROL_QW_WRITE, 0, /* To be patched */ 0x12000000, diff --git a/tests/i915/gen9_exec_parse.c b/tests/i915/gen9_exec_parse.c index c8743a78a0..26b1517053 100644 --- a/tests/i915/gen9_exec_parse.c +++ b/tests/i915/gen9_exec_parse.c @@ -38,14 +38,6 @@ #define INSTR_CLIENT_SHIFT 29 #define INSTR_INVALID_CLIENT 0x7 -#define MI_ARB_ON_OFF (0x8 << 23) -#define MI_USER_INTERRUPT (0x02 << 23) -#define MI_FLUSH_DW (0x26 << 23) -#define MI_REPORT_HEAD (0x07 << 23) -#define MI_SUSPEND_FLUSH (0x0b << 23) -#define MI_LOAD_SCAN_LINES_EXCL (0x13 << 23) -#define MI_UPDATE_GTT (0x23 << 23) - #define BCS_SWCTRL 0x22200 #define BCS_GPR_BASE 0x22600 #define BCS_GPR(n) (0x22600 + (n) * 8) @@ -324,7 +316,7 @@ static const struct cmd allowed_cmds[] = { CMD_N(MI_NOOP), CMD_N(MI_USER_INTERRUPT), CMD_N(MI_WAIT_FOR_EVENT), - CMD(MI_FLUSH_DW, 5), + CMD(MI_FLUSH_DW_CMD, 5), CMD_N(MI_ARB_CHECK), CMD_N(MI_REPORT_HEAD), CMD_N(MI_FLUSH), @@ -453,11 +445,11 @@ static void test_bb_start(const int i915, const uint32_t handle, int test) MI_NOOP, MI_NOOP, MI_NOOP, - MI_STORE_DWORD_IMM, + MI_STORE_DWORD_IMM_GEN4, 0, 0, 1, - MI_STORE_DWORD_IMM, + MI_STORE_DWORD_IMM_GEN4, 4, 0, 2, @@ -680,13 +672,13 @@ static void test_bb_chained(const int i915, const uint32_t handle) static void test_cmd_crossing_page(const int i915, const uint32_t handle) { const uint32_t lri_ok[] = { - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), BCS_GPR(0), 0xbaadf00d, MI_BATCH_BUFFER_END, }; const uint32_t store_reg[] = { - MI_STORE_REGISTER_MEM | 2, + MI_STORE_REGISTER_MEM_CMD | 2, BCS_GPR(0), 0, /* reloc */ 0, /* reloc */ @@ -711,21 +703,21 @@ static void test_invalid_length(const int i915, const uint32_t handle) const uint32_t noops[8192] = { 0, }; const uint32_t lri_ok[] = { - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), BCS_GPR(0), ok_val, MI_BATCH_BUFFER_END, }; const uint32_t lri_bad[] = { - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), BCS_GPR(0), bad_val, MI_BATCH_BUFFER_END, }; const uint32_t store_reg[] = { - MI_STORE_REGISTER_MEM | 2, + MI_STORE_REGISTER_MEM_CMD | 2, BCS_GPR(0), 0, /* reloc */ 0, /* reloc */ @@ -824,21 +816,21 @@ static void test_register(const int i915, const uint32_t handle, const struct reg *r) { const uint32_t lri_zero[] = { - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), r->addr, r->masked_write ? 0xffff0000 : 0, MI_BATCH_BUFFER_END, }; const uint32_t lri_mask[] = { - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), r->addr, r->masked_write ? (r->mask << 16) | r->mask : r->mask, MI_BATCH_BUFFER_END, }; const uint32_t store_reg[] = { - MI_STORE_REGISTER_MEM | 2, + MI_STORE_REGISTER_MEM_CMD | 2, r->addr, 0, /* reloc */ 0, /* reloc */ @@ -877,7 +869,7 @@ static long int read_reg(const int i915, const uint32_t handle, const uint32_t addr) { const uint32_t store_reg[] = { - MI_STORE_REGISTER_MEM | 2, + MI_STORE_REGISTER_MEM_CMD | 2, addr, 0, /* reloc */ 0, /* reloc */ @@ -911,7 +903,7 @@ static int write_reg(const int i915, const uint32_t handle, const uint32_t addr, const uint32_t val) { const uint32_t lri[] = { - MI_LOAD_REGISTER_IMM, + MI_LOAD_REGISTER_IMM(1), addr, val, MI_BATCH_BUFFER_END, @@ -1088,17 +1080,6 @@ static inline uint32_t fill_and_copy_shadow(uint32_t *batch, uint32_t len, return i * sizeof(uint32_t); } -static inline uint64_t sign_extend(uint64_t x, int index) -{ - int shift = 63 - index; - return (int64_t)(x << shift) >> shift; -} - -static uint64_t gen8_canonical_address(uint64_t address) -{ - return sign_extend(address, 47); -} - static void test_shadow_peek(int fd) { uint64_t size = PAGE_SIZE; @@ -1130,7 +1111,7 @@ static void test_shadow_peek(int fd) exec[1].handle = gem_create(fd, size); /* batch */ exec[1].flags = EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS; - exec[1].offset = gen8_canonical_address(exec[0].pad_to_size); + exec[1].offset = gen8_canonical_addr(exec[0].pad_to_size); vaddr = gem_mmap__wc(fd, exec[1].handle, 0, size, PROT_WRITE); diff --git a/tests/i915/i915_module_load.c b/tests/i915/i915_module_load.c index d3a86b1133..725687dab4 100644 --- a/tests/i915/i915_module_load.c +++ b/tests/i915/i915_module_load.c @@ -80,7 +80,7 @@ static void store_all(int i915) int i; i = 0; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = 0; batch[++i] = 0; diff --git a/tests/i915/perf.c b/tests/i915/perf.c index dd1f1ac399..6453354cfc 100644 --- a/tests/i915/perf.c +++ b/tests/i915/perf.c @@ -58,30 +58,17 @@ IGT_TEST_DESCRIPTION("Test the i915 perf metrics streaming interface"); #define OAREPORT_REASON_GO (1<<4) #define OAREPORT_REASON_CLK_RATIO (1<<5) -#define GFX_OP_PIPE_CONTROL ((3 << 29) | (3 << 27) | (2 << 24)) -#define PIPE_CONTROL_CS_STALL (1 << 20) #define PIPE_CONTROL_GLOBAL_SNAPSHOT_COUNT_RESET (1 << 19) -#define PIPE_CONTROL_TLB_INVALIDATE (1 << 18) #define PIPE_CONTROL_SYNC_GFDT (1 << 17) -#define PIPE_CONTROL_MEDIA_STATE_CLEAR (1 << 16) #define PIPE_CONTROL_NO_WRITE (0 << 14) #define PIPE_CONTROL_WRITE_IMMEDIATE (1 << 14) #define PIPE_CONTROL_WRITE_DEPTH_COUNT (2 << 14) -#define PIPE_CONTROL_WRITE_TIMESTAMP (3 << 14) -#define PIPE_CONTROL_DEPTH_STALL (1 << 13) #define PIPE_CONTROL_RENDER_TARGET_FLUSH (1 << 12) #define PIPE_CONTROL_INSTRUCTION_INVALIDATE (1 << 11) -#define PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE (1 << 10) /* GM45+ only */ #define PIPE_CONTROL_ISP_DIS (1 << 9) #define PIPE_CONTROL_INTERRUPT_ENABLE (1 << 8) -#define PIPE_CONTROL_FLUSH_ENABLE (1 << 7) /* Gen7+ only */ /* GT */ #define PIPE_CONTROL_DATA_CACHE_INVALIDATE (1 << 5) -#define PIPE_CONTROL_VF_CACHE_INVALIDATE (1 << 4) -#define PIPE_CONTROL_CONST_CACHE_INVALIDATE (1 << 3) -#define PIPE_CONTROL_STATE_CACHE_INVALIDATE (1 << 2) -#define PIPE_CONTROL_STALL_AT_SCOREBOARD (1 << 1) -#define PIPE_CONTROL_DEPTH_CACHE_FLUSH (1 << 0) #define PIPE_CONTROL_PPGTT_WRITE (0 << 2) #define PIPE_CONTROL_GLOBAL_GTT_WRITE (1 << 2) @@ -3242,9 +3229,9 @@ emit_stall_timestamp_and_rpc(struct intel_bb *ibb, intel_bb_add_intel_buf(ibb, dst, true); if (intel_gen(devid) >= 8) - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | (6 - 2)); + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(6)); else - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | (5 - 2)); + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(5)); intel_bb_out(ibb, pipe_ctl_flags); intel_bb_emit_reloc(ibb, dst->handle, diff --git a/tests/i915/perf_pmu.c b/tests/i915/perf_pmu.c index c1779fc9d0..f387f8249a 100644 --- a/tests/i915/perf_pmu.c +++ b/tests/i915/perf_pmu.c @@ -681,12 +681,6 @@ no_sema(int gem_fd, const intel_ctx_t *ctx, assert_within_epsilon(val[0][1], 0.0f, tolerance); } -#define MI_INSTR(opcode, flags) (((opcode) << 23) | (flags)) -#define MI_SEMAPHORE_WAIT MI_INSTR(0x1c, 2) /* GEN8+ */ -#define MI_SEMAPHORE_POLL (1<<15) -#define MI_SEMAPHORE_SAD_GTE_SDD (1<<12) -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) - static void sema_wait(int gem_fd, const intel_ctx_t *ctx, const struct intel_execution_engine2 *e, @@ -719,7 +713,7 @@ sema_wait(int gem_fd, const intel_ctx_t *ctx, obj_ptr = gem_mmap__device_coherent(gem_fd, obj_handle, 0, 4096, PROT_WRITE); - batch[0] = MI_STORE_DWORD_IMM; + batch[0] = MI_STORE_DWORD_IMM_GEN4; batch[1] = obj_offset + sizeof(*obj_ptr); batch[2] = (obj_offset + sizeof(*obj_ptr)) >> 32; batch[3] = 1; @@ -807,7 +801,7 @@ create_sema(int gem_fd, uint64_t ahnd, { uint32_t cs[] = { /* Reset our semaphore wait */ - MI_STORE_DWORD_IMM, + MI_STORE_DWORD_IMM_GEN4, 0, 0, 1, @@ -1108,17 +1102,17 @@ event_wait(int gem_fd, const intel_ctx_t *ctx, obj.handle = gem_create(gem_fd, 4096); b = batch; - *b++ = MI_LOAD_REGISTER_IMM; + *b++ = MI_LOAD_REGISTER_IMM(1); *b++ = FORCEWAKE_MT; *b++ = 2 << 16 | 2; - *b++ = MI_LOAD_REGISTER_IMM; + *b++ = MI_LOAD_REGISTER_IMM(1); *b++ = DERRMR; *b++ = ~0u; *b++ = MI_WAIT_FOR_EVENT; - *b++ = MI_LOAD_REGISTER_IMM; + *b++ = MI_LOAD_REGISTER_IMM(1); *b++ = DERRMR; *b++ = ~0u; - *b++ = MI_LOAD_REGISTER_IMM; + *b++ = MI_LOAD_REGISTER_IMM(1); *b++ = FORCEWAKE_MT; *b++ = 2 << 16; *b++ = MI_BATCH_BUFFER_END; diff --git a/tests/i915/sysfs_timeslice_duration.c b/tests/i915/sysfs_timeslice_duration.c index 95dc377785..80d34285e2 100644 --- a/tests/i915/sysfs_timeslice_duration.c +++ b/tests/i915/sysfs_timeslice_duration.c @@ -46,15 +46,6 @@ #define ATTR "timeslice_duration_ms" #define RESET_TIMEOUT 50 /* milliseconds, at least one jiffie for kworker */ -#define MI_SEMAPHORE_WAIT (0x1c << 23) -#define MI_SEMAPHORE_POLL (1 << 15) -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) - static bool __enable_hangcheck(int dir, bool state) { return igt_sysfs_set(dir, "enable_hangcheck", state ? "1" : "0"); @@ -214,7 +205,7 @@ static uint64_t __test_duration(int i915, int engine, unsigned int timeout) cs = map; for (i = 0; i < 10; i++) { - *cs++ = MI_SEMAPHORE_WAIT | + *cs++ = MI_SEMAPHORE_WAIT_CMD | MI_SEMAPHORE_POLL | MI_SEMAPHORE_SAD_NEQ_SDD | (4 - 2 + (gen >= 12)); @@ -229,7 +220,7 @@ static uint64_t __test_duration(int i915, int engine, unsigned int timeout) *cs++ = obj[1].offset + sizeof(uint32_t) * i; *cs++ = 0; - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; *cs++ = obj[0].offset + 4096 - sizeof(uint32_t) * i - sizeof(uint32_t); *cs++ = 0; @@ -240,12 +231,12 @@ static uint64_t __test_duration(int i915, int engine, unsigned int timeout) cs += 16 - ((cs - map) & 15); start = (cs - map) * sizeof(*cs); for (i = 0; i < 10; i++) { - *cs++ = MI_STORE_DWORD_IMM; + *cs++ = MI_STORE_DWORD_IMM_GEN4; *cs++ = obj[0].offset + sizeof(uint32_t) * i; *cs++ = 0; *cs++ = 1; - *cs++ = MI_SEMAPHORE_WAIT | + *cs++ = MI_SEMAPHORE_WAIT_CMD | MI_SEMAPHORE_POLL | MI_SEMAPHORE_SAD_NEQ_SDD | (4 - 2 + (gen >= 12)); diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c index 06be273c0b..7b473c03df 100644 --- a/tests/prime_vgem.c +++ b/tests/prime_vgem.c @@ -624,7 +624,7 @@ static void work(int i915, uint64_t ahnd, uint64_t scratch_offset, int dmabuf, store[count].delta = sizeof(uint32_t) * count; store[count].read_domains = I915_GEM_DOMAIN_INSTRUCTION; store[count].write_domain = I915_GEM_DOMAIN_INSTRUCTION; - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); if (gen >= 8) { batch[++i] = scratch_offset + store[count].delta; batch[++i] = (scratch_offset + store[count].delta) >> 32; diff --git a/tools/intel_audio_dump.c b/tools/intel_audio_dump.c index 6d11659ec9..287dbd4759 100644 --- a/tools/intel_audio_dump.c +++ b/tools/intel_audio_dump.c @@ -48,6 +48,7 @@ static int disp_reg_base = 0; /* base address of display registers */ #define BITSTO(n) (n >= sizeof(long) * 8 ? ~0 : (1UL << (n)) - 1) #define BITMASK(high, low) (BITSTO(high+1) & ~BITSTO(low)) #define REG_BITS(reg, high, low) (((reg) & (BITMASK(high, low))) >> (low)) +#undef REG_BIT #define REG_BIT(reg, n) REG_BITS(reg, n, n) #define min_t(type, x, y) ({ \ diff --git a/tools/intel_reg.c b/tools/intel_reg.c index b0d91473a8..6c37e14d12 100644 --- a/tools/intel_reg.c +++ b/tools/intel_reg.c @@ -322,7 +322,7 @@ static int register_srm(struct config *config, struct reg *reg, batch[i++] = MI_NOOP; batch[i++] = MI_NOOP; - batch[i++] = MI_LOAD_REGISTER_IMM; + batch[i++] = MI_LOAD_REGISTER_IMM(1); batch[i++] = reg->addr; batch[i++] = *val_in; batch[i++] = MI_NOOP; -- 2.34.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 2/2] igt: Remove duplicated macros 2023-03-03 12:55 ` [igt-dev] [PATCH i-g-t 2/2] igt: Remove duplicated macros Zbigniew Kempczyński @ 2023-03-06 15:30 ` Kamil Konieczny 2023-03-06 15:50 ` Zbigniew Kempczyński 0 siblings, 1 reply; 11+ messages in thread From: Kamil Konieczny @ 2023-03-06 15:30 UTC (permalink / raw) To: igt-dev Hi Zbigniew, thank you for unifing these commands which will help in development. I have few nits, see below. On 2023-03-03 at 13:55:21 +0100, Zbigniew Kempczyński wrote: > Introducing intel_gpu_commands.h requires removing all conflicting > macros definitions with altering the code (mostly command length). > > For all commands used in IGT but not in the kernel (yet) add > intel_gpu_commands_staging.h which will keep all commands used > here only. Next import of command macros might finish verbatim > copy + removing from staging in one commit to compile cleanly. > > Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> > Cc: Petri Latvala <adrinael@adrinael.net> > Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com> > --- > benchmarks/gem_wsim.c | 6 +-- > include/intel_gpu_commands_staging.h | 18 +++++++ > include/linux/bitops.h | 4 +- > lib/gen4_render.h | 2 - > lib/gen7_media.h | 2 - > lib/gen7_render.h | 3 -- > lib/gen8_media.h | 2 - > lib/huc_copy.c | 6 +-- > lib/huc_copy.h | 2 +- > lib/i830_reg.h | 16 ------ > lib/i915/i915_blt.h | 4 +- > lib/i915/i915_crc.c | 15 +++--- > lib/igt_draw.c | 4 +- > lib/igt_dummyload.c | 2 +- > lib/igt_store.c | 2 +- > lib/intel_allocator.h | 8 +-- > lib/intel_aux_pgtable.c | 5 +- > lib/intel_batchbuffer.c | 12 ++--- > lib/intel_bufops.c | 7 +++ > lib/intel_reg.h | 69 ++---------------------- > lib/ioctl_wrappers.h | 4 +- > lib/rendercopy_gen9.c | 9 ++-- > tests/i915/api_intel_bb.c | 2 +- > tests/i915/gem_blits.c | 20 ++++--- > tests/i915/gem_busy.c | 8 +-- > tests/i915/gem_ccs.c | 2 +- > tests/i915/gem_ctx_shared.c | 4 +- > tests/i915/gem_exec_async.c | 2 +- > tests/i915/gem_exec_balancer.c | 23 +++----- > tests/i915/gem_exec_capture.c | 4 +- > tests/i915/gem_exec_endless.c | 13 +---- > tests/i915/gem_exec_fair.c | 18 +++---- > tests/i915/gem_exec_fence.c | 43 ++++++--------- > tests/i915/gem_exec_flush.c | 6 +-- > tests/i915/gem_exec_gttfill.c | 2 +- > tests/i915/gem_exec_nop.c | 4 +- > tests/i915/gem_exec_parallel.c | 2 +- > tests/i915/gem_exec_params.c | 4 +- > tests/i915/gem_exec_reloc.c | 29 ++++------ > tests/i915/gem_exec_schedule.c | 43 ++++++--------- > tests/i915/gem_exec_store.c | 6 +-- > tests/i915/gem_exec_suspend.c | 2 +- > tests/i915/gem_exec_whisper.c | 2 +- > tests/i915/gem_pipe_control_store_loop.c | 11 ++-- > tests/i915/gem_pxp.c | 7 +-- > tests/i915/gem_ringfill.c | 2 +- > tests/i915/gem_softpin.c | 16 +----- > tests/i915/gem_sync.c | 16 +++--- > tests/i915/gem_userptr_blits.c | 6 +-- > tests/i915/gem_vm_create.c | 2 +- > tests/i915/gem_watchdog.c | 6 +-- > tests/i915/gem_workarounds.c | 2 +- > tests/i915/gen7_exec_parse.c | 34 ++++++------ > tests/i915/gen9_exec_parse.c | 47 +++++----------- > tests/i915/i915_module_load.c | 2 +- > tests/i915/perf.c | 17 +----- > tests/i915/perf_pmu.c | 18 +++---- > tests/i915/sysfs_timeslice_duration.c | 17 ++---- > tests/prime_vgem.c | 2 +- > tools/intel_audio_dump.c | 1 + > tools/intel_reg.c | 2 +- > 61 files changed, 231 insertions(+), 418 deletions(-) > create mode 100644 include/intel_gpu_commands_staging.h > > diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c > index 2d60135817..7b5e62a3be 100644 > --- a/benchmarks/gem_wsim.c > +++ b/benchmarks/gem_wsim.c > @@ -1426,7 +1426,7 @@ static unsigned int create_bb(struct w_step *w, int self) > cs = ptr = gem_mmap__wc(fd, w->bb_handle, 0, 4096, PROT_WRITE); > > /* Store initial 64b timestamp: start */ > - *cs++ = MI_LOAD_REGISTER_IMM | MI_CS_MMIO_DST; > + *cs++ = MI_LOAD_REGISTER_IMM(1) | MI_CS_MMIO_DST; > *cs++ = CS_GPR(START_TS) + 4; > *cs++ = 0; > *cs++ = MI_LOAD_REGISTER_REG | MI_CS_MMIO_DST | MI_CS_MMIO_SRC; > @@ -1441,7 +1441,7 @@ static unsigned int create_bb(struct w_step *w, int self) > *cs++ = MI_ARB_CHECK; > > /* Store this 64b timestamp: now */ > - *cs++ = MI_LOAD_REGISTER_IMM | MI_CS_MMIO_DST; > + *cs++ = MI_LOAD_REGISTER_IMM(1) | MI_CS_MMIO_DST; > *cs++ = CS_GPR(NOW_TS) + 4; > *cs++ = 0; > *cs++ = MI_LOAD_REGISTER_REG | MI_CS_MMIO_DST | MI_CS_MMIO_SRC; > @@ -1456,7 +1456,7 @@ static unsigned int create_bb(struct w_step *w, int self) > *cs++ = MI_MATH_STOREINV(MI_MATH_REG(NOW_TS), MI_MATH_REG_ACCU); > > /* Save delta for indirect read by COND_BBE */ > - *cs++ = MI_STORE_REGISTER_MEM | (1 + use_64b) | MI_CS_MMIO_DST; > + *cs++ = MI_STORE_REGISTER_MEM_CMD | (1 + use_64b) | MI_CS_MMIO_DST; > *cs++ = CS_GPR(NOW_TS); > w->reloc[r].target_handle = self; > w->reloc[r].offset = offset_in_page(cs); > diff --git a/include/intel_gpu_commands_staging.h b/include/intel_gpu_commands_staging.h > new file mode 100644 > index 0000000000..74b4fb6553 > --- /dev/null > +++ b/include/intel_gpu_commands_staging.h > @@ -0,0 +1,18 @@ > +/* SPDX-License-Identifier: MIT*/ > +/* > + * Copyright © 2022 Intel Corporation > + */ > + > +#ifndef _INTEL_GPU_COMMANDS_STAGING_H_ > +#define _INTEL_GPU_COMMANDS_STAGING_H_ > + > +#include "linux_scaffold.h" > + > +/* Length-free commands */ > +#define MI_SEMAPHORE_WAIT_CMD (0x1c << 23) > +#define MI_STORE_DWORD_IMM_CMD (0x20 << 23) > +#define MI_STORE_REGISTER_MEM_CMD (0x24 << 23) > +#define MI_FLUSH_DW_CMD (0x26 << 23) > +#define MI_LOAD_REGISTER_MEM_CMD (0x29 << 23) May you sort them alphabetically ? > + > +#endif /* _INTEL_GPU_COMMANDS_STAGING_H_ */ > diff --git a/include/linux/bitops.h b/include/linux/bitops.h > index 1bbe60c83c..7416dfa451 100644 > --- a/include/linux/bitops.h > +++ b/include/linux/bitops.h > @@ -3,6 +3,8 @@ > #ifndef _HAX_LINUX_BITOPS_H_ > #define _HAX_LINUX_BITOPS_H_ > > -#include <linux_scaffold.h> > +#include "linux_scaffold.h" > + > +#define REG_BIT(x) (1ul << (x)) > > #endif /* _HAX_LINUX_BITOPS_H_ */ > diff --git a/lib/gen4_render.h b/lib/gen4_render.h > index 7d8bc659a7..bbbddd346e 100644 > --- a/lib/gen4_render.h > +++ b/lib/gen4_render.h > @@ -25,14 +25,12 @@ > #define GEN4_CS_URB_STATE GEN4_3D(0, 0, 1) > > #define GEN4_STATE_BASE_ADDRESS GEN4_3D(0, 1, 1) > -# define BASE_ADDRESS_MODIFY (1 << 0) > > #define GEN4_STATE_SIP GEN4_3D(0, 1, 2) > > #define GEN4_PIPELINE_SELECT GEN4_3D(0, 1, 4) > #define G4X_PIPELINE_SELECT GEN4_3D(1, 1, 4) > # define PIPELINE_SELECT_3D 0 > -# define PIPELINE_SELECT_MEDIA 1 > > #define GEN4_3DSTATE_PIPELINED_POINTERS GEN4_3D(3, 0, 0) > # define GEN4_GS_DISABLE 0 > diff --git a/lib/gen7_media.h b/lib/gen7_media.h > index e81b5523a7..b5e49cae9e 100644 > --- a/lib/gen7_media.h > +++ b/lib/gen7_media.h > @@ -14,11 +14,9 @@ > > #define GEN7_PIPELINE_SELECT GFXPIPE(1, 1, 4) > # define PIPELINE_SELECT_3D (0 << 0) > -# define PIPELINE_SELECT_MEDIA (1 << 0) > # define PIPELINE_SELECT_GPGPU (2 << 0) > > #define GEN7_STATE_BASE_ADDRESS GFXPIPE(0, 1, 1) > -# define BASE_ADDRESS_MODIFY (1 << 0) > > #define GEN7_MEDIA_VFE_STATE GFXPIPE(2, 0, 0) > #define GEN7_MEDIA_CURBE_LOAD GFXPIPE(2, 0, 1) > diff --git a/lib/gen7_render.h b/lib/gen7_render.h > index 5dfc04d4bc..d09ba6dad1 100644 > --- a/lib/gen7_render.h > +++ b/lib/gen7_render.h > @@ -170,9 +170,6 @@ > /* DW1 */ > # define GEN7_PUSH_CONSTANT_BUFFER_OFFSET_SHIFT 16 > > -/* for GEN7_STATE_BASE_ADDRESS */ > -#define BASE_ADDRESS_MODIFY (1 << 0) > - > /* for GEN7_PIPE_CONTROL */ > #define GEN7_PIPE_CONTROL_CS_STALL (1 << 20) > #define GEN7_PIPE_CONTROL_STALL_AT_SCOREBOARD (1 << 1) > diff --git a/lib/gen8_media.h b/lib/gen8_media.h > index 1643794156..d2a049a1ec 100644 > --- a/lib/gen8_media.h > +++ b/lib/gen8_media.h > @@ -14,10 +14,8 @@ > > #define GEN8_PIPELINE_SELECT GFXPIPE(1, 1, 4) > # define PIPELINE_SELECT_3D (0 << 0) > -# define PIPELINE_SELECT_MEDIA (1 << 0) > > #define GEN8_STATE_BASE_ADDRESS GFXPIPE(0, 1, 1) > -# define BASE_ADDRESS_MODIFY (1 << 0) > > #define GEN8_MEDIA_VFE_STATE GFXPIPE(2, 0, 0) > #define GEN8_MEDIA_CURBE_LOAD GFXPIPE(2, 0, 1) > diff --git a/lib/huc_copy.c b/lib/huc_copy.c > index 6ec68864b7..bf8254c612 100644 > --- a/lib/huc_copy.c > +++ b/lib/huc_copy.c > @@ -80,14 +80,14 @@ gen9_huc_copyfunc(int fd, uint64_t ahnd, > buf[i++] = 0; > buf[i++] = 0x3; > > - buf[i++] = MFX_WAIT; > - buf[i++] = MFX_WAIT; > + buf[i++] = HUC_MFX_WAIT; > + buf[i++] = HUC_MFX_WAIT; imho this changes to huc_copy may be in separate patch before your main patchset. If you prefer it can stay. > > buf[i++] = HUC_PIPE_MODE_SELECT; > buf[i++] = 0; > buf[i++] = 0; > > - buf[i++] = MFX_WAIT; > + buf[i++] = HUC_MFX_WAIT; > > memset(reloc, 0, sizeof(reloc)); > > diff --git a/lib/huc_copy.h b/lib/huc_copy.h > index 69d1409335..1789e87359 100644 > --- a/lib/huc_copy.h > +++ b/lib/huc_copy.h > @@ -31,7 +31,7 @@ > #include "intel_reg.h" > > #define PARALLEL_VIDEO_PIPE (0x3<<29) > -#define MFX_WAIT (PARALLEL_VIDEO_PIPE|(0x1<<27)|(0x1<<8)) > +#define HUC_MFX_WAIT (PARALLEL_VIDEO_PIPE|(0x1<<27)|(0x1<<8)) > > #define HUC_IMEM_STATE (PARALLEL_VIDEO_PIPE|(0x2<<27)|(0xb<<23)|(0x1<<16)|0x3) > #define HUC_PIPE_MODE_SELECT (PARALLEL_VIDEO_PIPE|(0x2<<27)|(0xb<<23)|0x1) > diff --git a/lib/i830_reg.h b/lib/i830_reg.h > index b8ad2ac00f..3c0b9b5bd0 100644 > --- a/lib/i830_reg.h > +++ b/lib/i830_reg.h > @@ -30,12 +30,7 @@ > > #define I830_SET_FIELD( var, mask, value ) (var &= ~(mask), var |= value) > > -/* Flush */ > -#define MI_FLUSH (0x04<<23) > -#define MI_FLUSH_DW (0x26<<23) > - > #define MI_WRITE_DIRTY_STATE (1<<4) > -#define MI_END_SCENE (1<<3) > #define MI_GLOBAL_SNAPSHOT_COUNT_RESET (1<<3) > #define MI_INHIBIT_RENDER_CACHE_FLUSH (1<<2) > #define MI_STATE_INSTRUCTION_CACHE_FLUSH (1<<1) > @@ -43,15 +38,11 @@ > /* broadwater flush bits */ > #define BRW_MI_GLOBAL_SNAPSHOT_RESET (1 << 3) > > -#define MI_BATCH_BUFFER_END (0xA << 23) > - > /* Noop */ > -#define MI_NOOP 0x00 > #define MI_NOOP_WRITE_ID (1<<22) > #define MI_NOOP_ID_MASK (1<<22 - 1) > > /* Wait for Events */ > -#define MI_WAIT_FOR_EVENT (0x03<<23) > #define MI_WAIT_FOR_PIPEB_SVBLANK (1<<18) > #define MI_WAIT_FOR_PIPEA_SVBLANK (1<<17) > #define MI_WAIT_FOR_OVERLAY_FLIP (1<<16) > @@ -61,12 +52,10 @@ > #define MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW (1<<1) > > /* Set the scan line for MI_WAIT_FOR_PIPE?_SCAN_LINE_WINDOW */ > -#define MI_LOAD_SCAN_LINES_INCL (0x12<<23) > #define MI_LOAD_SCAN_LINES_DISPLAY_PIPEA (0) > #define MI_LOAD_SCAN_LINES_DISPLAY_PIPEB (0x1<<20) > > /* BLT commands */ > -#define COLOR_BLT_CMD ((2<<29)|(0x40<<22)|(0x3)) > #define COLOR_BLT_WRITE_ALPHA (1<<21) > #define COLOR_BLT_WRITE_RGB (1<<20) > > @@ -76,16 +65,11 @@ > > #define XY_SETUP_CLIP_BLT_CMD ((2<<29)|(3<<22)|1) > > -#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)) > #define XY_SRC_COPY_BLT_WRITE_ALPHA (1<<21) > #define XY_SRC_COPY_BLT_WRITE_RGB (1<<20) > #define XY_SRC_COPY_BLT_SRC_TILED (1<<15) > #define XY_SRC_COPY_BLT_DST_TILED (1<<11) > > -#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)|0x4) > -#define SRC_COPY_BLT_WRITE_ALPHA (1<<21) > -#define SRC_COPY_BLT_WRITE_RGB (1<<20) > - > #define XY_PAT_BLT_IMMEDIATE ((2<<29)|(0x72<<22)) > > #define XY_MONO_PAT_BLT_CMD ((0x2<<29)|(0x52<<22)|0x7) > diff --git a/lib/i915/i915_blt.h b/lib/i915/i915_blt.h > index c535961e8a..63951db753 100644 > --- a/lib/i915/i915_blt.h > +++ b/lib/i915/i915_blt.h > @@ -135,8 +135,8 @@ struct blt_block_copy_data_ext { > }; > > enum blt_access_type { > - INDIRECT_ACCESS, > - DIRECT_ACCESS, > + BLT_INDIRECT_ACCESS, > + BLT_DIRECT_ACCESS, > }; > > struct blt_ctrl_surf_copy_object { > diff --git a/lib/i915/i915_crc.c b/lib/i915/i915_crc.c > index 7d68f8e5c4..9564b7327d 100644 > --- a/lib/i915/i915_crc.c > +++ b/lib/i915/i915_crc.c > @@ -9,7 +9,6 @@ > #include "gem_create.h" > #include "gem_engine_topology.h" > #include "gem_mman.h" > -#include "i830_reg.h" > #include "i915_drm.h" > #include "intel_reg.h" > #include "intel_chipset.h" > @@ -36,13 +35,13 @@ > } while (0) > > #define LOAD_REGISTER_IMM32(__reg, __imm1) do { \ > - *bb++ = MI_LOAD_REGISTER_IMM | MI_CS_MMIO_DST; \ > + *bb++ = MI_LOAD_REGISTER_IMM(1) | MI_CS_MMIO_DST; \ > *bb++ = (__reg); \ > *bb++ = (__imm1); \ > } while (0) > > #define LOAD_REGISTER_IMM64(__reg, __imm1, __imm2) do { \ > - *bb++ = (MI_LOAD_REGISTER_IMM + 2) | MI_CS_MMIO_DST; \ > + *bb++ = MI_LOAD_REGISTER_IMM(2) | MI_CS_MMIO_DST; \ > *bb++ = (__reg); \ > *bb++ = (__imm1); \ > *bb++ = (__reg) + 4; \ > @@ -50,29 +49,29 @@ > } while (0) > > #define LOAD_REGISTER_MEM(__reg, __offset) do { \ > - *bb++ = MI_LOAD_REGISTER_MEM | MI_CS_MMIO_DST | 2; \ > + *bb++ = MI_LOAD_REGISTER_MEM_CMD | MI_CS_MMIO_DST | 2; \ > *bb++ = (__reg); \ > *bb++ = (__offset); \ > *bb++ = (__offset) >> 32; \ > } while (0) > > #define LOAD_REGISTER_MEM_WPARID(__reg, __offset) do { \ > - *bb++ = MI_LOAD_REGISTER_MEM | MI_CS_MMIO_DST | MI_WPARID_ENABLE_GEN12 | 2; \ > + *bb++ = MI_LOAD_REGISTER_MEM_CMD | MI_CS_MMIO_DST | MI_WPARID_ENABLE_GEN12 | 2; \ > *bb++ = (__reg); \ > *bb++ = (__offset); \ > *bb++ = (__offset) >> 32; \ > } while (0) > > #define STORE_REGISTER_MEM(__reg, __offset) do { \ > - *bb++ = MI_STORE_REGISTER_MEM | MI_CS_MMIO_DST | 2; \ > + *bb++ = MI_STORE_REGISTER_MEM_GEN8 | MI_CS_MMIO_DST; \ > *bb++ = (__reg); \ > *bb++ = (__offset); \ > *bb++ = (__offset) >> 32; \ > } while (0) > > #define STORE_REGISTER_MEM_PREDICATED(__reg, __offset) do { \ > - *bb++ = MI_STORE_REGISTER_MEM | MI_CS_MMIO_DST | \ > - MI_STORE_PREDICATE_ENABLE_GEN12 | 2; \ > + *bb++ = MI_STORE_REGISTER_MEM_GEN8 | MI_CS_MMIO_DST | \ > + MI_STORE_PREDICATE_ENABLE_GEN12; \ > *bb++ = (__reg); \ > *bb++ = (__offset); \ > *bb++ = (__offset) >> 32; \ > diff --git a/lib/igt_draw.c b/lib/igt_draw.c > index 58ce0539be..ac512fac5a 100644 > --- a/lib/igt_draw.c > +++ b/lib/igt_draw.c > @@ -385,12 +385,12 @@ static void switch_blt_tiling(struct intel_bb *ibb, uint32_t tiling, bool on) > /* To change the tile register, insert an MI_FLUSH_DW followed by an > * MI_LOAD_REGISTER_IMM > */ > - intel_bb_out(ibb, MI_FLUSH_DW | 2); > + intel_bb_out(ibb, MI_FLUSH_DW_CMD | 2); > intel_bb_out(ibb, 0x0); > intel_bb_out(ibb, 0x0); > intel_bb_out(ibb, 0x0); > > - intel_bb_out(ibb, MI_LOAD_REGISTER_IMM); > + intel_bb_out(ibb, MI_LOAD_REGISTER_IMM(1)); > intel_bb_out(ibb, 0x22200); /* BCS_SWCTRL */ > intel_bb_out(ibb, bcs_swctrl); > intel_bb_out(ibb, MI_NOOP); > diff --git a/lib/igt_dummyload.c b/lib/igt_dummyload.c > index 5f3c6b10c7..b3dc18ee7d 100644 > --- a/lib/igt_dummyload.c > +++ b/lib/igt_dummyload.c > @@ -256,7 +256,7 @@ emit_recursive_batch(igt_spin_t *spin, > r->offset = sizeof(uint32_t) * 1; > r->delta = sizeof(uint32_t) * SPIN_POLL_START_IDX; > > - *cs++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + *cs++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > *cs++ = r->presumed_offset + r->delta; > diff --git a/lib/igt_store.c b/lib/igt_store.c > index 98c6c4fbd1..538405e7f5 100644 > --- a/lib/igt_store.c > +++ b/lib/igt_store.c > @@ -76,7 +76,7 @@ void igt_store_word(int fd, uint64_t ahnd, const intel_ctx_t *ctx, > obj[BATCH].offset = bb_offset; > obj[BATCH].flags |= EXEC_OBJECT_PINNED; > } > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > uint64_t addr = target_gpu_addr + delta; > batch[++i] = lower_32_bits(addr); > diff --git a/lib/intel_allocator.h b/lib/intel_allocator.h > index 28e1165540..a6bf573e9d 100644 > --- a/lib/intel_allocator.h > +++ b/lib/intel_allocator.h > @@ -12,6 +12,7 @@ > #include <stdint.h> > #include <stdatomic.h> > #include "i915/gem_submission.h" > +#include "intel_reg.h" > > /** > * SECTION:intel_allocator > @@ -217,13 +218,6 @@ void intel_allocator_print(uint64_t allocator_handle); > > #define GEN8_GTT_ADDRESS_WIDTH 48 > > -static inline uint64_t sign_extend64(uint64_t x, int high) > -{ > - int shift = 63 - high; > - > - return (int64_t)(x << shift) >> shift; > -} > - > static inline uint64_t CANONICAL(uint64_t offset) > { > return sign_extend64(offset, GEN8_GTT_ADDRESS_WIDTH - 1); > diff --git a/lib/intel_aux_pgtable.c b/lib/intel_aux_pgtable.c > index 7556351a02..5205687080 100644 > --- a/lib/intel_aux_pgtable.c > +++ b/lib/intel_aux_pgtable.c > @@ -9,7 +9,6 @@ > > #include "i915/gem_mman.h" > > -#define BITS_PER_LONG_LONG (sizeof(long long) * 8) > #define BITMASK(e, s) ((~0ULL << (s)) & \ > (~0ULL >> (BITS_PER_LONG_LONG - 1 - (e)))) > > @@ -644,11 +643,11 @@ gen12_emit_aux_pgtable_state(struct intel_bb *ibb, uint32_t state, bool render) > if (!state) > return; > > - intel_bb_out(ibb, MI_LOAD_REGISTER_MEM | MI_MMIO_REMAP_ENABLE_GEN12 | 2); > + intel_bb_out(ibb, MI_LOAD_REGISTER_MEM_CMD | MI_MMIO_REMAP_ENABLE_GEN12 | 2); > intel_bb_out(ibb, table_base_reg); > intel_bb_emit_reloc(ibb, ibb->handle, 0, 0, state, ibb->batch_offset); > > - intel_bb_out(ibb, MI_LOAD_REGISTER_MEM | MI_MMIO_REMAP_ENABLE_GEN12 | 2); > + intel_bb_out(ibb, MI_LOAD_REGISTER_MEM_CMD | MI_MMIO_REMAP_ENABLE_GEN12 | 2); > intel_bb_out(ibb, table_base_reg + 4); > intel_bb_emit_reloc(ibb, ibb->handle, 0, 0, state + 4, ibb->batch_offset); > } > diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c > index 59c788e683..8695f1b7ac 100644 > --- a/lib/intel_batchbuffer.c > +++ b/lib/intel_batchbuffer.c > @@ -378,7 +378,7 @@ void igt_blitter_src_copy(int fd, > if ((src_tiling | dst_tiling) >= I915_TILING_Y) { > unsigned int mask; > > - batch[i++] = MI_LOAD_REGISTER_IMM; > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > batch[i++] = BCS_SWCTRL; > > mask = (BCS_SRC_Y | BCS_DST_Y) << 16; > @@ -407,12 +407,12 @@ void igt_blitter_src_copy(int fd, > > if ((src_tiling | dst_tiling) >= I915_TILING_Y) { > igt_assert(gen >= 6); > - batch[i++] = MI_FLUSH_DW | 2; > + batch[i++] = MI_FLUSH_DW_CMD | 2; > batch[i++] = 0; > batch[i++] = 0; > batch[i++] = 0; > > - batch[i++] = MI_LOAD_REGISTER_IMM; > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > batch[i++] = BCS_SWCTRL; > batch[i++] = (BCS_SRC_Y | BCS_DST_Y) << 16; > } > @@ -2413,7 +2413,7 @@ void intel_bb_emit_blt_copy(struct intel_bb *ibb, > } > > if ((src->tiling | dst->tiling) >= I915_TILING_Y) { > - intel_bb_out(ibb, MI_LOAD_REGISTER_IMM); > + intel_bb_out(ibb, MI_LOAD_REGISTER_IMM(1)); > intel_bb_out(ibb, BCS_SWCTRL); > > mask = (BCS_SRC_Y | BCS_DST_Y) << 16; > @@ -2450,12 +2450,12 @@ void intel_bb_emit_blt_copy(struct intel_bb *ibb, > > if ((src->tiling | dst->tiling) >= I915_TILING_Y) { > igt_assert(ibb->gen >= 6); > - intel_bb_out(ibb, MI_FLUSH_DW | 2); > + intel_bb_out(ibb, MI_FLUSH_DW_CMD | 2); > intel_bb_out(ibb, 0); > intel_bb_out(ibb, 0); > intel_bb_out(ibb, 0); > > - intel_bb_out(ibb, MI_LOAD_REGISTER_IMM); > + intel_bb_out(ibb, MI_LOAD_REGISTER_IMM(1)); > intel_bb_out(ibb, BCS_SWCTRL); > intel_bb_out(ibb, (BCS_SRC_Y | BCS_DST_Y) << 16); > } > diff --git a/lib/intel_bufops.c b/lib/intel_bufops.c > index 72c2189e05..cdc7a1698b 100644 > --- a/lib/intel_bufops.c > +++ b/lib/intel_bufops.c > @@ -83,6 +83,13 @@ > #define DEBUGFN() > #endif > > +#undef TILE_NONE > +#undef TILE_X > +#undef TILE_Y > +#undef TILE_Yf > +#undef TILE_Ys > +#undef TILE_4 > + Why those undef's are here ? > #define TILE_DEF(x) (1 << (x)) > #define TILE_NONE TILE_DEF(I915_TILING_NONE) > #define TILE_X TILE_DEF(I915_TILING_X) > diff --git a/lib/intel_reg.h b/lib/intel_reg.h > index 6f7559ad9f..3bf3676dc5 100644 > --- a/lib/intel_reg.h > +++ b/lib/intel_reg.h > @@ -44,6 +44,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > #ifndef _I810_REG_H > #define _I810_REG_H > > +#include "intel_gpu_commands.h" > +#include "intel_gpu_commands_staging.h" > + > /* I/O register offsets > */ > #define CRX_MDA 0x3B4 > @@ -2534,7 +2537,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > #define I855_CLOCK_166_250 (3 << 0) > > /* BLT commands */ > -#define COLOR_BLT_CMD ((2<<29)|(0x40<<22)|(0x3)) > #define COLOR_BLT_WRITE_ALPHA (1<<21) > #define COLOR_BLT_WRITE_RGB (1<<20) > > @@ -2545,15 +2547,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > > #define XY_SETUP_CLIP_BLT_CMD ((2<<29)|(3<<22)|1) > > -#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)) > #define XY_SRC_COPY_BLT_WRITE_ALPHA (1<<21) > #define XY_SRC_COPY_BLT_WRITE_RGB (1<<20) > -#define XY_SRC_COPY_BLT_SRC_TILED (1<<15) > -#define XY_SRC_COPY_BLT_DST_TILED (1<<11) > - > -#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)|0x4) > -#define SRC_COPY_BLT_WRITE_ALPHA (1<<21) > -#define SRC_COPY_BLT_WRITE_RGB (1<<20) > > #define XY_PAT_BLT_IMMEDIATE ((2<<29)|(0x72<<22)) > > @@ -2591,15 +2586,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > #define XY_FAST_COPY_COLOR_DEPTH_64 (4 << 24) > #define XY_FAST_COPY_COLOR_DEPTH_128 (5 << 24) > > -#define MI_STORE_DWORD_IMM ((0x20<<23)|2) > -#define MI_MEM_VIRTUAL (1 << 22) /* 965+ only */ > - > -#define MI_SET_CONTEXT (0x18<<23) > #define CTXT_NO_RESTORE (1) > #define CTXT_PALETTE_SAVE_DISABLE (1<<3) > #define CTXT_PALETTE_RESTORE_DISABLE (1<<2) > > -#define MI_SET_APPID (0x0E << 23) > #define APPID_CTXREST_INHIBIT (1 << 9) > #define APPID_CTXSAVE_INHIBIT (1 << 8) > #define APPTYPE(n) ((n) << 7) > @@ -2616,36 +2606,26 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > #define MI_VERTEX_BUFFER_DISABLE (1) > > /* Overlay Flip */ > -#define MI_OVERLAY_FLIP (0x11<<23) > #define MI_OVERLAY_FLIP_CONTINUE (0<<21) > #define MI_OVERLAY_FLIP_ON (1<<21) > #define MI_OVERLAY_FLIP_OFF (2<<21) > > /* Wait for Events */ > -#define MI_WAIT_FOR_EVENT (0x03<<23) > #define MI_WAIT_FOR_PIPEB_SVBLANK (1<<18) > #define MI_WAIT_FOR_PIPEA_SVBLANK (1<<17) > -#define MI_WAIT_FOR_OVERLAY_FLIP (1<<16) > #define MI_WAIT_FOR_PIPEB_VBLANK (1<<7) > #define MI_WAIT_FOR_PIPEA_VBLANK (1<<3) > #define MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW (1<<5) > #define MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW (1<<1) > > -#define MI_LOAD_SCAN_LINES_INCL (0x12<<23) > -#define MI_LOAD_REGISTER_IMM ((0x22 << 23) | 1) > -#define MI_LOAD_REGISTER_REG ((0x2A << 23) | 1) > -#define MI_LOAD_REGISTER_MEM (0x29 << 23) > #define MI_CS_MMIO_DST (1 << 19) > #define MI_CS_MMIO_SRC (1 << 18) > #define MI_MMIO_REMAP_ENABLE_GEN12 (1 << 17) > #define MI_WPARID_ENABLE_GEN12 (1 << 16) > -#define MI_STORE_REGISTER_MEM (0x24 << 23) > #define MI_STORE_PREDICATE_ENABLE_GEN12 (1 << 21) > > /* Flush */ > -#define MI_FLUSH (0x04<<23) > #define MI_WRITE_DIRTY_STATE (1<<4) > -#define MI_END_SCENE (1<<3) > #define MI_GLOBAL_SNAPSHOT_COUNT_RESET (1<<3) > #define MI_INHIBIT_RENDER_CACHE_FLUSH (1<<2) > #define MI_STATE_INSTRUCTION_CACHE_FLUSH (1<<1) > @@ -2654,27 +2634,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > #define BRW_MI_GLOBAL_SNAPSHOT_RESET (1 << 3) > > /* Noop */ > -#define MI_NOOP 0x00 > #define MI_NOOP_WRITE_ID (1<<22) > #define MI_NOOP_ID_MASK (1<<22 - 1) > > -/* ARB Check */ > -#define MI_ARB_CHECK (0x5 << 23) > - > #define STATE3D_COLOR_FACTOR ((0x3<<29)|(0x1d<<24)|(0x01<<16)) > > /* Atomics */ > -#define MI_ATOMIC ((0x2f << 23) | 1) > -#define MI_ATOMIC_INLINE_DATA (1 << 18) > #define MI_ATOMIC_INC (0x5 << 8) > #define MI_ATOMIC_ADD (0x7 << 8) > > /* Batch */ > -#define MI_BATCH_BUFFER ((0x30 << 23) | 1) > -#define MI_BATCH_BUFFER_START (0x31 << 23) > -#define MI_BATCH_BUFFER_START_GEN8 ((0x31 << 13) | 1) > -#define MI_BATCH_PREDICATE (1 << 15) /* HSW+ on RCS only*/ > -#define MI_BATCH_BUFFER_END (0xA << 23) > #define MI_COND_BATCH_BUFFER_END (0x36 << 23) > #define MAD_GT_IDD (0 << 12) > #define MAD_GT_OR_EQ_IDD (1 << 12) > @@ -2682,45 +2651,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > #define MAD_LT_OR_EQ_IDD (3 << 12) > #define MAD_EQ_IDD (4 << 12) > #define MAD_NEQ_IDD (5 << 12) > -#define MI_DO_COMPARE (1 << 21) > - > -#define MI_BATCH_NON_SECURE (1) > -#define MI_BATCH_NON_SECURE_I965 (1 << 8) > -#define MI_BATCH_NON_SECURE_HSW (1<<13) /* Additional bit for RCS */ > > /* Math */ > -#define MI_INSTR(opcode, flags) (((opcode) << 23) | (flags)) > -#define MI_MATH(x) MI_INSTR(0x1a, (x) - 1) > -#define MI_MATH_INSTR(opcode, op1, op2) ((opcode) << 20 | (op1) << 10 | (op2)) > -/* Opcodes for MI_MATH_INSTR */ > -#define MI_MATH_NOOP MI_MATH_INSTR(0x000, 0x0, 0x0) > -#define MI_MATH_LOAD(op1, op2) MI_MATH_INSTR(0x080, op1, op2) > -#define MI_MATH_LOADINV(op1, op2) MI_MATH_INSTR(0x480, op1, op2) > -#define MI_MATH_LOAD0(op1) MI_MATH_INSTR(0x081, op1) > -#define MI_MATH_LOAD1(op1) MI_MATH_INSTR(0x481, op1) > -#define MI_MATH_ADD MI_MATH_INSTR(0x100, 0x0, 0x0) > -#define MI_MATH_SUB MI_MATH_INSTR(0x101, 0x0, 0x0) > -#define MI_MATH_AND MI_MATH_INSTR(0x102, 0x0, 0x0) > -#define MI_MATH_OR MI_MATH_INSTR(0x103, 0x0, 0x0) > -#define MI_MATH_XOR MI_MATH_INSTR(0x104, 0x0, 0x0) > -#define MI_MATH_STORE(op1, op2) MI_MATH_INSTR(0x180, op1, op2) > -#define MI_MATH_STOREINV(op1, op2) MI_MATH_INSTR(0x580, op1, op2) > /* DG2+ */ > #define MI_MATH_SHL MI_MATH_INSTR(0x105, 0x0, 0x0) > #define MI_MATH_SHR MI_MATH_INSTR(0x106, 0x0, 0x0) > #define MI_MATH_SAR MI_MATH_INSTR(0x107, 0x0, 0x0) > > -/* Registers used as operands in MI_MATH_INSTR */ > -#define MI_MATH_REG(x) (x) > -#define MI_MATH_REG_SRCA 0x20 > -#define MI_MATH_REG_SRCB 0x21 > -#define MI_MATH_REG_ACCU 0x31 > -#define MI_MATH_REG_ZF 0x32 > -#define MI_MATH_REG_CF 0x33 > - > -/* DG2+ */ > -#define MI_SET_PREDICATE MI_INSTR(0x1, 0) > - > #define MAX_DISPLAY_PIPES 2 > > typedef enum { > diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h > index cf228c2651..e4d7c0d408 100644 > --- a/lib/ioctl_wrappers.h > +++ b/lib/ioctl_wrappers.h > @@ -173,9 +173,9 @@ static inline uint64_t to_user_pointer(const void *ptr) > * > * Casts a 64bit value from an ioctl into a pointer. > */ > -static inline void *from_user_pointer(uint64_t u64) > +static inline void *from_user_pointer(uint64_t u64p) ------------------------------------------------- ^ > { > - return (void *)(uintptr_t)u64; > + return (void *)(uintptr_t)u64p; --------------------------------- ^ imho we can safely drop this change now, maybe do it in separate code refactor as your patchset is already big. > } > > /** > diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c > index d74f1c9996..650d095020 100644 > --- a/lib/rendercopy_gen9.c > +++ b/lib/rendercopy_gen9.c > @@ -967,10 +967,7 @@ static void gen8_emit_primitive(struct intel_bb *ibb, uint32_t offset) > intel_bb_out(ibb, 0); /* index buffer offset, ignored */ > } > > -#define GFX_OP_PIPE_CONTROL ((3 << 29) | (3 << 27) | (2 << 24)) > -#define PIPE_CONTROL_CS_STALL (1 << 20) > #define PIPE_CONTROL_RENDER_TARGET_FLUSH (1 << 12) > -#define PIPE_CONTROL_FLUSH_ENABLE (1 << 7) > #define PIPE_CONTROL_DATA_CACHE_INVALIDATE (1 << 5) > #define PIPE_CONTROL_PROTECTEDPATH_DISABLE (1 << 27) > #define PIPE_CONTROL_PROTECTEDPATH_ENABLE (1 << 22) > @@ -986,7 +983,7 @@ static void gen12_emit_pxp_state(struct intel_bb *ibb, bool enable, > > if (enable) { > pipe_ctl_flags = PIPE_CONTROL_FLUSH_ENABLE; > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL); > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(2)); > intel_bb_out(ibb, pipe_ctl_flags); > > set_app_id = MI_SET_APPID | > @@ -1005,7 +1002,7 @@ static void gen12_emit_pxp_state(struct intel_bb *ibb, bool enable, > PIPE_CONTROL_RENDER_TARGET_FLUSH | > PIPE_CONTROL_DATA_CACHE_INVALIDATE | > PIPE_CONTROL_POST_SYNC_OP); > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | 4); > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(6)); > intel_bb_out(ibb, pipe_ctl_flags); > intel_bb_emit_reloc(ibb, ibb->handle, 0, I915_GEM_DOMAIN_COMMAND, > (enable ? pxp_write_op_offset : (pxp_write_op_offset+8)), > @@ -1107,7 +1104,7 @@ void _gen9_render_op(struct intel_bb *ibb, > > if (fast_clear) { > for (int i = 0; i < 4; i++) { > - intel_bb_out(ibb, MI_STORE_DWORD_IMM); > + intel_bb_out(ibb, MI_STORE_DWORD_IMM_GEN4); > intel_bb_emit_reloc(ibb, dst->handle, > I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, > dst->cc.offset + i*sizeof(float), > diff --git a/tests/i915/api_intel_bb.c b/tests/i915/api_intel_bb.c > index 7ccc00aa25..46633b0385 100644 > --- a/tests/i915/api_intel_bb.c > +++ b/tests/i915/api_intel_bb.c > @@ -1154,7 +1154,7 @@ static void delta_check(struct buf_ops *bops) > intel_bb_add_object(ibb, buf->handle, intel_buf_bo_size(buf), > buf->addr.offset, 0, false); > > - intel_bb_out(ibb, MI_STORE_DWORD_IMM); > + intel_bb_out(ibb, MI_STORE_DWORD_IMM_GEN4); > intel_bb_emit_reloc(ibb, buf->handle, > I915_GEM_DOMAIN_RENDER, > I915_GEM_DOMAIN_RENDER, > diff --git a/tests/i915/gem_blits.c b/tests/i915/gem_blits.c > index d9296cf2d1..9ea3925c38 100644 > --- a/tests/i915/gem_blits.c > +++ b/tests/i915/gem_blits.c > @@ -27,8 +27,6 @@ > #include "igt.h" > #include "igt_x86.h" > > -#define MI_FLUSH_DW (0x26 << 23) > - > #define BCS_SWCTRL 0x22200 > #define BCS_SRC_Y (1 << 0) > #define BCS_DST_Y (1 << 1) > @@ -198,7 +196,7 @@ static void buffer_set_tiling(const struct device *device, > if ((tiling | buffer->tiling) >= I915_TILING_Y) { > unsigned int mask; > > - batch[i++] = MI_LOAD_REGISTER_IMM; > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > batch[i++] = BCS_SWCTRL; > > mask = (BCS_SRC_Y | BCS_DST_Y) << 16; > @@ -248,12 +246,12 @@ static void buffer_set_tiling(const struct device *device, > > if ((tiling | buffer->tiling) >= I915_TILING_Y) { > igt_assert(device->gen >= 6); > - batch[i++] = MI_FLUSH_DW | 2; > + batch[i++] = MI_FLUSH_DW_CMD | 2; > batch[i++] = 0; > batch[i++] = 0; > batch[i++] = 0; > > - batch[i++] = MI_LOAD_REGISTER_IMM; > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > batch[i++] = BCS_SWCTRL; > batch[i++] = (BCS_SRC_Y | BCS_DST_Y) << 16; > } > @@ -345,7 +343,7 @@ static bool blit_to_linear(const struct device *device, > if (buffer->tiling >= I915_TILING_Y) { > unsigned int mask; > > - batch[i++] = MI_LOAD_REGISTER_IMM; > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > batch[i++] = BCS_SWCTRL; > > mask = (BCS_SRC_Y | BCS_DST_Y) << 16; > @@ -388,12 +386,12 @@ static bool blit_to_linear(const struct device *device, > > if (buffer->tiling >= I915_TILING_Y) { > igt_assert(device->gen >= 6); > - batch[i++] = MI_FLUSH_DW | 2; > + batch[i++] = MI_FLUSH_DW_CMD | 2; > batch[i++] = 0; > batch[i++] = 0; > batch[i++] = 0; > > - batch[i++] = MI_LOAD_REGISTER_IMM; > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > batch[i++] = BCS_SWCTRL; > batch[i++] = (BCS_SRC_Y | BCS_DST_Y) << 16; > } > @@ -678,7 +676,7 @@ blit(const struct device *device, > if ((src->tiling | dst->tiling) >= I915_TILING_Y) { > unsigned int mask; > > - batch[i++] = MI_LOAD_REGISTER_IMM; > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > batch[i++] = BCS_SWCTRL; > > mask = (BCS_SRC_Y | BCS_DST_Y) << 16; > @@ -729,12 +727,12 @@ blit(const struct device *device, > > if ((src->tiling | dst->tiling) >= I915_TILING_Y) { > igt_assert(device->gen >= 6); > - batch[i++] = MI_FLUSH_DW | 2; > + batch[i++] = MI_FLUSH_DW_CMD | 2; > batch[i++] = 0; > batch[i++] = 0; > batch[i++] = 0; > > - batch[i++] = MI_LOAD_REGISTER_IMM; > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > batch[i++] = BCS_SWCTRL; > batch[i++] = (BCS_SRC_Y | BCS_DST_Y) << 16; > } > diff --git a/tests/i915/gem_busy.c b/tests/i915/gem_busy.c > index f11fa877d3..08a500a9ec 100644 > --- a/tests/i915/gem_busy.c > +++ b/tests/i915/gem_busy.c > @@ -235,10 +235,10 @@ static void one(int fd, const intel_ctx_t *ctx, > > static void xchg_u32(void *array, unsigned i, unsigned j) > { > - uint32_t *u32 = array; > - uint32_t tmp = u32[i]; > - u32[i] = u32[j]; > - u32[j] = tmp; > + uint32_t *ui32 = array; > + uint32_t tmp = ui32[i]; > + ui32[i] = ui32[j]; > + ui32[j] = tmp; imho this is also change which can be done in code cleanup, not in your patchset. > } > > static void close_race(int fd, const intel_ctx_t *ctx) > diff --git a/tests/i915/gem_ccs.c b/tests/i915/gem_ccs.c > index b7e8bda71b..44e35ee9b0 100644 > --- a/tests/i915/gem_ccs.c > +++ b/tests/i915/gem_ccs.c > @@ -137,7 +137,7 @@ static void surf_copy(int i915, > surf.i915 = i915; > surf.print_bb = param.print_bb; > set_surf_object(&surf.src, mid->handle, mid->region, mid->size, > - uc_mocs, INDIRECT_ACCESS); > + uc_mocs, BLT_INDIRECT_ACCESS); > set_surf_object(&surf.dst, ccs, REGION_SMEM, ccssize, > uc_mocs, DIRECT_ACCESS); > bb_size = 4096; > diff --git a/tests/i915/gem_ctx_shared.c b/tests/i915/gem_ctx_shared.c > index 18d8cc013d..3d73db581c 100644 > --- a/tests/i915/gem_ctx_shared.c > +++ b/tests/i915/gem_ctx_shared.c > @@ -309,7 +309,7 @@ static void exec_shared_gtt(int i915, const intel_ctx_cfg_t *cfg, > batch = gem_create(i915, 4096); > > i = 0; > - cs[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + cs[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > cs[++i] = obj.offset; > cs[++i] = obj.offset >> 32; > @@ -564,7 +564,7 @@ static void store_dword(int i915, uint64_t ahnd, const intel_ctx_t *ctx, > obj[2].relocation_count = !ahnd ? 1 : 0; > > i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = reloc.presumed_offset + reloc.delta; > batch[++i] = 0; > diff --git a/tests/i915/gem_exec_async.c b/tests/i915/gem_exec_async.c > index d50fe45ec5..173bc4648a 100644 > --- a/tests/i915/gem_exec_async.c > +++ b/tests/i915/gem_exec_async.c > @@ -73,7 +73,7 @@ static void store_dword(int fd, int id, const intel_ctx_t *ctx, > obj[1].relocation_count = !id ? 1 : 0; > > i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = target_offset + offset; > batch[++i] = (target_offset + offset) >> 32; > diff --git a/tests/i915/gem_exec_balancer.c b/tests/i915/gem_exec_balancer.c > index d7acdca190..1c655e583c 100644 > --- a/tests/i915/gem_exec_balancer.c > +++ b/tests/i915/gem_exec_balancer.c > @@ -41,15 +41,6 @@ > > IGT_TEST_DESCRIPTION("Exercise in-kernel load-balancing"); > > -#define MI_SEMAPHORE_WAIT (0x1c << 23) > -#define MI_SEMAPHORE_POLL (1 << 15) > -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > - > #define INSTANCE_COUNT (1 << I915_PMU_SAMPLE_INSTANCE_BITS) > > static size_t sizeof_load_balance(int count) > @@ -589,7 +580,7 @@ static uint32_t create_semaphore_to_spinner(int i915, igt_spin_t *spin) > > /* Wait until the spinner is running */ > addr = spin->obj[0].offset + 4 * SPIN_POLL_START_IDX; > - *cs++ = MI_SEMAPHORE_WAIT | > + *cs++ = MI_SEMAPHORE_WAIT_CMD | > MI_SEMAPHORE_POLL | > MI_SEMAPHORE_SAD_NEQ_SDD | > (4 - 2); > @@ -600,7 +591,7 @@ static uint32_t create_semaphore_to_spinner(int i915, igt_spin_t *spin) > /* Then cancel the spinner */ > addr = spin->obj[IGT_SPIN_BATCH].offset + > offset_in_page(spin->condition); > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > *cs++ = addr; > *cs++ = addr >> 32; > *cs++ = MI_BATCH_BUFFER_END; > @@ -1116,7 +1107,7 @@ static uint32_t sync_from(int i915, uint32_t addr, uint32_t target) > cs = map = gem_mmap__device_coherent(i915, handle, 0, 4096, PROT_WRITE); > > /* cancel target spinner */ > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > *cs++ = target + 64; > *cs++ = 0; > *cs++ = 0; > @@ -1131,7 +1122,7 @@ static uint32_t sync_from(int i915, uint32_t addr, uint32_t target) > *cs++ = 0; > > /* self-heal */ > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > *cs++ = addr + 64; > *cs++ = 0; > *cs++ = MI_BATCH_BUFFER_START | 1 << 8 | 1; > @@ -1162,13 +1153,13 @@ static uint32_t sync_to(int i915, uint32_t addr, uint32_t target) > *cs++ = MI_NOOP; > > /* cancel their spin as a compliment */ > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > *cs++ = target + 64; > *cs++ = 0; > *cs++ = 0; > > /* self-heal */ > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > *cs++ = addr + 64; > *cs++ = 0; > *cs++ = MI_BATCH_BUFFER_START | 1 << 8 | 1; > @@ -1906,7 +1897,7 @@ static uint32_t sema_create(int i915, uint64_t addr, uint32_t **x) > for (int n = 1; n <= 32; n++) { > uint32_t *cs = *x + n * 16; > > - *cs++ = MI_SEMAPHORE_WAIT | > + *cs++ = MI_SEMAPHORE_WAIT_CMD | > MI_SEMAPHORE_POLL | > MI_SEMAPHORE_SAD_GTE_SDD | > (4 - 2); > diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c > index 2db58266fd..d0499a8312 100644 > --- a/tests/i915/gem_exec_capture.c > +++ b/tests/i915/gem_exec_capture.c > @@ -308,7 +308,7 @@ static void __capture1(int fd, int dir, uint64_t ahnd, const intel_ctx_t *ctx, > I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); > > i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = obj[SCRATCH].offset; > batch[++i] = obj[SCRATCH].offset >> 32; > @@ -498,7 +498,7 @@ __captureN(int fd, int dir, uint64_t ahnd, const intel_ctx_t *ctx, > I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); > > i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = obj[0].offset; > batch[++i] = obj[0].offset >> 32; > diff --git a/tests/i915/gem_exec_endless.c b/tests/i915/gem_exec_endless.c > index 2c56cc2120..77719de83b 100644 > --- a/tests/i915/gem_exec_endless.c > +++ b/tests/i915/gem_exec_endless.c > @@ -33,15 +33,6 @@ > > #define MAX_ENGINES 64 > > -#define MI_SEMAPHORE_WAIT (0x1c << 23) > -#define MI_SEMAPHORE_POLL (1 << 15) > -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > - > static uint32_t batch_create(int i915) > { > const uint32_t bbe = MI_BATCH_BUFFER_END; > @@ -133,7 +124,7 @@ static void __supervisor_run(struct supervisor *sv) > > sv->semaphore = cs + 1000; > > - *cs++ = MI_SEMAPHORE_WAIT | > + *cs++ = MI_SEMAPHORE_WAIT_CMD | > MI_SEMAPHORE_POLL | > MI_SEMAPHORE_SAD_EQ_SDD | > (4 - 2); > @@ -142,7 +133,7 @@ static void __supervisor_run(struct supervisor *sv) > *cs++ = 0; > > sv->terminate = cs; > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > *cs++ = offset_in_page(sv->semaphore); > *cs++ = 0; > *cs++ = 0; > diff --git a/tests/i915/gem_exec_fair.c b/tests/i915/gem_exec_fair.c > index 93a138ba47..8208ab404e 100644 > --- a/tests/i915/gem_exec_fair.c > +++ b/tests/i915/gem_exec_fair.c > @@ -131,7 +131,7 @@ static void delay(int i915, > > cs = map = gem_mmap__device_coherent(i915, handle, 0, 4096, PROT_WRITE); > > - *cs++ = MI_LOAD_REGISTER_IMM; > + *cs++ = MI_LOAD_REGISTER_IMM(1); > *cs++ = CS_GPR(START_TS) + 4; > *cs++ = 0; > *cs++ = MI_LOAD_REGISTER_REG; > @@ -144,7 +144,7 @@ static void delay(int i915, > > *cs++ = 0x5 << 23; /* MI_ARB_CHECK */ > > - *cs++ = MI_LOAD_REGISTER_IMM; > + *cs++ = MI_LOAD_REGISTER_IMM(1); > *cs++ = CS_GPR(NOW_TS) + 4; > *cs++ = 0; > *cs++ = MI_LOAD_REGISTER_REG; > @@ -166,7 +166,7 @@ static void delay(int i915, > > /* Delay between SRM and COND_BBE to post the writes */ > for (int n = 0; n < 8; n++) { > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > if (use_64b) { > *cs++ = addr + 4064; > *cs++ = addr >> 32; > @@ -244,25 +244,25 @@ static void tslog(int i915, > *cs++ = addr >> 32; > > /* Load the address + inc & mask variables */ > - *cs++ = MI_LOAD_REGISTER_IMM; > + *cs++ = MI_LOAD_REGISTER_IMM(1); > *cs++ = CS_GPR(ADDR); > addr_lo = cs; > *cs++ = addr; > - *cs++ = MI_LOAD_REGISTER_IMM; > + *cs++ = MI_LOAD_REGISTER_IMM(1); > *cs++ = CS_GPR(ADDR) + 4; > *cs++ = addr >> 32; > > - *cs++ = MI_LOAD_REGISTER_IMM; > + *cs++ = MI_LOAD_REGISTER_IMM(1); > *cs++ = CS_GPR(INC); > *cs++ = 4; > - *cs++ = MI_LOAD_REGISTER_IMM; > + *cs++ = MI_LOAD_REGISTER_IMM(1); > *cs++ = CS_GPR(INC) + 4; > *cs++ = 0; > > - *cs++ = MI_LOAD_REGISTER_IMM; > + *cs++ = MI_LOAD_REGISTER_IMM(1); > *cs++ = CS_GPR(MASK); > *cs++ = 0xfffff7ff; > - *cs++ = MI_LOAD_REGISTER_IMM; > + *cs++ = MI_LOAD_REGISTER_IMM(1); > *cs++ = CS_GPR(MASK) + 4; > *cs++ = 0xffffffff; > > diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c > index 6bf1cdb577..c2d874f84b 100644 > --- a/tests/i915/gem_exec_fence.c > +++ b/tests/i915/gem_exec_fence.c > @@ -50,15 +50,6 @@ struct sync_merge_data { > #define SYNC_IOC_MERGE _IOWR(SYNC_IOC_MAGIC, 3, struct sync_merge_data) > #endif > > -#define MI_SEMAPHORE_WAIT (0x1c << 23) > -#define MI_SEMAPHORE_POLL (1 << 15) > -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > - > static bool fence_busy(int fence) > { > return poll(&(struct pollfd){fence, POLLIN}, 1, 0) == 0; > @@ -345,7 +336,7 @@ static uint32_t timeslicing_batches(int i915, uint32_t *offset) > for (int step = 0; step < 8; step++) { > if (pair) { > cs[i++] = > - MI_SEMAPHORE_WAIT | > + MI_SEMAPHORE_WAIT_CMD | > MI_SEMAPHORE_POLL | > MI_SEMAPHORE_SAD_EQ_SDD | > (4 - 2); > @@ -354,14 +345,14 @@ static uint32_t timeslicing_batches(int i915, uint32_t *offset) > cs[i++] = 0; > } > > - cs[i++] = MI_STORE_DWORD_IMM; > + cs[i++] = MI_STORE_DWORD_IMM_GEN4; > cs[i++] = *offset; > cs[i++] = 0; > cs[i++] = x++; > > if (!pair) { > cs[i++] = > - MI_SEMAPHORE_WAIT | > + MI_SEMAPHORE_WAIT_CMD | > MI_SEMAPHORE_POLL | > MI_SEMAPHORE_SAD_EQ_SDD | > (4 - 2); > @@ -452,7 +443,7 @@ static uint32_t submitN_batches(int i915, uint32_t offset, int count) > > for (int step = 0; step < 8; step++) { > cs[i++] = > - MI_SEMAPHORE_WAIT | > + MI_SEMAPHORE_WAIT_CMD | > MI_SEMAPHORE_POLL | > MI_SEMAPHORE_SAD_EQ_SDD | > (4 - 2); > @@ -460,7 +451,7 @@ static uint32_t submitN_batches(int i915, uint32_t offset, int count) > cs[i++] = offset; > cs[i++] = 0; > > - cs[i++] = MI_STORE_DWORD_IMM; > + cs[i++] = MI_STORE_DWORD_IMM_GEN4; > cs[i++] = offset; > cs[i++] = 0; > cs[i++] = x + 1; > @@ -606,7 +597,7 @@ static void test_parallel(int i915, const intel_ctx_t *ctx, > } > > i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = scratch_offset + reloc.delta; > batch[++i] = scratch_offset >> 32; > @@ -726,7 +717,7 @@ static void test_concurrent(int i915, const intel_ctx_t *ctx, > close(fence); > > i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = target_offset + reloc.delta; > batch[++i] = target_offset >> 32; > @@ -2464,21 +2455,21 @@ build_wait_bb(int i915, > map = gem_mmap__device_coherent(i915, obj.handle, 0, 4096, PROT_WRITE); > bb = map; > > - *bb++ = MI_LOAD_REGISTER_IMM; > + *bb++ = MI_LOAD_REGISTER_IMM(1); > *bb++ = mmio_base + HSW_CS_GPR(0); > *bb++ = wait_value & 0xffffffff; > - *bb++ = MI_LOAD_REGISTER_IMM; > + *bb++ = MI_LOAD_REGISTER_IMM(1); > *bb++ = mmio_base + HSW_CS_GPR(0) + 4; > *bb++ = wait_value >> 32; > > *bb++ = MI_LOAD_REGISTER_REG; > *bb++ = mmio_base + RING_TIMESTAMP; > *bb++ = mmio_base + HSW_CS_GPR(1); > - *bb++ = MI_LOAD_REGISTER_IMM; > + *bb++ = MI_LOAD_REGISTER_IMM(1); > *bb++ = mmio_base + HSW_CS_GPR(1) + 4; > *bb++ = 0; > > - *bb++ = MI_LOAD_REGISTER_IMM; > + *bb++ = MI_LOAD_REGISTER_IMM(1); > *bb++ = mmio_base + HSW_CS_GPR(2) + 4; > *bb++ = 0; > relocs->delta = offset_in_page(bb); > @@ -2563,23 +2554,23 @@ static void build_increment_engine_bb(struct inter_engine_batches *batch, > { > uint32_t *bb = batch->increment_bb = calloc(1, 4096); > > - *bb++ = MI_LOAD_REGISTER_MEM | 2; > + *bb++ = MI_LOAD_REGISTER_MEM_CMD | 2; > *bb++ = mmio_base + HSW_CS_GPR(0); > batch->read0_ptrs[0] = bb; > *bb++ = 0; > *bb++ = 0; > - *bb++ = MI_LOAD_REGISTER_MEM | 2; > + *bb++ = MI_LOAD_REGISTER_MEM_CMD | 2; > *bb++ = mmio_base + HSW_CS_GPR(0) + 4; > batch->read0_ptrs[1] = bb; > *bb++ = 0; > *bb++ = 0; > > - *bb++ = MI_LOAD_REGISTER_MEM | 2; > + *bb++ = MI_LOAD_REGISTER_MEM_CMD | 2; > *bb++ = mmio_base + HSW_CS_GPR(1); > batch->read1_ptrs[0] = bb; > *bb++ = 0; > *bb++ = 0; > - *bb++ = MI_LOAD_REGISTER_MEM | 2; > + *bb++ = MI_LOAD_REGISTER_MEM_CMD | 2; > *bb++ = mmio_base + HSW_CS_GPR(1) + 4; > batch->read1_ptrs[1] = bb; > *bb++ = 0; > @@ -2591,12 +2582,12 @@ static void build_increment_engine_bb(struct inter_engine_batches *batch, > *bb++ = MI_MATH_ADD; > *bb++ = MI_MATH_STORE(MI_MATH_REG(0), MI_MATH_REG_ACCU); > > - *bb++ = MI_STORE_REGISTER_MEM | 2; > + *bb++ = MI_STORE_REGISTER_MEM_GEN8; > *bb++ = mmio_base + HSW_CS_GPR(0); > batch->write_ptrs[0] = bb; > *bb++ = 0; > *bb++ = 0; > - *bb++ = MI_STORE_REGISTER_MEM | 2; > + *bb++ = MI_STORE_REGISTER_MEM_GEN8; > *bb++ = mmio_base + HSW_CS_GPR(0) + 4; > batch->write_ptrs[1] = bb; > *bb++ = 0; > diff --git a/tests/i915/gem_exec_flush.c b/tests/i915/gem_exec_flush.c > index 40c58db2bb..bb120e0d6c 100644 > --- a/tests/i915/gem_exec_flush.c > +++ b/tests/i915/gem_exec_flush.c > @@ -208,7 +208,7 @@ static void run(int fd, unsigned ring, int nchild, int timeout, > reloc0[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > offset = obj[0].offset + reloc0[i].delta; > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > *b++ = offset; > *b++ = offset >> 32; > @@ -242,7 +242,7 @@ static void run(int fd, unsigned ring, int nchild, int timeout, > reloc1[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > offset = obj[0].offset + reloc1[i].delta; > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > *b++ = offset; > *b++ = offset >> 32; > @@ -496,7 +496,7 @@ static void batch(int fd, unsigned ring, int nchild, int timeout, > reloc.delta = i * sizeof(uint32_t); > > offset = reloc.presumed_offset + reloc.delta; > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > *b++ = offset; > *b++ = offset >> 32; > diff --git a/tests/i915/gem_exec_gttfill.c b/tests/i915/gem_exec_gttfill.c > index 137277fe53..d6c8f21920 100644 > --- a/tests/i915/gem_exec_gttfill.c > +++ b/tests/i915/gem_exec_gttfill.c > @@ -70,7 +70,7 @@ static void submit(int fd, uint64_t ahnd, unsigned int gen, > reloc[1].read_domains = I915_GEM_DOMAIN_INSTRUCTION; > > n = 0; > - batch[n] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[n] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[n] |= 1 << 21; > batch[n]++; > diff --git a/tests/i915/gem_exec_nop.c b/tests/i915/gem_exec_nop.c > index f35cc8401f..497f57f082 100644 > --- a/tests/i915/gem_exec_nop.c > +++ b/tests/i915/gem_exec_nop.c > @@ -144,7 +144,7 @@ static void poll_ring(int fd, const intel_ctx_t *ctx, > r->delta = 4092; > r->read_domains = I915_GEM_DOMAIN_RENDER; > > - *b = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + *b = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > *++b = r->delta; > *++b = 0; > @@ -272,7 +272,7 @@ static void poll_sequential(int fd, const intel_ctx_t *ctx, > r->read_domains = I915_GEM_DOMAIN_RENDER; > r->write_domain = I915_GEM_DOMAIN_RENDER; > > - *b = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + *b = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > *++b = r->delta; > *++b = 0; > diff --git a/tests/i915/gem_exec_parallel.c b/tests/i915/gem_exec_parallel.c > index 429620884b..705b22cb9f 100644 > --- a/tests/i915/gem_exec_parallel.c > +++ b/tests/i915/gem_exec_parallel.c > @@ -92,7 +92,7 @@ static void *thread(void *data) > } > > i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (t->gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (t->gen < 6 ? 1 << 22 : 0); > if (t->gen >= 8) { > batch[++i] = 4*t->id; > batch[++i] = 0; > diff --git a/tests/i915/gem_exec_params.c b/tests/i915/gem_exec_params.c > index fd86afa16d..d0805d330f 100644 > --- a/tests/i915/gem_exec_params.c > +++ b/tests/i915/gem_exec_params.c > @@ -120,7 +120,7 @@ static void test_batch_first(int fd) > map = gem_mmap__cpu(fd, obj[0].handle, 0, 4096, PROT_WRITE); > gem_set_domain(fd, obj[0].handle, > I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); > - map[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + map[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > map[++i] = obj[1].offset; > map[++i] = obj[1].offset >> 32; > @@ -152,7 +152,7 @@ static void test_batch_first(int fd) > map = gem_mmap__cpu(fd, obj[2].handle, 0, 4096, PROT_WRITE); > gem_set_domain(fd, obj[2].handle, > I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); > - map[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + map[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > map[++i] = obj[1].offset; > map[++i] = obj[1].offset >> 32; > diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c > index 7a354a32a1..3ce89ca649 100644 > --- a/tests/i915/gem_exec_reloc.c > +++ b/tests/i915/gem_exec_reloc.c > @@ -79,7 +79,7 @@ static void write_dword(int fd, > obj[1].handle = gem_create(fd, 4096); > > i = 0; > - buf[i++] = MI_STORE_DWORD_IMM | (gen < 6 ? 1<<22 : 0); > + buf[i++] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1<<22 : 0); > if (gen >= 8) { > buf[i++] = target_offset; > buf[i++] = target_offset >> 32; > @@ -314,7 +314,7 @@ static void active(int fd, const intel_ctx_t *ctx, unsigned engine) > for (pass = 0; pass < 1024; pass++) { > uint32_t batch[16]; > int i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = 0; > batch[++i] = 0; > @@ -526,17 +526,6 @@ static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags) > gem_close(fd, obj.handle); > } > > -static inline uint64_t sign_extend(uint64_t x, int index) > -{ > - int shift = 63 - index; > - return (int64_t)(x << shift) >> shift; > -} > - > -static uint64_t gen8_canonical_address(uint64_t address) > -{ > - return sign_extend(address, 47); > -} > - > static void basic_range(int fd, unsigned flags) > { > struct drm_i915_gem_relocation_entry reloc[128]; > @@ -563,7 +552,7 @@ static void basic_range(int fd, unsigned flags) > for (int i = 0; i <= count; i++) { > obj[n].handle = gem_create(fd, 4096); > obj[n].offset = (1ull << (i + 12)) - 4096; > - obj[n].offset = gen8_canonical_address(obj[n].offset); > + obj[n].offset = gen8_canonical_addr(obj[n].offset); > obj[n].flags = EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS; > gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe)); > execbuf.buffers_ptr = to_user_pointer(&obj[n]); > @@ -583,7 +572,7 @@ static void basic_range(int fd, unsigned flags) > for (int i = 1; i < count; i++) { > obj[n].handle = gem_create(fd, 4096); > obj[n].offset = 1ull << (i + 12); > - obj[n].offset = gen8_canonical_address(obj[n].offset); > + obj[n].offset = gen8_canonical_addr(obj[n].offset); > obj[n].flags = EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS; > gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe)); > execbuf.buffers_ptr = to_user_pointer(&obj[n]); > @@ -714,10 +703,10 @@ static int flags_to_index(const struct intel_execution_engine2 *e) > > static void xchg_u32(void *array, unsigned i, unsigned j) > { > - uint32_t *u32 = array; > - uint32_t tmp = u32[i]; > - u32[i] = u32[j]; > - u32[j] = tmp; > + uint32_t *ui32 = array; > + uint32_t tmp = ui32[i]; > + ui32[i] = ui32[j]; > + ui32[j] = tmp; Drop this change to separate code cleanup/refactor. > } > > static void concurrent_child(int i915, const intel_ctx_t *ctx, > @@ -790,7 +779,7 @@ static uint32_t create_concurrent_batch(int i915, unsigned int count) > uint32_t *map, *cs; > uint32_t cmd; > > - cmd = MI_STORE_DWORD_IMM; > + cmd = MI_STORE_DWORD_IMM_GEN4; > if (gen < 6) > cmd |= 1 << 22; > if (gen < 4) > diff --git a/tests/i915/gem_exec_schedule.c b/tests/i915/gem_exec_schedule.c > index 58b118c79e..ab1dd7749b 100644 > --- a/tests/i915/gem_exec_schedule.c > +++ b/tests/i915/gem_exec_schedule.c > @@ -55,15 +55,6 @@ > #define MAX_CONTEXTS 1024 > #define MAX_ELSP_QLEN 16 > > -#define MI_SEMAPHORE_WAIT (0x1c << 23) > -#define MI_SEMAPHORE_POLL (1 << 15) > -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > - > IGT_TEST_DESCRIPTION("Check that we can control the order of execution"); > > static unsigned int offset_in_page(void *addr) > @@ -148,7 +139,7 @@ static uint32_t __store_dword(int fd, uint64_t ahnd, const intel_ctx_t *ctx, > obj[2].relocation_count = !ahnd ? 1 : 0; > > i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = reloc.presumed_offset + reloc.delta; > batch[++i] = (reloc.presumed_offset + reloc.delta) >> 32; > @@ -521,7 +512,7 @@ static uint32_t timeslicing_batches(int i915, uint32_t *offset) > for (int step = 0; step < 8; step++) { > if (pair) { > cs[i++] = > - MI_SEMAPHORE_WAIT | > + MI_SEMAPHORE_WAIT_CMD | > MI_SEMAPHORE_POLL | > MI_SEMAPHORE_SAD_EQ_SDD | > (4 - 2); > @@ -530,14 +521,14 @@ static uint32_t timeslicing_batches(int i915, uint32_t *offset) > cs[i++] = 0; > } > > - cs[i++] = MI_STORE_DWORD_IMM; > + cs[i++] = MI_STORE_DWORD_IMM_GEN4; > cs[i++] = *offset; > cs[i++] = 0; > cs[i++] = x++; > > if (!pair) { > cs[i++] = > - MI_SEMAPHORE_WAIT | > + MI_SEMAPHORE_WAIT_CMD | > MI_SEMAPHORE_POLL | > MI_SEMAPHORE_SAD_EQ_SDD | > (4 - 2); > @@ -629,7 +620,7 @@ static uint32_t timesliceN_batches(int i915, uint32_t offset, int count) > > for (int step = 0; step < 8; step++) { > cs[i++] = > - MI_SEMAPHORE_WAIT | > + MI_SEMAPHORE_WAIT_CMD | > MI_SEMAPHORE_POLL | > MI_SEMAPHORE_SAD_EQ_SDD | > (4 - 2); > @@ -637,7 +628,7 @@ static uint32_t timesliceN_batches(int i915, uint32_t offset, int count) > cs[i++] = offset; > cs[i++] = 0; > > - cs[i++] = MI_STORE_DWORD_IMM; > + cs[i++] = MI_STORE_DWORD_IMM_GEN4; > cs[i++] = offset; > cs[i++] = 0; > cs[i++] = x + 1; > @@ -797,7 +788,7 @@ static void cancel_spinner(int i915, > map = gem_mmap__device_coherent(i915, obj.handle, 0, 4096, PROT_WRITE); > cs = map; > > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > *cs++ = spin->obj[IGT_SPIN_BATCH].offset + > offset_in_page(spin->condition); > *cs++ = spin->obj[IGT_SPIN_BATCH].offset >> 32; > @@ -1108,13 +1099,13 @@ static void semaphore_resolve(int i915, const intel_ctx_cfg_t *cfg, > cs = map = gem_mmap__cpu(i915, handle, 0, 4096, PROT_WRITE); > > /* Set semaphore initially to 1 for polling and signaling */ > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > *cs++ = SEMAPHORE_ADDR; > *cs++ = 0; > *cs++ = 1; > > /* Wait until another batch writes to our semaphore */ > - *cs++ = MI_SEMAPHORE_WAIT | > + *cs++ = MI_SEMAPHORE_WAIT_CMD | > MI_SEMAPHORE_POLL | > MI_SEMAPHORE_SAD_EQ_SDD | > (4 - 2); > @@ -1123,7 +1114,7 @@ static void semaphore_resolve(int i915, const intel_ctx_cfg_t *cfg, > *cs++ = 0; > > /* Then cancel the spinner */ > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > *cs++ = spin->obj[IGT_SPIN_BATCH].offset + > offset_in_page(spin->condition); > *cs++ = 0; > @@ -1161,7 +1152,7 @@ static void semaphore_resolve(int i915, const intel_ctx_cfg_t *cfg, > /* Now the semaphore is spinning, cancel it */ > cancel = gem_create(i915, 4096); > cs = map = gem_mmap__cpu(i915, cancel, 0, 4096, PROT_WRITE); > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > *cs++ = SEMAPHORE_ADDR; > *cs++ = 0; > *cs++ = 0; > @@ -1203,7 +1194,7 @@ static void semaphore_noskip(int i915, const intel_ctx_cfg_t *cfg, > const intel_ctx_t *ctx0, *ctx1; > uint64_t ahnd; > > - igt_require(gen >= 6); /* MI_STORE_DWORD_IMM convenience */ > + igt_require(gen >= 6); /* MI_STORE_DWORD_IMM_GEN4 convenience */ > > ctx0 = intel_ctx_create(i915, cfg); > ctx1 = intel_ctx_create(i915, cfg); > @@ -1233,7 +1224,7 @@ static void semaphore_noskip(int i915, const intel_ctx_cfg_t *cfg, > cs = map = gem_mmap__cpu(i915, handle, 0, 4096, PROT_WRITE); > > /* Cancel the following spinner */ > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > if (gen >= 8) { > *cs++ = spin->obj[IGT_SPIN_BATCH].offset + > offset_in_page(spin->condition); > @@ -1359,14 +1350,14 @@ noreorder(int i915, const intel_ctx_cfg_t *cfg, > addr = spin->obj[IGT_SPIN_BATCH].offset + > offset_in_page(spin->condition); > if (gen >= 8) { > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > *cs++ = addr; > addr >>= 32; > } else if (gen >= 4) { > - *cs++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + *cs++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > *cs++ = 0; > } else { > - *cs++ = (MI_STORE_DWORD_IMM | 1 << 22) - 1; > + *cs++ = (MI_STORE_DWORD_IMM_GEN4 | 1 << 22) - 1; > } > *cs++ = addr; > *cs++ = MI_BATCH_BUFFER_END; > @@ -2294,7 +2285,7 @@ static void reorder_wide(int fd, const intel_ctx_cfg_t *cfg, unsigned ring) > addr = reloc.presumed_offset + reloc.delta; > > i = execbuf.batch_start_offset / sizeof(uint32_t); > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = addr; > batch[++i] = addr >> 32; > diff --git a/tests/i915/gem_exec_store.c b/tests/i915/gem_exec_store.c > index efb9907ebb..7d23bcd5b4 100644 > --- a/tests/i915/gem_exec_store.c > +++ b/tests/i915/gem_exec_store.c > @@ -94,7 +94,7 @@ static void store_dword(int fd, const intel_ctx_t *ctx, > } > > i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = obj[0].offset; > batch[++i] = obj[0].offset >> 32; > @@ -180,7 +180,7 @@ static void store_cachelines(int fd, const intel_ctx_t *ctx, > reloc[n].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > dst_offset = CANONICAL(reloc[n].presumed_offset + reloc[n].delta); > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = dst_offset; > batch[++i] = dst_offset >> 32; > @@ -283,7 +283,7 @@ static void store_all(int fd, const intel_ctx_t *ctx) > > offset = sizeof(uint32_t); > i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[address = ++i] = 0; > batch[++i] = 0; > diff --git a/tests/i915/gem_exec_suspend.c b/tests/i915/gem_exec_suspend.c > index 3b59966a11..1dadf06df0 100644 > --- a/tests/i915/gem_exec_suspend.c > +++ b/tests/i915/gem_exec_suspend.c > @@ -159,7 +159,7 @@ static void run_test(int fd, const intel_ctx_t *ctx, > } > > b = 0; > - buf[b] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + buf[b] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > buf[++b] = offset; > buf[++b] = offset >> 32; > diff --git a/tests/i915/gem_exec_whisper.c b/tests/i915/gem_exec_whisper.c > index 616231aa96..29d96cdcaa 100644 > --- a/tests/i915/gem_exec_whisper.c > +++ b/tests/i915/gem_exec_whisper.c > @@ -312,7 +312,7 @@ static void whisper(int fd, const intel_ctx_t *ctx, > } > > i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = store.offset + loc; > batch[++i] = (store.offset + loc) >> 32; > diff --git a/tests/i915/gem_pipe_control_store_loop.c b/tests/i915/gem_pipe_control_store_loop.c > index df3da9f5b2..59959a3742 100644 > --- a/tests/i915/gem_pipe_control_store_loop.c > +++ b/tests/i915/gem_pipe_control_store_loop.c > @@ -48,7 +48,6 @@ IGT_TEST_DESCRIPTION("Test (TLB-)Coherency of pipe_control QW writes."); > > static struct buf_ops *bops; > > -#define GFX_OP_PIPE_CONTROL ((0x3<<29)|(0x3<<27)|(0x2<<24)|2) > #define PIPE_CONTROL_WRITE_IMMEDIATE (1<<14) > #define PIPE_CONTROL_WRITE_TIMESTAMP (3<<14) > #define PIPE_CONTROL_DEPTH_STALL (1<<13) > @@ -96,7 +95,7 @@ store_pipe_control_loop(bool preuse_buffer, int timeout) > * support code will do that for us. */ > if (ibb->gen >= 8) { > intel_bb_add_intel_buf(ibb, target_buf, true); > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL + 1); > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(5)); > intel_bb_out(ibb, PIPE_CONTROL_WRITE_IMMEDIATE); > intel_bb_emit_reloc_fenced(ibb, target_buf->handle, > I915_GEM_DOMAIN_INSTRUCTION, > @@ -108,13 +107,13 @@ store_pipe_control_loop(bool preuse_buffer, int timeout) > /* work-around hw issue, see intel_emit_post_sync_nonzero_flush > * in mesa sources. */ > intel_bb_add_intel_buf(ibb, target_buf, true); > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL); > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(4)); > intel_bb_out(ibb, PIPE_CONTROL_CS_STALL | > PIPE_CONTROL_STALL_AT_SCOREBOARD); > intel_bb_out(ibb, 0); /* address */ > intel_bb_out(ibb, 0); /* write data */ > > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL); > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(4)); > intel_bb_out(ibb, PIPE_CONTROL_WRITE_IMMEDIATE); > intel_bb_emit_reloc(ibb, target_buf->handle, > I915_GEM_DOMAIN_INSTRUCTION, > @@ -124,10 +123,10 @@ store_pipe_control_loop(bool preuse_buffer, int timeout) > intel_bb_out(ibb, val); /* write data */ > } else if (ibb->gen >= 4) { > intel_bb_add_intel_buf(ibb, target_buf, true); > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(4) | > PIPE_CONTROL_WC_FLUSH | > PIPE_CONTROL_TC_FLUSH | > - PIPE_CONTROL_WRITE_IMMEDIATE | 2); > + PIPE_CONTROL_WRITE_IMMEDIATE); > intel_bb_emit_reloc(ibb, target_buf->handle, > I915_GEM_DOMAIN_INSTRUCTION, > I915_GEM_DOMAIN_INSTRUCTION, > diff --git a/tests/i915/gem_pxp.c b/tests/i915/gem_pxp.c > index 0c4224483f..af657d0e1b 100644 > --- a/tests/i915/gem_pxp.c > +++ b/tests/i915/gem_pxp.c > @@ -748,10 +748,7 @@ static void test_pxp_pwrcycle_teardown_keychange(int i915, struct powermgt_data > igt_assert_eq(matched_after_keychange, 0); > } > > -#define GFX_OP_PIPE_CONTROL ((3 << 29) | (3 << 27) | (2 << 24)) > -#define PIPE_CONTROL_CS_STALL (1 << 20) > #define PIPE_CONTROL_RENDER_TARGET_FLUSH (1 << 12) > -#define PIPE_CONTROL_FLUSH_ENABLE (1 << 7) > #define PIPE_CONTROL_DATA_CACHE_INVALIDATE (1 << 5) > #define PIPE_CONTROL_PROTECTEDPATH_DISABLE (1 << 27) > #define PIPE_CONTROL_PROTECTEDPATH_ENABLE (1 << 22) > @@ -765,7 +762,7 @@ static void emit_pipectrl(struct intel_bb *ibb, struct intel_buf *fenceb, bool b > uint32_t pipe_ctl_flags = 0; > uint32_t ps_op_id; > > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL); > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(4)); > intel_bb_out(ibb, pipe_ctl_flags); > > if (before) > @@ -776,7 +773,7 @@ static void emit_pipectrl(struct intel_bb *ibb, struct intel_buf *fenceb, bool b > pipe_ctl_flags = (PIPE_CONTROL_FLUSH_ENABLE | > PIPE_CONTROL_CS_STALL | > PIPE_CONTROL_POST_SYNC_OP); > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | 4); > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(6)); > intel_bb_out(ibb, pipe_ctl_flags); > intel_bb_emit_reloc(ibb, fenceb->handle, 0, I915_GEM_DOMAIN_COMMAND, (before?0:8), > fenceb->addr.offset); > diff --git a/tests/i915/gem_ringfill.c b/tests/i915/gem_ringfill.c > index 8ab00525ff..afcd7b73ed 100644 > --- a/tests/i915/gem_ringfill.c > +++ b/tests/i915/gem_ringfill.c > @@ -158,7 +158,7 @@ static void setup_execbuf(int fd, const intel_ctx_t *ctx, > reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > offset = obj[0].offset + reloc[i].delta; > - *b++ = MI_STORE_DWORD_IMM; > + *b++ = MI_STORE_DWORD_IMM_GEN4; > if (gen >= 8) { > *b++ = offset; > *b++ = offset >> 32; > diff --git a/tests/i915/gem_softpin.c b/tests/i915/gem_softpin.c > index c29bfd43d9..7682f772a1 100644 > --- a/tests/i915/gem_softpin.c > +++ b/tests/i915/gem_softpin.c > @@ -41,18 +41,6 @@ IGT_TEST_DESCRIPTION("Tests softpin feature with normal usage, invalid inputs" > > #define LIMIT_32b ((1ull << 32) - (1ull << 12)) > > -/* gen8_canonical_addr > - * Used to convert any address into canonical form, i.e. [63:48] == [47]. > - * Based on kernel's sign_extend64 implementation. > - * @address - a virtual address > -*/ > -#define GEN8_HIGH_ADDRESS_BIT 47 > -static uint64_t gen8_canonical_addr(uint64_t address) > -{ > - __u8 shift = 63 - GEN8_HIGH_ADDRESS_BIT; > - return (__s64)(address << shift) >> shift; > -} > - > #define INTERRUPTIBLE 0x1 > > static void test_invalid(int fd) > @@ -653,7 +641,7 @@ static void test_noreloc(int fd, enum sleep sleep, unsigned flags) > gem_set_domain(fd, object[i].handle, > I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); > for (i = 0; i < ARRAY_SIZE(object) - 1; i++) { > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > *b++ = object[i].offset; > *b++ = object[i].offset >> 32; > @@ -922,7 +910,7 @@ static void submit(int fd, unsigned int gen, > BATCH_ALIGNMENT); > address = obj.offset + BATCH_SIZE - eb->batch_start_offset - 8; > n = 0; > - batch[n] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[n] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[n] |= 1 << 21; > batch[n]++; > diff --git a/tests/i915/gem_sync.c b/tests/i915/gem_sync.c > index 07cabf7abc..e7dc6637ab 100644 > --- a/tests/i915/gem_sync.c > +++ b/tests/i915/gem_sync.c > @@ -588,7 +588,7 @@ store_ring(int fd, const intel_ctx_t *ctx, unsigned ring, > reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > offset = object[0].offset + reloc[i].delta; > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > *b++ = offset; > *b++ = offset >> 32; > @@ -698,7 +698,7 @@ switch_ring(int fd, const intel_ctx_t *ctx, unsigned ring, > c->reloc[r].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > offset = c->object[0].offset + c->reloc[r].delta; > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > *b++ = offset; > *b++ = offset >> 32; > @@ -772,10 +772,10 @@ switch_ring(int fd, const intel_ctx_t *ctx, unsigned ring, > > static void xchg(void *array, unsigned i, unsigned j) > { > - uint32_t *u32 = array; > - uint32_t tmp = u32[i]; > - u32[i] = u32[j]; > - u32[j] = tmp; > + uint32_t *ui32 = array; > + uint32_t tmp = ui32[i]; > + ui32[i] = ui32[j]; > + ui32[j] = tmp; imho move this to separate patchset. Rest looks ok, Regards, Kamil > } > > struct waiter { > @@ -859,7 +859,7 @@ __store_many(int fd, const intel_ctx_t *ctx, unsigned ring, > reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > offset = object[0].offset + reloc[i].delta; > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > *b++ = offset; > *b++ = offset >> 32; > @@ -1080,7 +1080,7 @@ store_all(int fd, const intel_ctx_t *ctx, int num_children, int timeout) > reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > offset = object[0].offset + reloc[i].delta; > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > *b++ = offset; > *b++ = offset >> 32; > diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c > index 483570d0ad..07a453229a 100644 > --- a/tests/i915/gem_userptr_blits.c > +++ b/tests/i915/gem_userptr_blits.c > @@ -338,7 +338,7 @@ static void store_dword(int fd, uint32_t target, > obj[1].relocation_count = 1; > > i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = offset; > batch[++i] = 0; > @@ -1318,7 +1318,7 @@ static void store_dword_rand(int i915, const intel_ctx_t *ctx, > > offset = reloc[n].presumed_offset + reloc[n].delta; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = offset; > batch[++i] = offset >> 32; > @@ -1379,7 +1379,7 @@ static void test_readonly(int i915) > > /* > * We have only a 31bit delta which we use for generating > - * the target address for MI_STORE_DWORD_IMM, so our maximum > + * the target address for MI_STORE_DWORD_IMM_GEN4, so our maximum > * usable object size is only 2GiB. For now. > */ > igt_nsec_elapsed(memset(&tv, 0, sizeof(tv))); > diff --git a/tests/i915/gem_vm_create.c b/tests/i915/gem_vm_create.c > index 3005d347c3..f47d8c5569 100644 > --- a/tests/i915/gem_vm_create.c > +++ b/tests/i915/gem_vm_create.c > @@ -268,7 +268,7 @@ write_to_address(int fd, uint32_t ctx, uint64_t addr, uint32_t value) > int i; > > i = 0; > - cs[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + cs[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > cs[++i] = addr; > cs[++i] = addr >> 32; > diff --git a/tests/i915/gem_watchdog.c b/tests/i915/gem_watchdog.c > index 01eb007694..27f3a2d7fd 100644 > --- a/tests/i915/gem_watchdog.c > +++ b/tests/i915/gem_watchdog.c > @@ -332,7 +332,7 @@ static void delay(int i915, > > cs = map = gem_mmap__device_coherent(i915, handle, 0, 4096, PROT_WRITE); > > - *cs++ = MI_LOAD_REGISTER_IMM; > + *cs++ = MI_LOAD_REGISTER_IMM(1); > *cs++ = CS_GPR(START_TS) + 4; > *cs++ = 0; > *cs++ = MI_LOAD_REGISTER_REG; > @@ -345,7 +345,7 @@ static void delay(int i915, > > *cs++ = 0x5 << 23; /* MI_ARB_CHECK */ > > - *cs++ = MI_LOAD_REGISTER_IMM; > + *cs++ = MI_LOAD_REGISTER_IMM(1); > *cs++ = CS_GPR(NOW_TS) + 4; > *cs++ = 0; > *cs++ = MI_LOAD_REGISTER_REG; > @@ -367,7 +367,7 @@ static void delay(int i915, > > /* Delay between SRM and COND_BBE to post the writes */ > for (int n = 0; n < 8; n++) { > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > if (use_64b) { > *cs++ = addr + 4064; > *cs++ = addr >> 32; > diff --git a/tests/i915/gem_workarounds.c b/tests/i915/gem_workarounds.c > index 5fb2d73fdd..30c68d1ac9 100644 > --- a/tests/i915/gem_workarounds.c > +++ b/tests/i915/gem_workarounds.c > @@ -121,7 +121,7 @@ static int workaround_fail_count(int i915, const intel_ctx_t *ctx) > out = base = > gem_mmap__cpu(i915, obj[1].handle, 0, batch_sz, PROT_WRITE); > for (int i = 0; i < num_wa_regs; i++) { > - *out++ = MI_STORE_REGISTER_MEM | (1 + (gen >= 8)); > + *out++ = MI_STORE_REGISTER_MEM_CMD | (1 + (gen >= 8)); > *out++ = wa_regs[i].addr; > reloc[i].target_handle = obj[0].handle; > reloc[i].offset = (out - base) * sizeof(*out); > diff --git a/tests/i915/gen7_exec_parse.c b/tests/i915/gen7_exec_parse.c > index 69b768ed29..e9751ea73f 100644 > --- a/tests/i915/gen7_exec_parse.c > +++ b/tests/i915/gen7_exec_parse.c > @@ -48,10 +48,6 @@ > #define INSTR_CLIENT_SHIFT 29 > #define INSTR_INVALID_CLIENT 0x7 > > -#define MI_ARB_ON_OFF (0x8 << 23) > -#define MI_DISPLAY_FLIP ((0x14 << 23) | 1) > - > -#define GFX_OP_PIPE_CONTROL ((0x3<<29)|(0x3<<27)|(0x2<<24)|2) > #define PIPE_CONTROL_QW_WRITE (1<<14) > #define PIPE_CONTROL_LRI_POST_OP (1<<23) > > @@ -298,7 +294,7 @@ static void > test_lri(int fd, uint32_t handle, struct test_lri *test) > { > uint32_t lri[] = { > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > test->reg, > test->test_val, > MI_BATCH_BUFFER_END, > @@ -372,13 +368,13 @@ static void test_allocations(int fd) > static void hsw_load_register_reg(void) > { > uint32_t init_gpr0[16] = { > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > HSW_CS_GPR0, > 0xabcdabc0, /* leave [1:0] zero */ > MI_BATCH_BUFFER_END, > }; > uint32_t store_gpr0[16] = { > - MI_STORE_REGISTER_MEM | (3 - 2), > + MI_STORE_REGISTER_MEM_CMD | (3 - 2), > HSW_CS_GPR0, > 0, /* reloc*/ > MI_BATCH_BUFFER_END, > @@ -475,7 +471,7 @@ igt_main > > igt_subtest("basic-allowed") { > uint32_t pc[] = { > - GFX_OP_PIPE_CONTROL, > + GFX_OP_PIPE_CONTROL(4), > PIPE_CONTROL_QW_WRITE, > 0, /* To be patched */ > 0x12000000, > @@ -490,7 +486,7 @@ igt_main > > igt_subtest("basic-offset") { > uint32_t pc[] = { > - GFX_OP_PIPE_CONTROL, > + GFX_OP_PIPE_CONTROL(4), > PIPE_CONTROL_QW_WRITE, > 0, /* To be patched */ > 0x12000000, > @@ -597,7 +593,7 @@ igt_main > > igt_subtest("bitmasks") { > uint32_t pc[] = { > - GFX_OP_PIPE_CONTROL, > + GFX_OP_PIPE_CONTROL(4), > (PIPE_CONTROL_QW_WRITE | > PIPE_CONTROL_LRI_POST_OP), > 0, /* To be patched */ > @@ -631,13 +627,13 @@ igt_main > > igt_subtest("cmd-crossing-page") { > uint32_t lri_ok[] = { > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > SO_WRITE_OFFSET_0, /* allowed register address */ > 0xdcbaabc0, /* [1:0] MBZ */ > MI_BATCH_BUFFER_END, > }; > uint32_t store_reg[] = { > - MI_STORE_REGISTER_MEM | (3 - 2), > + MI_STORE_REGISTER_MEM_CMD | (3 - 2), > SO_WRITE_OFFSET_0, > 0, /* reloc */ > MI_BATCH_BUFFER_END, > @@ -655,29 +651,29 @@ igt_main > > igt_subtest("oacontrol-tracking") { > uint32_t lri_ok[] = { > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > OACONTROL, > 0x31337000, > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > OACONTROL, > 0x0, > MI_BATCH_BUFFER_END, > 0 > }; > uint32_t lri_bad[] = { > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > OACONTROL, > 0x31337000, > MI_BATCH_BUFFER_END, > }; > uint32_t lri_extra_bad[] = { > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > OACONTROL, > 0x31337000, > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > OACONTROL, > 0x0, > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > OACONTROL, > 0x31337000, > MI_BATCH_BUFFER_END, > @@ -701,7 +697,7 @@ igt_main > > igt_subtest("chained-batch") { > uint32_t pc[] = { > - GFX_OP_PIPE_CONTROL, > + GFX_OP_PIPE_CONTROL(4), > PIPE_CONTROL_QW_WRITE, > 0, /* To be patched */ > 0x12000000, > diff --git a/tests/i915/gen9_exec_parse.c b/tests/i915/gen9_exec_parse.c > index c8743a78a0..26b1517053 100644 > --- a/tests/i915/gen9_exec_parse.c > +++ b/tests/i915/gen9_exec_parse.c > @@ -38,14 +38,6 @@ > #define INSTR_CLIENT_SHIFT 29 > #define INSTR_INVALID_CLIENT 0x7 > > -#define MI_ARB_ON_OFF (0x8 << 23) > -#define MI_USER_INTERRUPT (0x02 << 23) > -#define MI_FLUSH_DW (0x26 << 23) > -#define MI_REPORT_HEAD (0x07 << 23) > -#define MI_SUSPEND_FLUSH (0x0b << 23) > -#define MI_LOAD_SCAN_LINES_EXCL (0x13 << 23) > -#define MI_UPDATE_GTT (0x23 << 23) > - > #define BCS_SWCTRL 0x22200 > #define BCS_GPR_BASE 0x22600 > #define BCS_GPR(n) (0x22600 + (n) * 8) > @@ -324,7 +316,7 @@ static const struct cmd allowed_cmds[] = { > CMD_N(MI_NOOP), > CMD_N(MI_USER_INTERRUPT), > CMD_N(MI_WAIT_FOR_EVENT), > - CMD(MI_FLUSH_DW, 5), > + CMD(MI_FLUSH_DW_CMD, 5), > CMD_N(MI_ARB_CHECK), > CMD_N(MI_REPORT_HEAD), > CMD_N(MI_FLUSH), > @@ -453,11 +445,11 @@ static void test_bb_start(const int i915, const uint32_t handle, int test) > MI_NOOP, > MI_NOOP, > MI_NOOP, > - MI_STORE_DWORD_IMM, > + MI_STORE_DWORD_IMM_GEN4, > 0, > 0, > 1, > - MI_STORE_DWORD_IMM, > + MI_STORE_DWORD_IMM_GEN4, > 4, > 0, > 2, > @@ -680,13 +672,13 @@ static void test_bb_chained(const int i915, const uint32_t handle) > static void test_cmd_crossing_page(const int i915, const uint32_t handle) > { > const uint32_t lri_ok[] = { > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > BCS_GPR(0), > 0xbaadf00d, > MI_BATCH_BUFFER_END, > }; > const uint32_t store_reg[] = { > - MI_STORE_REGISTER_MEM | 2, > + MI_STORE_REGISTER_MEM_CMD | 2, > BCS_GPR(0), > 0, /* reloc */ > 0, /* reloc */ > @@ -711,21 +703,21 @@ static void test_invalid_length(const int i915, const uint32_t handle) > const uint32_t noops[8192] = { 0, }; > > const uint32_t lri_ok[] = { > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > BCS_GPR(0), > ok_val, > MI_BATCH_BUFFER_END, > }; > > const uint32_t lri_bad[] = { > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > BCS_GPR(0), > bad_val, > MI_BATCH_BUFFER_END, > }; > > const uint32_t store_reg[] = { > - MI_STORE_REGISTER_MEM | 2, > + MI_STORE_REGISTER_MEM_CMD | 2, > BCS_GPR(0), > 0, /* reloc */ > 0, /* reloc */ > @@ -824,21 +816,21 @@ static void test_register(const int i915, const uint32_t handle, > const struct reg *r) > { > const uint32_t lri_zero[] = { > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > r->addr, > r->masked_write ? 0xffff0000 : 0, > MI_BATCH_BUFFER_END, > }; > > const uint32_t lri_mask[] = { > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > r->addr, > r->masked_write ? (r->mask << 16) | r->mask : r->mask, > MI_BATCH_BUFFER_END, > }; > > const uint32_t store_reg[] = { > - MI_STORE_REGISTER_MEM | 2, > + MI_STORE_REGISTER_MEM_CMD | 2, > r->addr, > 0, /* reloc */ > 0, /* reloc */ > @@ -877,7 +869,7 @@ static long int read_reg(const int i915, const uint32_t handle, > const uint32_t addr) > { > const uint32_t store_reg[] = { > - MI_STORE_REGISTER_MEM | 2, > + MI_STORE_REGISTER_MEM_CMD | 2, > addr, > 0, /* reloc */ > 0, /* reloc */ > @@ -911,7 +903,7 @@ static int write_reg(const int i915, const uint32_t handle, > const uint32_t addr, const uint32_t val) > { > const uint32_t lri[] = { > - MI_LOAD_REGISTER_IMM, > + MI_LOAD_REGISTER_IMM(1), > addr, > val, > MI_BATCH_BUFFER_END, > @@ -1088,17 +1080,6 @@ static inline uint32_t fill_and_copy_shadow(uint32_t *batch, uint32_t len, > return i * sizeof(uint32_t); > } > > -static inline uint64_t sign_extend(uint64_t x, int index) > -{ > - int shift = 63 - index; > - return (int64_t)(x << shift) >> shift; > -} > - > -static uint64_t gen8_canonical_address(uint64_t address) > -{ > - return sign_extend(address, 47); > -} > - > static void test_shadow_peek(int fd) > { > uint64_t size = PAGE_SIZE; > @@ -1130,7 +1111,7 @@ static void test_shadow_peek(int fd) > > exec[1].handle = gem_create(fd, size); /* batch */ > exec[1].flags = EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS; > - exec[1].offset = gen8_canonical_address(exec[0].pad_to_size); > + exec[1].offset = gen8_canonical_addr(exec[0].pad_to_size); > > vaddr = gem_mmap__wc(fd, exec[1].handle, 0, size, PROT_WRITE); > > diff --git a/tests/i915/i915_module_load.c b/tests/i915/i915_module_load.c > index d3a86b1133..725687dab4 100644 > --- a/tests/i915/i915_module_load.c > +++ b/tests/i915/i915_module_load.c > @@ -80,7 +80,7 @@ static void store_all(int i915) > int i; > > i = 0; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = 0; > batch[++i] = 0; > diff --git a/tests/i915/perf.c b/tests/i915/perf.c > index dd1f1ac399..6453354cfc 100644 > --- a/tests/i915/perf.c > +++ b/tests/i915/perf.c > @@ -58,30 +58,17 @@ IGT_TEST_DESCRIPTION("Test the i915 perf metrics streaming interface"); > #define OAREPORT_REASON_GO (1<<4) > #define OAREPORT_REASON_CLK_RATIO (1<<5) > > -#define GFX_OP_PIPE_CONTROL ((3 << 29) | (3 << 27) | (2 << 24)) > -#define PIPE_CONTROL_CS_STALL (1 << 20) > #define PIPE_CONTROL_GLOBAL_SNAPSHOT_COUNT_RESET (1 << 19) > -#define PIPE_CONTROL_TLB_INVALIDATE (1 << 18) > #define PIPE_CONTROL_SYNC_GFDT (1 << 17) > -#define PIPE_CONTROL_MEDIA_STATE_CLEAR (1 << 16) > #define PIPE_CONTROL_NO_WRITE (0 << 14) > #define PIPE_CONTROL_WRITE_IMMEDIATE (1 << 14) > #define PIPE_CONTROL_WRITE_DEPTH_COUNT (2 << 14) > -#define PIPE_CONTROL_WRITE_TIMESTAMP (3 << 14) > -#define PIPE_CONTROL_DEPTH_STALL (1 << 13) > #define PIPE_CONTROL_RENDER_TARGET_FLUSH (1 << 12) > #define PIPE_CONTROL_INSTRUCTION_INVALIDATE (1 << 11) > -#define PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE (1 << 10) /* GM45+ only */ > #define PIPE_CONTROL_ISP_DIS (1 << 9) > #define PIPE_CONTROL_INTERRUPT_ENABLE (1 << 8) > -#define PIPE_CONTROL_FLUSH_ENABLE (1 << 7) /* Gen7+ only */ > /* GT */ > #define PIPE_CONTROL_DATA_CACHE_INVALIDATE (1 << 5) > -#define PIPE_CONTROL_VF_CACHE_INVALIDATE (1 << 4) > -#define PIPE_CONTROL_CONST_CACHE_INVALIDATE (1 << 3) > -#define PIPE_CONTROL_STATE_CACHE_INVALIDATE (1 << 2) > -#define PIPE_CONTROL_STALL_AT_SCOREBOARD (1 << 1) > -#define PIPE_CONTROL_DEPTH_CACHE_FLUSH (1 << 0) > #define PIPE_CONTROL_PPGTT_WRITE (0 << 2) > #define PIPE_CONTROL_GLOBAL_GTT_WRITE (1 << 2) > > @@ -3242,9 +3229,9 @@ emit_stall_timestamp_and_rpc(struct intel_bb *ibb, > intel_bb_add_intel_buf(ibb, dst, true); > > if (intel_gen(devid) >= 8) > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | (6 - 2)); > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(6)); > else > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | (5 - 2)); > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(5)); > > intel_bb_out(ibb, pipe_ctl_flags); > intel_bb_emit_reloc(ibb, dst->handle, > diff --git a/tests/i915/perf_pmu.c b/tests/i915/perf_pmu.c > index c1779fc9d0..f387f8249a 100644 > --- a/tests/i915/perf_pmu.c > +++ b/tests/i915/perf_pmu.c > @@ -681,12 +681,6 @@ no_sema(int gem_fd, const intel_ctx_t *ctx, > assert_within_epsilon(val[0][1], 0.0f, tolerance); > } > > -#define MI_INSTR(opcode, flags) (((opcode) << 23) | (flags)) > -#define MI_SEMAPHORE_WAIT MI_INSTR(0x1c, 2) /* GEN8+ */ > -#define MI_SEMAPHORE_POLL (1<<15) > -#define MI_SEMAPHORE_SAD_GTE_SDD (1<<12) > -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > - > static void > sema_wait(int gem_fd, const intel_ctx_t *ctx, > const struct intel_execution_engine2 *e, > @@ -719,7 +713,7 @@ sema_wait(int gem_fd, const intel_ctx_t *ctx, > > obj_ptr = gem_mmap__device_coherent(gem_fd, obj_handle, 0, 4096, PROT_WRITE); > > - batch[0] = MI_STORE_DWORD_IMM; > + batch[0] = MI_STORE_DWORD_IMM_GEN4; > batch[1] = obj_offset + sizeof(*obj_ptr); > batch[2] = (obj_offset + sizeof(*obj_ptr)) >> 32; > batch[3] = 1; > @@ -807,7 +801,7 @@ create_sema(int gem_fd, uint64_t ahnd, > { > uint32_t cs[] = { > /* Reset our semaphore wait */ > - MI_STORE_DWORD_IMM, > + MI_STORE_DWORD_IMM_GEN4, > 0, > 0, > 1, > @@ -1108,17 +1102,17 @@ event_wait(int gem_fd, const intel_ctx_t *ctx, > obj.handle = gem_create(gem_fd, 4096); > > b = batch; > - *b++ = MI_LOAD_REGISTER_IMM; > + *b++ = MI_LOAD_REGISTER_IMM(1); > *b++ = FORCEWAKE_MT; > *b++ = 2 << 16 | 2; > - *b++ = MI_LOAD_REGISTER_IMM; > + *b++ = MI_LOAD_REGISTER_IMM(1); > *b++ = DERRMR; > *b++ = ~0u; > *b++ = MI_WAIT_FOR_EVENT; > - *b++ = MI_LOAD_REGISTER_IMM; > + *b++ = MI_LOAD_REGISTER_IMM(1); > *b++ = DERRMR; > *b++ = ~0u; > - *b++ = MI_LOAD_REGISTER_IMM; > + *b++ = MI_LOAD_REGISTER_IMM(1); > *b++ = FORCEWAKE_MT; > *b++ = 2 << 16; > *b++ = MI_BATCH_BUFFER_END; > diff --git a/tests/i915/sysfs_timeslice_duration.c b/tests/i915/sysfs_timeslice_duration.c > index 95dc377785..80d34285e2 100644 > --- a/tests/i915/sysfs_timeslice_duration.c > +++ b/tests/i915/sysfs_timeslice_duration.c > @@ -46,15 +46,6 @@ > #define ATTR "timeslice_duration_ms" > #define RESET_TIMEOUT 50 /* milliseconds, at least one jiffie for kworker */ > > -#define MI_SEMAPHORE_WAIT (0x1c << 23) > -#define MI_SEMAPHORE_POLL (1 << 15) > -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > - > static bool __enable_hangcheck(int dir, bool state) > { > return igt_sysfs_set(dir, "enable_hangcheck", state ? "1" : "0"); > @@ -214,7 +205,7 @@ static uint64_t __test_duration(int i915, int engine, unsigned int timeout) > > cs = map; > for (i = 0; i < 10; i++) { > - *cs++ = MI_SEMAPHORE_WAIT | > + *cs++ = MI_SEMAPHORE_WAIT_CMD | > MI_SEMAPHORE_POLL | > MI_SEMAPHORE_SAD_NEQ_SDD | > (4 - 2 + (gen >= 12)); > @@ -229,7 +220,7 @@ static uint64_t __test_duration(int i915, int engine, unsigned int timeout) > *cs++ = obj[1].offset + sizeof(uint32_t) * i; > *cs++ = 0; > > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > *cs++ = obj[0].offset + > 4096 - sizeof(uint32_t) * i - sizeof(uint32_t); > *cs++ = 0; > @@ -240,12 +231,12 @@ static uint64_t __test_duration(int i915, int engine, unsigned int timeout) > cs += 16 - ((cs - map) & 15); > start = (cs - map) * sizeof(*cs); > for (i = 0; i < 10; i++) { > - *cs++ = MI_STORE_DWORD_IMM; > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > *cs++ = obj[0].offset + sizeof(uint32_t) * i; > *cs++ = 0; > *cs++ = 1; > > - *cs++ = MI_SEMAPHORE_WAIT | > + *cs++ = MI_SEMAPHORE_WAIT_CMD | > MI_SEMAPHORE_POLL | > MI_SEMAPHORE_SAD_NEQ_SDD | > (4 - 2 + (gen >= 12)); > diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c > index 06be273c0b..7b473c03df 100644 > --- a/tests/prime_vgem.c > +++ b/tests/prime_vgem.c > @@ -624,7 +624,7 @@ static void work(int i915, uint64_t ahnd, uint64_t scratch_offset, int dmabuf, > store[count].delta = sizeof(uint32_t) * count; > store[count].read_domains = I915_GEM_DOMAIN_INSTRUCTION; > store[count].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > if (gen >= 8) { > batch[++i] = scratch_offset + store[count].delta; > batch[++i] = (scratch_offset + store[count].delta) >> 32; > diff --git a/tools/intel_audio_dump.c b/tools/intel_audio_dump.c > index 6d11659ec9..287dbd4759 100644 > --- a/tools/intel_audio_dump.c > +++ b/tools/intel_audio_dump.c > @@ -48,6 +48,7 @@ static int disp_reg_base = 0; /* base address of display registers */ > #define BITSTO(n) (n >= sizeof(long) * 8 ? ~0 : (1UL << (n)) - 1) > #define BITMASK(high, low) (BITSTO(high+1) & ~BITSTO(low)) > #define REG_BITS(reg, high, low) (((reg) & (BITMASK(high, low))) >> (low)) > +#undef REG_BIT > #define REG_BIT(reg, n) REG_BITS(reg, n, n) > > #define min_t(type, x, y) ({ \ > diff --git a/tools/intel_reg.c b/tools/intel_reg.c > index b0d91473a8..6c37e14d12 100644 > --- a/tools/intel_reg.c > +++ b/tools/intel_reg.c > @@ -322,7 +322,7 @@ static int register_srm(struct config *config, struct reg *reg, > batch[i++] = MI_NOOP; > batch[i++] = MI_NOOP; > > - batch[i++] = MI_LOAD_REGISTER_IMM; > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > batch[i++] = reg->addr; > batch[i++] = *val_in; > batch[i++] = MI_NOOP; > -- > 2.34.1 > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 2/2] igt: Remove duplicated macros 2023-03-06 15:30 ` Kamil Konieczny @ 2023-03-06 15:50 ` Zbigniew Kempczyński 0 siblings, 0 replies; 11+ messages in thread From: Zbigniew Kempczyński @ 2023-03-06 15:50 UTC (permalink / raw) To: Kamil Konieczny, igt-dev, Petri Latvala On Mon, Mar 06, 2023 at 04:30:02PM +0100, Kamil Konieczny wrote: > Hi Zbigniew, > > thank you for unifing these commands which will help in > development. I have few nits, see below. > > On 2023-03-03 at 13:55:21 +0100, Zbigniew Kempczyński wrote: > > Introducing intel_gpu_commands.h requires removing all conflicting > > macros definitions with altering the code (mostly command length). > > > > For all commands used in IGT but not in the kernel (yet) add > > intel_gpu_commands_staging.h which will keep all commands used > > here only. Next import of command macros might finish verbatim > > copy + removing from staging in one commit to compile cleanly. > > > > Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> > > Cc: Petri Latvala <adrinael@adrinael.net> > > Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com> > > --- > > benchmarks/gem_wsim.c | 6 +-- > > include/intel_gpu_commands_staging.h | 18 +++++++ > > include/linux/bitops.h | 4 +- > > lib/gen4_render.h | 2 - > > lib/gen7_media.h | 2 - > > lib/gen7_render.h | 3 -- > > lib/gen8_media.h | 2 - > > lib/huc_copy.c | 6 +-- > > lib/huc_copy.h | 2 +- > > lib/i830_reg.h | 16 ------ > > lib/i915/i915_blt.h | 4 +- > > lib/i915/i915_crc.c | 15 +++--- > > lib/igt_draw.c | 4 +- > > lib/igt_dummyload.c | 2 +- > > lib/igt_store.c | 2 +- > > lib/intel_allocator.h | 8 +-- > > lib/intel_aux_pgtable.c | 5 +- > > lib/intel_batchbuffer.c | 12 ++--- > > lib/intel_bufops.c | 7 +++ > > lib/intel_reg.h | 69 ++---------------------- > > lib/ioctl_wrappers.h | 4 +- > > lib/rendercopy_gen9.c | 9 ++-- > > tests/i915/api_intel_bb.c | 2 +- > > tests/i915/gem_blits.c | 20 ++++--- > > tests/i915/gem_busy.c | 8 +-- > > tests/i915/gem_ccs.c | 2 +- > > tests/i915/gem_ctx_shared.c | 4 +- > > tests/i915/gem_exec_async.c | 2 +- > > tests/i915/gem_exec_balancer.c | 23 +++----- > > tests/i915/gem_exec_capture.c | 4 +- > > tests/i915/gem_exec_endless.c | 13 +---- > > tests/i915/gem_exec_fair.c | 18 +++---- > > tests/i915/gem_exec_fence.c | 43 ++++++--------- > > tests/i915/gem_exec_flush.c | 6 +-- > > tests/i915/gem_exec_gttfill.c | 2 +- > > tests/i915/gem_exec_nop.c | 4 +- > > tests/i915/gem_exec_parallel.c | 2 +- > > tests/i915/gem_exec_params.c | 4 +- > > tests/i915/gem_exec_reloc.c | 29 ++++------ > > tests/i915/gem_exec_schedule.c | 43 ++++++--------- > > tests/i915/gem_exec_store.c | 6 +-- > > tests/i915/gem_exec_suspend.c | 2 +- > > tests/i915/gem_exec_whisper.c | 2 +- > > tests/i915/gem_pipe_control_store_loop.c | 11 ++-- > > tests/i915/gem_pxp.c | 7 +-- > > tests/i915/gem_ringfill.c | 2 +- > > tests/i915/gem_softpin.c | 16 +----- > > tests/i915/gem_sync.c | 16 +++--- > > tests/i915/gem_userptr_blits.c | 6 +-- > > tests/i915/gem_vm_create.c | 2 +- > > tests/i915/gem_watchdog.c | 6 +-- > > tests/i915/gem_workarounds.c | 2 +- > > tests/i915/gen7_exec_parse.c | 34 ++++++------ > > tests/i915/gen9_exec_parse.c | 47 +++++----------- > > tests/i915/i915_module_load.c | 2 +- > > tests/i915/perf.c | 17 +----- > > tests/i915/perf_pmu.c | 18 +++---- > > tests/i915/sysfs_timeslice_duration.c | 17 ++---- > > tests/prime_vgem.c | 2 +- > > tools/intel_audio_dump.c | 1 + > > tools/intel_reg.c | 2 +- > > 61 files changed, 231 insertions(+), 418 deletions(-) > > create mode 100644 include/intel_gpu_commands_staging.h > > > > diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c > > index 2d60135817..7b5e62a3be 100644 > > --- a/benchmarks/gem_wsim.c > > +++ b/benchmarks/gem_wsim.c > > @@ -1426,7 +1426,7 @@ static unsigned int create_bb(struct w_step *w, int self) > > cs = ptr = gem_mmap__wc(fd, w->bb_handle, 0, 4096, PROT_WRITE); > > > > /* Store initial 64b timestamp: start */ > > - *cs++ = MI_LOAD_REGISTER_IMM | MI_CS_MMIO_DST; > > + *cs++ = MI_LOAD_REGISTER_IMM(1) | MI_CS_MMIO_DST; > > *cs++ = CS_GPR(START_TS) + 4; > > *cs++ = 0; > > *cs++ = MI_LOAD_REGISTER_REG | MI_CS_MMIO_DST | MI_CS_MMIO_SRC; > > @@ -1441,7 +1441,7 @@ static unsigned int create_bb(struct w_step *w, int self) > > *cs++ = MI_ARB_CHECK; > > > > /* Store this 64b timestamp: now */ > > - *cs++ = MI_LOAD_REGISTER_IMM | MI_CS_MMIO_DST; > > + *cs++ = MI_LOAD_REGISTER_IMM(1) | MI_CS_MMIO_DST; > > *cs++ = CS_GPR(NOW_TS) + 4; > > *cs++ = 0; > > *cs++ = MI_LOAD_REGISTER_REG | MI_CS_MMIO_DST | MI_CS_MMIO_SRC; > > @@ -1456,7 +1456,7 @@ static unsigned int create_bb(struct w_step *w, int self) > > *cs++ = MI_MATH_STOREINV(MI_MATH_REG(NOW_TS), MI_MATH_REG_ACCU); > > > > /* Save delta for indirect read by COND_BBE */ > > - *cs++ = MI_STORE_REGISTER_MEM | (1 + use_64b) | MI_CS_MMIO_DST; > > + *cs++ = MI_STORE_REGISTER_MEM_CMD | (1 + use_64b) | MI_CS_MMIO_DST; > > *cs++ = CS_GPR(NOW_TS); > > w->reloc[r].target_handle = self; > > w->reloc[r].offset = offset_in_page(cs); > > diff --git a/include/intel_gpu_commands_staging.h b/include/intel_gpu_commands_staging.h > > new file mode 100644 > > index 0000000000..74b4fb6553 > > --- /dev/null > > +++ b/include/intel_gpu_commands_staging.h > > @@ -0,0 +1,18 @@ > > +/* SPDX-License-Identifier: MIT*/ > > +/* > > + * Copyright © 2022 Intel Corporation > > + */ > > + > > +#ifndef _INTEL_GPU_COMMANDS_STAGING_H_ > > +#define _INTEL_GPU_COMMANDS_STAGING_H_ > > + > > +#include "linux_scaffold.h" > > + > > +/* Length-free commands */ > > +#define MI_SEMAPHORE_WAIT_CMD (0x1c << 23) > > +#define MI_STORE_DWORD_IMM_CMD (0x20 << 23) > > +#define MI_STORE_REGISTER_MEM_CMD (0x24 << 23) > > +#define MI_FLUSH_DW_CMD (0x26 << 23) > > +#define MI_LOAD_REGISTER_MEM_CMD (0x29 << 23) > > May you sort them alphabetically ? > I think better is to sort with command value, because then you're checking the right place regarless name. > > + > > +#endif /* _INTEL_GPU_COMMANDS_STAGING_H_ */ > > diff --git a/include/linux/bitops.h b/include/linux/bitops.h > > index 1bbe60c83c..7416dfa451 100644 > > --- a/include/linux/bitops.h > > +++ b/include/linux/bitops.h > > @@ -3,6 +3,8 @@ > > #ifndef _HAX_LINUX_BITOPS_H_ > > #define _HAX_LINUX_BITOPS_H_ > > > > -#include <linux_scaffold.h> > > +#include "linux_scaffold.h" > > + > > +#define REG_BIT(x) (1ul << (x)) > > > > #endif /* _HAX_LINUX_BITOPS_H_ */ > > diff --git a/lib/gen4_render.h b/lib/gen4_render.h > > index 7d8bc659a7..bbbddd346e 100644 > > --- a/lib/gen4_render.h > > +++ b/lib/gen4_render.h > > @@ -25,14 +25,12 @@ > > #define GEN4_CS_URB_STATE GEN4_3D(0, 0, 1) > > > > #define GEN4_STATE_BASE_ADDRESS GEN4_3D(0, 1, 1) > > -# define BASE_ADDRESS_MODIFY (1 << 0) > > > > #define GEN4_STATE_SIP GEN4_3D(0, 1, 2) > > > > #define GEN4_PIPELINE_SELECT GEN4_3D(0, 1, 4) > > #define G4X_PIPELINE_SELECT GEN4_3D(1, 1, 4) > > # define PIPELINE_SELECT_3D 0 > > -# define PIPELINE_SELECT_MEDIA 1 > > > > #define GEN4_3DSTATE_PIPELINED_POINTERS GEN4_3D(3, 0, 0) > > # define GEN4_GS_DISABLE 0 > > diff --git a/lib/gen7_media.h b/lib/gen7_media.h > > index e81b5523a7..b5e49cae9e 100644 > > --- a/lib/gen7_media.h > > +++ b/lib/gen7_media.h > > @@ -14,11 +14,9 @@ > > > > #define GEN7_PIPELINE_SELECT GFXPIPE(1, 1, 4) > > # define PIPELINE_SELECT_3D (0 << 0) > > -# define PIPELINE_SELECT_MEDIA (1 << 0) > > # define PIPELINE_SELECT_GPGPU (2 << 0) > > > > #define GEN7_STATE_BASE_ADDRESS GFXPIPE(0, 1, 1) > > -# define BASE_ADDRESS_MODIFY (1 << 0) > > > > #define GEN7_MEDIA_VFE_STATE GFXPIPE(2, 0, 0) > > #define GEN7_MEDIA_CURBE_LOAD GFXPIPE(2, 0, 1) > > diff --git a/lib/gen7_render.h b/lib/gen7_render.h > > index 5dfc04d4bc..d09ba6dad1 100644 > > --- a/lib/gen7_render.h > > +++ b/lib/gen7_render.h > > @@ -170,9 +170,6 @@ > > /* DW1 */ > > # define GEN7_PUSH_CONSTANT_BUFFER_OFFSET_SHIFT 16 > > > > -/* for GEN7_STATE_BASE_ADDRESS */ > > -#define BASE_ADDRESS_MODIFY (1 << 0) > > - > > /* for GEN7_PIPE_CONTROL */ > > #define GEN7_PIPE_CONTROL_CS_STALL (1 << 20) > > #define GEN7_PIPE_CONTROL_STALL_AT_SCOREBOARD (1 << 1) > > diff --git a/lib/gen8_media.h b/lib/gen8_media.h > > index 1643794156..d2a049a1ec 100644 > > --- a/lib/gen8_media.h > > +++ b/lib/gen8_media.h > > @@ -14,10 +14,8 @@ > > > > #define GEN8_PIPELINE_SELECT GFXPIPE(1, 1, 4) > > # define PIPELINE_SELECT_3D (0 << 0) > > -# define PIPELINE_SELECT_MEDIA (1 << 0) > > > > #define GEN8_STATE_BASE_ADDRESS GFXPIPE(0, 1, 1) > > -# define BASE_ADDRESS_MODIFY (1 << 0) > > > > #define GEN8_MEDIA_VFE_STATE GFXPIPE(2, 0, 0) > > #define GEN8_MEDIA_CURBE_LOAD GFXPIPE(2, 0, 1) > > diff --git a/lib/huc_copy.c b/lib/huc_copy.c > > index 6ec68864b7..bf8254c612 100644 > > --- a/lib/huc_copy.c > > +++ b/lib/huc_copy.c > > @@ -80,14 +80,14 @@ gen9_huc_copyfunc(int fd, uint64_t ahnd, > > buf[i++] = 0; > > buf[i++] = 0x3; > > > > - buf[i++] = MFX_WAIT; > > - buf[i++] = MFX_WAIT; > > + buf[i++] = HUC_MFX_WAIT; > > + buf[i++] = HUC_MFX_WAIT; > > imho this changes to huc_copy may be in separate patch > before your main patchset. If you prefer it can stay. > It's not a big problem, will separate this as this is not related to gpu command extraction. > > > > buf[i++] = HUC_PIPE_MODE_SELECT; > > buf[i++] = 0; > > buf[i++] = 0; > > > > - buf[i++] = MFX_WAIT; > > + buf[i++] = HUC_MFX_WAIT; > > > > memset(reloc, 0, sizeof(reloc)); > > > > diff --git a/lib/huc_copy.h b/lib/huc_copy.h > > index 69d1409335..1789e87359 100644 > > --- a/lib/huc_copy.h > > +++ b/lib/huc_copy.h > > @@ -31,7 +31,7 @@ > > #include "intel_reg.h" > > > > #define PARALLEL_VIDEO_PIPE (0x3<<29) > > -#define MFX_WAIT (PARALLEL_VIDEO_PIPE|(0x1<<27)|(0x1<<8)) > > +#define HUC_MFX_WAIT (PARALLEL_VIDEO_PIPE|(0x1<<27)|(0x1<<8)) > > > > #define HUC_IMEM_STATE (PARALLEL_VIDEO_PIPE|(0x2<<27)|(0xb<<23)|(0x1<<16)|0x3) > > #define HUC_PIPE_MODE_SELECT (PARALLEL_VIDEO_PIPE|(0x2<<27)|(0xb<<23)|0x1) > > diff --git a/lib/i830_reg.h b/lib/i830_reg.h > > index b8ad2ac00f..3c0b9b5bd0 100644 > > --- a/lib/i830_reg.h > > +++ b/lib/i830_reg.h > > @@ -30,12 +30,7 @@ > > > > #define I830_SET_FIELD( var, mask, value ) (var &= ~(mask), var |= value) > > > > -/* Flush */ > > -#define MI_FLUSH (0x04<<23) > > -#define MI_FLUSH_DW (0x26<<23) > > - > > #define MI_WRITE_DIRTY_STATE (1<<4) > > -#define MI_END_SCENE (1<<3) > > #define MI_GLOBAL_SNAPSHOT_COUNT_RESET (1<<3) > > #define MI_INHIBIT_RENDER_CACHE_FLUSH (1<<2) > > #define MI_STATE_INSTRUCTION_CACHE_FLUSH (1<<1) > > @@ -43,15 +38,11 @@ > > /* broadwater flush bits */ > > #define BRW_MI_GLOBAL_SNAPSHOT_RESET (1 << 3) > > > > -#define MI_BATCH_BUFFER_END (0xA << 23) > > - > > /* Noop */ > > -#define MI_NOOP 0x00 > > #define MI_NOOP_WRITE_ID (1<<22) > > #define MI_NOOP_ID_MASK (1<<22 - 1) > > > > /* Wait for Events */ > > -#define MI_WAIT_FOR_EVENT (0x03<<23) > > #define MI_WAIT_FOR_PIPEB_SVBLANK (1<<18) > > #define MI_WAIT_FOR_PIPEA_SVBLANK (1<<17) > > #define MI_WAIT_FOR_OVERLAY_FLIP (1<<16) > > @@ -61,12 +52,10 @@ > > #define MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW (1<<1) > > > > /* Set the scan line for MI_WAIT_FOR_PIPE?_SCAN_LINE_WINDOW */ > > -#define MI_LOAD_SCAN_LINES_INCL (0x12<<23) > > #define MI_LOAD_SCAN_LINES_DISPLAY_PIPEA (0) > > #define MI_LOAD_SCAN_LINES_DISPLAY_PIPEB (0x1<<20) > > > > /* BLT commands */ > > -#define COLOR_BLT_CMD ((2<<29)|(0x40<<22)|(0x3)) > > #define COLOR_BLT_WRITE_ALPHA (1<<21) > > #define COLOR_BLT_WRITE_RGB (1<<20) > > > > @@ -76,16 +65,11 @@ > > > > #define XY_SETUP_CLIP_BLT_CMD ((2<<29)|(3<<22)|1) > > > > -#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)) > > #define XY_SRC_COPY_BLT_WRITE_ALPHA (1<<21) > > #define XY_SRC_COPY_BLT_WRITE_RGB (1<<20) > > #define XY_SRC_COPY_BLT_SRC_TILED (1<<15) > > #define XY_SRC_COPY_BLT_DST_TILED (1<<11) > > > > -#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)|0x4) > > -#define SRC_COPY_BLT_WRITE_ALPHA (1<<21) > > -#define SRC_COPY_BLT_WRITE_RGB (1<<20) > > - > > #define XY_PAT_BLT_IMMEDIATE ((2<<29)|(0x72<<22)) > > > > #define XY_MONO_PAT_BLT_CMD ((0x2<<29)|(0x52<<22)|0x7) > > diff --git a/lib/i915/i915_blt.h b/lib/i915/i915_blt.h > > index c535961e8a..63951db753 100644 > > --- a/lib/i915/i915_blt.h > > +++ b/lib/i915/i915_blt.h > > @@ -135,8 +135,8 @@ struct blt_block_copy_data_ext { > > }; > > > > enum blt_access_type { > > - INDIRECT_ACCESS, > > - DIRECT_ACCESS, > > + BLT_INDIRECT_ACCESS, > > + BLT_DIRECT_ACCESS, > > }; > > > > struct blt_ctrl_surf_copy_object { > > diff --git a/lib/i915/i915_crc.c b/lib/i915/i915_crc.c > > index 7d68f8e5c4..9564b7327d 100644 > > --- a/lib/i915/i915_crc.c > > +++ b/lib/i915/i915_crc.c > > @@ -9,7 +9,6 @@ > > #include "gem_create.h" > > #include "gem_engine_topology.h" > > #include "gem_mman.h" > > -#include "i830_reg.h" > > #include "i915_drm.h" > > #include "intel_reg.h" > > #include "intel_chipset.h" > > @@ -36,13 +35,13 @@ > > } while (0) > > > > #define LOAD_REGISTER_IMM32(__reg, __imm1) do { \ > > - *bb++ = MI_LOAD_REGISTER_IMM | MI_CS_MMIO_DST; \ > > + *bb++ = MI_LOAD_REGISTER_IMM(1) | MI_CS_MMIO_DST; \ > > *bb++ = (__reg); \ > > *bb++ = (__imm1); \ > > } while (0) > > > > #define LOAD_REGISTER_IMM64(__reg, __imm1, __imm2) do { \ > > - *bb++ = (MI_LOAD_REGISTER_IMM + 2) | MI_CS_MMIO_DST; \ > > + *bb++ = MI_LOAD_REGISTER_IMM(2) | MI_CS_MMIO_DST; \ > > *bb++ = (__reg); \ > > *bb++ = (__imm1); \ > > *bb++ = (__reg) + 4; \ > > @@ -50,29 +49,29 @@ > > } while (0) > > > > #define LOAD_REGISTER_MEM(__reg, __offset) do { \ > > - *bb++ = MI_LOAD_REGISTER_MEM | MI_CS_MMIO_DST | 2; \ > > + *bb++ = MI_LOAD_REGISTER_MEM_CMD | MI_CS_MMIO_DST | 2; \ > > *bb++ = (__reg); \ > > *bb++ = (__offset); \ > > *bb++ = (__offset) >> 32; \ > > } while (0) > > > > #define LOAD_REGISTER_MEM_WPARID(__reg, __offset) do { \ > > - *bb++ = MI_LOAD_REGISTER_MEM | MI_CS_MMIO_DST | MI_WPARID_ENABLE_GEN12 | 2; \ > > + *bb++ = MI_LOAD_REGISTER_MEM_CMD | MI_CS_MMIO_DST | MI_WPARID_ENABLE_GEN12 | 2; \ > > *bb++ = (__reg); \ > > *bb++ = (__offset); \ > > *bb++ = (__offset) >> 32; \ > > } while (0) > > > > #define STORE_REGISTER_MEM(__reg, __offset) do { \ > > - *bb++ = MI_STORE_REGISTER_MEM | MI_CS_MMIO_DST | 2; \ > > + *bb++ = MI_STORE_REGISTER_MEM_GEN8 | MI_CS_MMIO_DST; \ > > *bb++ = (__reg); \ > > *bb++ = (__offset); \ > > *bb++ = (__offset) >> 32; \ > > } while (0) > > > > #define STORE_REGISTER_MEM_PREDICATED(__reg, __offset) do { \ > > - *bb++ = MI_STORE_REGISTER_MEM | MI_CS_MMIO_DST | \ > > - MI_STORE_PREDICATE_ENABLE_GEN12 | 2; \ > > + *bb++ = MI_STORE_REGISTER_MEM_GEN8 | MI_CS_MMIO_DST | \ > > + MI_STORE_PREDICATE_ENABLE_GEN12; \ > > *bb++ = (__reg); \ > > *bb++ = (__offset); \ > > *bb++ = (__offset) >> 32; \ > > diff --git a/lib/igt_draw.c b/lib/igt_draw.c > > index 58ce0539be..ac512fac5a 100644 > > --- a/lib/igt_draw.c > > +++ b/lib/igt_draw.c > > @@ -385,12 +385,12 @@ static void switch_blt_tiling(struct intel_bb *ibb, uint32_t tiling, bool on) > > /* To change the tile register, insert an MI_FLUSH_DW followed by an > > * MI_LOAD_REGISTER_IMM > > */ > > - intel_bb_out(ibb, MI_FLUSH_DW | 2); > > + intel_bb_out(ibb, MI_FLUSH_DW_CMD | 2); > > intel_bb_out(ibb, 0x0); > > intel_bb_out(ibb, 0x0); > > intel_bb_out(ibb, 0x0); > > > > - intel_bb_out(ibb, MI_LOAD_REGISTER_IMM); > > + intel_bb_out(ibb, MI_LOAD_REGISTER_IMM(1)); > > intel_bb_out(ibb, 0x22200); /* BCS_SWCTRL */ > > intel_bb_out(ibb, bcs_swctrl); > > intel_bb_out(ibb, MI_NOOP); > > diff --git a/lib/igt_dummyload.c b/lib/igt_dummyload.c > > index 5f3c6b10c7..b3dc18ee7d 100644 > > --- a/lib/igt_dummyload.c > > +++ b/lib/igt_dummyload.c > > @@ -256,7 +256,7 @@ emit_recursive_batch(igt_spin_t *spin, > > r->offset = sizeof(uint32_t) * 1; > > r->delta = sizeof(uint32_t) * SPIN_POLL_START_IDX; > > > > - *cs++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + *cs++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > > > if (gen >= 8) { > > *cs++ = r->presumed_offset + r->delta; > > diff --git a/lib/igt_store.c b/lib/igt_store.c > > index 98c6c4fbd1..538405e7f5 100644 > > --- a/lib/igt_store.c > > +++ b/lib/igt_store.c > > @@ -76,7 +76,7 @@ void igt_store_word(int fd, uint64_t ahnd, const intel_ctx_t *ctx, > > obj[BATCH].offset = bb_offset; > > obj[BATCH].flags |= EXEC_OBJECT_PINNED; > > } > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > uint64_t addr = target_gpu_addr + delta; > > batch[++i] = lower_32_bits(addr); > > diff --git a/lib/intel_allocator.h b/lib/intel_allocator.h > > index 28e1165540..a6bf573e9d 100644 > > --- a/lib/intel_allocator.h > > +++ b/lib/intel_allocator.h > > @@ -12,6 +12,7 @@ > > #include <stdint.h> > > #include <stdatomic.h> > > #include "i915/gem_submission.h" > > +#include "intel_reg.h" > > > > /** > > * SECTION:intel_allocator > > @@ -217,13 +218,6 @@ void intel_allocator_print(uint64_t allocator_handle); > > > > #define GEN8_GTT_ADDRESS_WIDTH 48 > > > > -static inline uint64_t sign_extend64(uint64_t x, int high) > > -{ > > - int shift = 63 - high; > > - > > - return (int64_t)(x << shift) >> shift; > > -} > > - > > static inline uint64_t CANONICAL(uint64_t offset) > > { > > return sign_extend64(offset, GEN8_GTT_ADDRESS_WIDTH - 1); > > diff --git a/lib/intel_aux_pgtable.c b/lib/intel_aux_pgtable.c > > index 7556351a02..5205687080 100644 > > --- a/lib/intel_aux_pgtable.c > > +++ b/lib/intel_aux_pgtable.c > > @@ -9,7 +9,6 @@ > > > > #include "i915/gem_mman.h" > > > > -#define BITS_PER_LONG_LONG (sizeof(long long) * 8) > > #define BITMASK(e, s) ((~0ULL << (s)) & \ > > (~0ULL >> (BITS_PER_LONG_LONG - 1 - (e)))) > > > > @@ -644,11 +643,11 @@ gen12_emit_aux_pgtable_state(struct intel_bb *ibb, uint32_t state, bool render) > > if (!state) > > return; > > > > - intel_bb_out(ibb, MI_LOAD_REGISTER_MEM | MI_MMIO_REMAP_ENABLE_GEN12 | 2); > > + intel_bb_out(ibb, MI_LOAD_REGISTER_MEM_CMD | MI_MMIO_REMAP_ENABLE_GEN12 | 2); > > intel_bb_out(ibb, table_base_reg); > > intel_bb_emit_reloc(ibb, ibb->handle, 0, 0, state, ibb->batch_offset); > > > > - intel_bb_out(ibb, MI_LOAD_REGISTER_MEM | MI_MMIO_REMAP_ENABLE_GEN12 | 2); > > + intel_bb_out(ibb, MI_LOAD_REGISTER_MEM_CMD | MI_MMIO_REMAP_ENABLE_GEN12 | 2); > > intel_bb_out(ibb, table_base_reg + 4); > > intel_bb_emit_reloc(ibb, ibb->handle, 0, 0, state + 4, ibb->batch_offset); > > } > > diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c > > index 59c788e683..8695f1b7ac 100644 > > --- a/lib/intel_batchbuffer.c > > +++ b/lib/intel_batchbuffer.c > > @@ -378,7 +378,7 @@ void igt_blitter_src_copy(int fd, > > if ((src_tiling | dst_tiling) >= I915_TILING_Y) { > > unsigned int mask; > > > > - batch[i++] = MI_LOAD_REGISTER_IMM; > > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > > batch[i++] = BCS_SWCTRL; > > > > mask = (BCS_SRC_Y | BCS_DST_Y) << 16; > > @@ -407,12 +407,12 @@ void igt_blitter_src_copy(int fd, > > > > if ((src_tiling | dst_tiling) >= I915_TILING_Y) { > > igt_assert(gen >= 6); > > - batch[i++] = MI_FLUSH_DW | 2; > > + batch[i++] = MI_FLUSH_DW_CMD | 2; > > batch[i++] = 0; > > batch[i++] = 0; > > batch[i++] = 0; > > > > - batch[i++] = MI_LOAD_REGISTER_IMM; > > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > > batch[i++] = BCS_SWCTRL; > > batch[i++] = (BCS_SRC_Y | BCS_DST_Y) << 16; > > } > > @@ -2413,7 +2413,7 @@ void intel_bb_emit_blt_copy(struct intel_bb *ibb, > > } > > > > if ((src->tiling | dst->tiling) >= I915_TILING_Y) { > > - intel_bb_out(ibb, MI_LOAD_REGISTER_IMM); > > + intel_bb_out(ibb, MI_LOAD_REGISTER_IMM(1)); > > intel_bb_out(ibb, BCS_SWCTRL); > > > > mask = (BCS_SRC_Y | BCS_DST_Y) << 16; > > @@ -2450,12 +2450,12 @@ void intel_bb_emit_blt_copy(struct intel_bb *ibb, > > > > if ((src->tiling | dst->tiling) >= I915_TILING_Y) { > > igt_assert(ibb->gen >= 6); > > - intel_bb_out(ibb, MI_FLUSH_DW | 2); > > + intel_bb_out(ibb, MI_FLUSH_DW_CMD | 2); > > intel_bb_out(ibb, 0); > > intel_bb_out(ibb, 0); > > intel_bb_out(ibb, 0); > > > > - intel_bb_out(ibb, MI_LOAD_REGISTER_IMM); > > + intel_bb_out(ibb, MI_LOAD_REGISTER_IMM(1)); > > intel_bb_out(ibb, BCS_SWCTRL); > > intel_bb_out(ibb, (BCS_SRC_Y | BCS_DST_Y) << 16); > > } > > diff --git a/lib/intel_bufops.c b/lib/intel_bufops.c > > index 72c2189e05..cdc7a1698b 100644 > > --- a/lib/intel_bufops.c > > +++ b/lib/intel_bufops.c > > @@ -83,6 +83,13 @@ > > #define DEBUGFN() > > #endif > > > > +#undef TILE_NONE > > +#undef TILE_X > > +#undef TILE_Y > > +#undef TILE_Yf > > +#undef TILE_Ys > > +#undef TILE_4 > > + > > Why those undef's are here ? > intel_gpu_commands.h conflicts with same definitions. > > #define TILE_DEF(x) (1 << (x)) > > #define TILE_NONE TILE_DEF(I915_TILING_NONE) > > #define TILE_X TILE_DEF(I915_TILING_X) > > diff --git a/lib/intel_reg.h b/lib/intel_reg.h > > index 6f7559ad9f..3bf3676dc5 100644 > > --- a/lib/intel_reg.h > > +++ b/lib/intel_reg.h > > @@ -44,6 +44,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > > #ifndef _I810_REG_H > > #define _I810_REG_H > > > > +#include "intel_gpu_commands.h" > > +#include "intel_gpu_commands_staging.h" > > + > > /* I/O register offsets > > */ > > #define CRX_MDA 0x3B4 > > @@ -2534,7 +2537,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > > #define I855_CLOCK_166_250 (3 << 0) > > > > /* BLT commands */ > > -#define COLOR_BLT_CMD ((2<<29)|(0x40<<22)|(0x3)) > > #define COLOR_BLT_WRITE_ALPHA (1<<21) > > #define COLOR_BLT_WRITE_RGB (1<<20) > > > > @@ -2545,15 +2547,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > > > > #define XY_SETUP_CLIP_BLT_CMD ((2<<29)|(3<<22)|1) > > > > -#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)) > > #define XY_SRC_COPY_BLT_WRITE_ALPHA (1<<21) > > #define XY_SRC_COPY_BLT_WRITE_RGB (1<<20) > > -#define XY_SRC_COPY_BLT_SRC_TILED (1<<15) > > -#define XY_SRC_COPY_BLT_DST_TILED (1<<11) > > - > > -#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)|0x4) > > -#define SRC_COPY_BLT_WRITE_ALPHA (1<<21) > > -#define SRC_COPY_BLT_WRITE_RGB (1<<20) > > > > #define XY_PAT_BLT_IMMEDIATE ((2<<29)|(0x72<<22)) > > > > @@ -2591,15 +2586,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > > #define XY_FAST_COPY_COLOR_DEPTH_64 (4 << 24) > > #define XY_FAST_COPY_COLOR_DEPTH_128 (5 << 24) > > > > -#define MI_STORE_DWORD_IMM ((0x20<<23)|2) > > -#define MI_MEM_VIRTUAL (1 << 22) /* 965+ only */ > > - > > -#define MI_SET_CONTEXT (0x18<<23) > > #define CTXT_NO_RESTORE (1) > > #define CTXT_PALETTE_SAVE_DISABLE (1<<3) > > #define CTXT_PALETTE_RESTORE_DISABLE (1<<2) > > > > -#define MI_SET_APPID (0x0E << 23) > > #define APPID_CTXREST_INHIBIT (1 << 9) > > #define APPID_CTXSAVE_INHIBIT (1 << 8) > > #define APPTYPE(n) ((n) << 7) > > @@ -2616,36 +2606,26 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > > #define MI_VERTEX_BUFFER_DISABLE (1) > > > > /* Overlay Flip */ > > -#define MI_OVERLAY_FLIP (0x11<<23) > > #define MI_OVERLAY_FLIP_CONTINUE (0<<21) > > #define MI_OVERLAY_FLIP_ON (1<<21) > > #define MI_OVERLAY_FLIP_OFF (2<<21) > > > > /* Wait for Events */ > > -#define MI_WAIT_FOR_EVENT (0x03<<23) > > #define MI_WAIT_FOR_PIPEB_SVBLANK (1<<18) > > #define MI_WAIT_FOR_PIPEA_SVBLANK (1<<17) > > -#define MI_WAIT_FOR_OVERLAY_FLIP (1<<16) > > #define MI_WAIT_FOR_PIPEB_VBLANK (1<<7) > > #define MI_WAIT_FOR_PIPEA_VBLANK (1<<3) > > #define MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW (1<<5) > > #define MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW (1<<1) > > > > -#define MI_LOAD_SCAN_LINES_INCL (0x12<<23) > > -#define MI_LOAD_REGISTER_IMM ((0x22 << 23) | 1) > > -#define MI_LOAD_REGISTER_REG ((0x2A << 23) | 1) > > -#define MI_LOAD_REGISTER_MEM (0x29 << 23) > > #define MI_CS_MMIO_DST (1 << 19) > > #define MI_CS_MMIO_SRC (1 << 18) > > #define MI_MMIO_REMAP_ENABLE_GEN12 (1 << 17) > > #define MI_WPARID_ENABLE_GEN12 (1 << 16) > > -#define MI_STORE_REGISTER_MEM (0x24 << 23) > > #define MI_STORE_PREDICATE_ENABLE_GEN12 (1 << 21) > > > > /* Flush */ > > -#define MI_FLUSH (0x04<<23) > > #define MI_WRITE_DIRTY_STATE (1<<4) > > -#define MI_END_SCENE (1<<3) > > #define MI_GLOBAL_SNAPSHOT_COUNT_RESET (1<<3) > > #define MI_INHIBIT_RENDER_CACHE_FLUSH (1<<2) > > #define MI_STATE_INSTRUCTION_CACHE_FLUSH (1<<1) > > @@ -2654,27 +2634,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > > #define BRW_MI_GLOBAL_SNAPSHOT_RESET (1 << 3) > > > > /* Noop */ > > -#define MI_NOOP 0x00 > > #define MI_NOOP_WRITE_ID (1<<22) > > #define MI_NOOP_ID_MASK (1<<22 - 1) > > > > -/* ARB Check */ > > -#define MI_ARB_CHECK (0x5 << 23) > > - > > #define STATE3D_COLOR_FACTOR ((0x3<<29)|(0x1d<<24)|(0x01<<16)) > > > > /* Atomics */ > > -#define MI_ATOMIC ((0x2f << 23) | 1) > > -#define MI_ATOMIC_INLINE_DATA (1 << 18) > > #define MI_ATOMIC_INC (0x5 << 8) > > #define MI_ATOMIC_ADD (0x7 << 8) > > > > /* Batch */ > > -#define MI_BATCH_BUFFER ((0x30 << 23) | 1) > > -#define MI_BATCH_BUFFER_START (0x31 << 23) > > -#define MI_BATCH_BUFFER_START_GEN8 ((0x31 << 13) | 1) > > -#define MI_BATCH_PREDICATE (1 << 15) /* HSW+ on RCS only*/ > > -#define MI_BATCH_BUFFER_END (0xA << 23) > > #define MI_COND_BATCH_BUFFER_END (0x36 << 23) > > #define MAD_GT_IDD (0 << 12) > > #define MAD_GT_OR_EQ_IDD (1 << 12) > > @@ -2682,45 +2651,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > > #define MAD_LT_OR_EQ_IDD (3 << 12) > > #define MAD_EQ_IDD (4 << 12) > > #define MAD_NEQ_IDD (5 << 12) > > -#define MI_DO_COMPARE (1 << 21) > > - > > -#define MI_BATCH_NON_SECURE (1) > > -#define MI_BATCH_NON_SECURE_I965 (1 << 8) > > -#define MI_BATCH_NON_SECURE_HSW (1<<13) /* Additional bit for RCS */ > > > > /* Math */ > > -#define MI_INSTR(opcode, flags) (((opcode) << 23) | (flags)) > > -#define MI_MATH(x) MI_INSTR(0x1a, (x) - 1) > > -#define MI_MATH_INSTR(opcode, op1, op2) ((opcode) << 20 | (op1) << 10 | (op2)) > > -/* Opcodes for MI_MATH_INSTR */ > > -#define MI_MATH_NOOP MI_MATH_INSTR(0x000, 0x0, 0x0) > > -#define MI_MATH_LOAD(op1, op2) MI_MATH_INSTR(0x080, op1, op2) > > -#define MI_MATH_LOADINV(op1, op2) MI_MATH_INSTR(0x480, op1, op2) > > -#define MI_MATH_LOAD0(op1) MI_MATH_INSTR(0x081, op1) > > -#define MI_MATH_LOAD1(op1) MI_MATH_INSTR(0x481, op1) > > -#define MI_MATH_ADD MI_MATH_INSTR(0x100, 0x0, 0x0) > > -#define MI_MATH_SUB MI_MATH_INSTR(0x101, 0x0, 0x0) > > -#define MI_MATH_AND MI_MATH_INSTR(0x102, 0x0, 0x0) > > -#define MI_MATH_OR MI_MATH_INSTR(0x103, 0x0, 0x0) > > -#define MI_MATH_XOR MI_MATH_INSTR(0x104, 0x0, 0x0) > > -#define MI_MATH_STORE(op1, op2) MI_MATH_INSTR(0x180, op1, op2) > > -#define MI_MATH_STOREINV(op1, op2) MI_MATH_INSTR(0x580, op1, op2) > > /* DG2+ */ > > #define MI_MATH_SHL MI_MATH_INSTR(0x105, 0x0, 0x0) > > #define MI_MATH_SHR MI_MATH_INSTR(0x106, 0x0, 0x0) > > #define MI_MATH_SAR MI_MATH_INSTR(0x107, 0x0, 0x0) > > > > -/* Registers used as operands in MI_MATH_INSTR */ > > -#define MI_MATH_REG(x) (x) > > -#define MI_MATH_REG_SRCA 0x20 > > -#define MI_MATH_REG_SRCB 0x21 > > -#define MI_MATH_REG_ACCU 0x31 > > -#define MI_MATH_REG_ZF 0x32 > > -#define MI_MATH_REG_CF 0x33 > > - > > -/* DG2+ */ > > -#define MI_SET_PREDICATE MI_INSTR(0x1, 0) > > - > > #define MAX_DISPLAY_PIPES 2 > > > > typedef enum { > > diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h > > index cf228c2651..e4d7c0d408 100644 > > --- a/lib/ioctl_wrappers.h > > +++ b/lib/ioctl_wrappers.h > > @@ -173,9 +173,9 @@ static inline uint64_t to_user_pointer(const void *ptr) > > * > > * Casts a 64bit value from an ioctl into a pointer. > > */ > > -static inline void *from_user_pointer(uint64_t u64) > > +static inline void *from_user_pointer(uint64_t u64p) > ------------------------------------------------- ^ > Scaffold defines u64, we need to replace this to not typedef name. > > { > > - return (void *)(uintptr_t)u64; > > + return (void *)(uintptr_t)u64p; > --------------------------------- ^ > > imho we can safely drop this change now, maybe do it in separate > code refactor as your patchset is already big. > > > } Must be done in this step. > > > > /** > > diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c > > index d74f1c9996..650d095020 100644 > > --- a/lib/rendercopy_gen9.c > > +++ b/lib/rendercopy_gen9.c > > @@ -967,10 +967,7 @@ static void gen8_emit_primitive(struct intel_bb *ibb, uint32_t offset) > > intel_bb_out(ibb, 0); /* index buffer offset, ignored */ > > } > > > > -#define GFX_OP_PIPE_CONTROL ((3 << 29) | (3 << 27) | (2 << 24)) > > -#define PIPE_CONTROL_CS_STALL (1 << 20) > > #define PIPE_CONTROL_RENDER_TARGET_FLUSH (1 << 12) > > -#define PIPE_CONTROL_FLUSH_ENABLE (1 << 7) > > #define PIPE_CONTROL_DATA_CACHE_INVALIDATE (1 << 5) > > #define PIPE_CONTROL_PROTECTEDPATH_DISABLE (1 << 27) > > #define PIPE_CONTROL_PROTECTEDPATH_ENABLE (1 << 22) > > @@ -986,7 +983,7 @@ static void gen12_emit_pxp_state(struct intel_bb *ibb, bool enable, > > > > if (enable) { > > pipe_ctl_flags = PIPE_CONTROL_FLUSH_ENABLE; > > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL); > > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(2)); > > intel_bb_out(ibb, pipe_ctl_flags); > > > > set_app_id = MI_SET_APPID | > > @@ -1005,7 +1002,7 @@ static void gen12_emit_pxp_state(struct intel_bb *ibb, bool enable, > > PIPE_CONTROL_RENDER_TARGET_FLUSH | > > PIPE_CONTROL_DATA_CACHE_INVALIDATE | > > PIPE_CONTROL_POST_SYNC_OP); > > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | 4); > > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(6)); > > intel_bb_out(ibb, pipe_ctl_flags); > > intel_bb_emit_reloc(ibb, ibb->handle, 0, I915_GEM_DOMAIN_COMMAND, > > (enable ? pxp_write_op_offset : (pxp_write_op_offset+8)), > > @@ -1107,7 +1104,7 @@ void _gen9_render_op(struct intel_bb *ibb, > > > > if (fast_clear) { > > for (int i = 0; i < 4; i++) { > > - intel_bb_out(ibb, MI_STORE_DWORD_IMM); > > + intel_bb_out(ibb, MI_STORE_DWORD_IMM_GEN4); > > intel_bb_emit_reloc(ibb, dst->handle, > > I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, > > dst->cc.offset + i*sizeof(float), > > diff --git a/tests/i915/api_intel_bb.c b/tests/i915/api_intel_bb.c > > index 7ccc00aa25..46633b0385 100644 > > --- a/tests/i915/api_intel_bb.c > > +++ b/tests/i915/api_intel_bb.c > > @@ -1154,7 +1154,7 @@ static void delta_check(struct buf_ops *bops) > > intel_bb_add_object(ibb, buf->handle, intel_buf_bo_size(buf), > > buf->addr.offset, 0, false); > > > > - intel_bb_out(ibb, MI_STORE_DWORD_IMM); > > + intel_bb_out(ibb, MI_STORE_DWORD_IMM_GEN4); > > intel_bb_emit_reloc(ibb, buf->handle, > > I915_GEM_DOMAIN_RENDER, > > I915_GEM_DOMAIN_RENDER, > > diff --git a/tests/i915/gem_blits.c b/tests/i915/gem_blits.c > > index d9296cf2d1..9ea3925c38 100644 > > --- a/tests/i915/gem_blits.c > > +++ b/tests/i915/gem_blits.c > > @@ -27,8 +27,6 @@ > > #include "igt.h" > > #include "igt_x86.h" > > > > -#define MI_FLUSH_DW (0x26 << 23) > > - > > #define BCS_SWCTRL 0x22200 > > #define BCS_SRC_Y (1 << 0) > > #define BCS_DST_Y (1 << 1) > > @@ -198,7 +196,7 @@ static void buffer_set_tiling(const struct device *device, > > if ((tiling | buffer->tiling) >= I915_TILING_Y) { > > unsigned int mask; > > > > - batch[i++] = MI_LOAD_REGISTER_IMM; > > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > > batch[i++] = BCS_SWCTRL; > > > > mask = (BCS_SRC_Y | BCS_DST_Y) << 16; > > @@ -248,12 +246,12 @@ static void buffer_set_tiling(const struct device *device, > > > > if ((tiling | buffer->tiling) >= I915_TILING_Y) { > > igt_assert(device->gen >= 6); > > - batch[i++] = MI_FLUSH_DW | 2; > > + batch[i++] = MI_FLUSH_DW_CMD | 2; > > batch[i++] = 0; > > batch[i++] = 0; > > batch[i++] = 0; > > > > - batch[i++] = MI_LOAD_REGISTER_IMM; > > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > > batch[i++] = BCS_SWCTRL; > > batch[i++] = (BCS_SRC_Y | BCS_DST_Y) << 16; > > } > > @@ -345,7 +343,7 @@ static bool blit_to_linear(const struct device *device, > > if (buffer->tiling >= I915_TILING_Y) { > > unsigned int mask; > > > > - batch[i++] = MI_LOAD_REGISTER_IMM; > > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > > batch[i++] = BCS_SWCTRL; > > > > mask = (BCS_SRC_Y | BCS_DST_Y) << 16; > > @@ -388,12 +386,12 @@ static bool blit_to_linear(const struct device *device, > > > > if (buffer->tiling >= I915_TILING_Y) { > > igt_assert(device->gen >= 6); > > - batch[i++] = MI_FLUSH_DW | 2; > > + batch[i++] = MI_FLUSH_DW_CMD | 2; > > batch[i++] = 0; > > batch[i++] = 0; > > batch[i++] = 0; > > > > - batch[i++] = MI_LOAD_REGISTER_IMM; > > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > > batch[i++] = BCS_SWCTRL; > > batch[i++] = (BCS_SRC_Y | BCS_DST_Y) << 16; > > } > > @@ -678,7 +676,7 @@ blit(const struct device *device, > > if ((src->tiling | dst->tiling) >= I915_TILING_Y) { > > unsigned int mask; > > > > - batch[i++] = MI_LOAD_REGISTER_IMM; > > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > > batch[i++] = BCS_SWCTRL; > > > > mask = (BCS_SRC_Y | BCS_DST_Y) << 16; > > @@ -729,12 +727,12 @@ blit(const struct device *device, > > > > if ((src->tiling | dst->tiling) >= I915_TILING_Y) { > > igt_assert(device->gen >= 6); > > - batch[i++] = MI_FLUSH_DW | 2; > > + batch[i++] = MI_FLUSH_DW_CMD | 2; > > batch[i++] = 0; > > batch[i++] = 0; > > batch[i++] = 0; > > > > - batch[i++] = MI_LOAD_REGISTER_IMM; > > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > > batch[i++] = BCS_SWCTRL; > > batch[i++] = (BCS_SRC_Y | BCS_DST_Y) << 16; > > } > > diff --git a/tests/i915/gem_busy.c b/tests/i915/gem_busy.c > > index f11fa877d3..08a500a9ec 100644 > > --- a/tests/i915/gem_busy.c > > +++ b/tests/i915/gem_busy.c > > @@ -235,10 +235,10 @@ static void one(int fd, const intel_ctx_t *ctx, > > > > static void xchg_u32(void *array, unsigned i, unsigned j) > > { > > - uint32_t *u32 = array; > > - uint32_t tmp = u32[i]; > > - u32[i] = u32[j]; > > - u32[j] = tmp; > > + uint32_t *ui32 = array; > > + uint32_t tmp = ui32[i]; > > + ui32[i] = ui32[j]; > > + ui32[j] = tmp; > > imho this is also change which can be done in code cleanup, > not in your patchset. > Same issue with typedef. > > } > > > > static void close_race(int fd, const intel_ctx_t *ctx) > > diff --git a/tests/i915/gem_ccs.c b/tests/i915/gem_ccs.c > > index b7e8bda71b..44e35ee9b0 100644 > > --- a/tests/i915/gem_ccs.c > > +++ b/tests/i915/gem_ccs.c > > @@ -137,7 +137,7 @@ static void surf_copy(int i915, > > surf.i915 = i915; > > surf.print_bb = param.print_bb; > > set_surf_object(&surf.src, mid->handle, mid->region, mid->size, > > - uc_mocs, INDIRECT_ACCESS); > > + uc_mocs, BLT_INDIRECT_ACCESS); > > set_surf_object(&surf.dst, ccs, REGION_SMEM, ccssize, > > uc_mocs, DIRECT_ACCESS); > > bb_size = 4096; > > diff --git a/tests/i915/gem_ctx_shared.c b/tests/i915/gem_ctx_shared.c > > index 18d8cc013d..3d73db581c 100644 > > --- a/tests/i915/gem_ctx_shared.c > > +++ b/tests/i915/gem_ctx_shared.c > > @@ -309,7 +309,7 @@ static void exec_shared_gtt(int i915, const intel_ctx_cfg_t *cfg, > > batch = gem_create(i915, 4096); > > > > i = 0; > > - cs[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + cs[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > cs[++i] = obj.offset; > > cs[++i] = obj.offset >> 32; > > @@ -564,7 +564,7 @@ static void store_dword(int i915, uint64_t ahnd, const intel_ctx_t *ctx, > > obj[2].relocation_count = !ahnd ? 1 : 0; > > > > i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = reloc.presumed_offset + reloc.delta; > > batch[++i] = 0; > > diff --git a/tests/i915/gem_exec_async.c b/tests/i915/gem_exec_async.c > > index d50fe45ec5..173bc4648a 100644 > > --- a/tests/i915/gem_exec_async.c > > +++ b/tests/i915/gem_exec_async.c > > @@ -73,7 +73,7 @@ static void store_dword(int fd, int id, const intel_ctx_t *ctx, > > obj[1].relocation_count = !id ? 1 : 0; > > > > i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = target_offset + offset; > > batch[++i] = (target_offset + offset) >> 32; > > diff --git a/tests/i915/gem_exec_balancer.c b/tests/i915/gem_exec_balancer.c > > index d7acdca190..1c655e583c 100644 > > --- a/tests/i915/gem_exec_balancer.c > > +++ b/tests/i915/gem_exec_balancer.c > > @@ -41,15 +41,6 @@ > > > > IGT_TEST_DESCRIPTION("Exercise in-kernel load-balancing"); > > > > -#define MI_SEMAPHORE_WAIT (0x1c << 23) > > -#define MI_SEMAPHORE_POLL (1 << 15) > > -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > > -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > > -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > > -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > > -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > > -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > > - > > #define INSTANCE_COUNT (1 << I915_PMU_SAMPLE_INSTANCE_BITS) > > > > static size_t sizeof_load_balance(int count) > > @@ -589,7 +580,7 @@ static uint32_t create_semaphore_to_spinner(int i915, igt_spin_t *spin) > > > > /* Wait until the spinner is running */ > > addr = spin->obj[0].offset + 4 * SPIN_POLL_START_IDX; > > - *cs++ = MI_SEMAPHORE_WAIT | > > + *cs++ = MI_SEMAPHORE_WAIT_CMD | > > MI_SEMAPHORE_POLL | > > MI_SEMAPHORE_SAD_NEQ_SDD | > > (4 - 2); > > @@ -600,7 +591,7 @@ static uint32_t create_semaphore_to_spinner(int i915, igt_spin_t *spin) > > /* Then cancel the spinner */ > > addr = spin->obj[IGT_SPIN_BATCH].offset + > > offset_in_page(spin->condition); > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > *cs++ = addr; > > *cs++ = addr >> 32; > > *cs++ = MI_BATCH_BUFFER_END; > > @@ -1116,7 +1107,7 @@ static uint32_t sync_from(int i915, uint32_t addr, uint32_t target) > > cs = map = gem_mmap__device_coherent(i915, handle, 0, 4096, PROT_WRITE); > > > > /* cancel target spinner */ > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > *cs++ = target + 64; > > *cs++ = 0; > > *cs++ = 0; > > @@ -1131,7 +1122,7 @@ static uint32_t sync_from(int i915, uint32_t addr, uint32_t target) > > *cs++ = 0; > > > > /* self-heal */ > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > *cs++ = addr + 64; > > *cs++ = 0; > > *cs++ = MI_BATCH_BUFFER_START | 1 << 8 | 1; > > @@ -1162,13 +1153,13 @@ static uint32_t sync_to(int i915, uint32_t addr, uint32_t target) > > *cs++ = MI_NOOP; > > > > /* cancel their spin as a compliment */ > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > *cs++ = target + 64; > > *cs++ = 0; > > *cs++ = 0; > > > > /* self-heal */ > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > *cs++ = addr + 64; > > *cs++ = 0; > > *cs++ = MI_BATCH_BUFFER_START | 1 << 8 | 1; > > @@ -1906,7 +1897,7 @@ static uint32_t sema_create(int i915, uint64_t addr, uint32_t **x) > > for (int n = 1; n <= 32; n++) { > > uint32_t *cs = *x + n * 16; > > > > - *cs++ = MI_SEMAPHORE_WAIT | > > + *cs++ = MI_SEMAPHORE_WAIT_CMD | > > MI_SEMAPHORE_POLL | > > MI_SEMAPHORE_SAD_GTE_SDD | > > (4 - 2); > > diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c > > index 2db58266fd..d0499a8312 100644 > > --- a/tests/i915/gem_exec_capture.c > > +++ b/tests/i915/gem_exec_capture.c > > @@ -308,7 +308,7 @@ static void __capture1(int fd, int dir, uint64_t ahnd, const intel_ctx_t *ctx, > > I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); > > > > i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = obj[SCRATCH].offset; > > batch[++i] = obj[SCRATCH].offset >> 32; > > @@ -498,7 +498,7 @@ __captureN(int fd, int dir, uint64_t ahnd, const intel_ctx_t *ctx, > > I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); > > > > i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = obj[0].offset; > > batch[++i] = obj[0].offset >> 32; > > diff --git a/tests/i915/gem_exec_endless.c b/tests/i915/gem_exec_endless.c > > index 2c56cc2120..77719de83b 100644 > > --- a/tests/i915/gem_exec_endless.c > > +++ b/tests/i915/gem_exec_endless.c > > @@ -33,15 +33,6 @@ > > > > #define MAX_ENGINES 64 > > > > -#define MI_SEMAPHORE_WAIT (0x1c << 23) > > -#define MI_SEMAPHORE_POLL (1 << 15) > > -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > > -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > > -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > > -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > > -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > > -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > > - > > static uint32_t batch_create(int i915) > > { > > const uint32_t bbe = MI_BATCH_BUFFER_END; > > @@ -133,7 +124,7 @@ static void __supervisor_run(struct supervisor *sv) > > > > sv->semaphore = cs + 1000; > > > > - *cs++ = MI_SEMAPHORE_WAIT | > > + *cs++ = MI_SEMAPHORE_WAIT_CMD | > > MI_SEMAPHORE_POLL | > > MI_SEMAPHORE_SAD_EQ_SDD | > > (4 - 2); > > @@ -142,7 +133,7 @@ static void __supervisor_run(struct supervisor *sv) > > *cs++ = 0; > > > > sv->terminate = cs; > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > *cs++ = offset_in_page(sv->semaphore); > > *cs++ = 0; > > *cs++ = 0; > > diff --git a/tests/i915/gem_exec_fair.c b/tests/i915/gem_exec_fair.c > > index 93a138ba47..8208ab404e 100644 > > --- a/tests/i915/gem_exec_fair.c > > +++ b/tests/i915/gem_exec_fair.c > > @@ -131,7 +131,7 @@ static void delay(int i915, > > > > cs = map = gem_mmap__device_coherent(i915, handle, 0, 4096, PROT_WRITE); > > > > - *cs++ = MI_LOAD_REGISTER_IMM; > > + *cs++ = MI_LOAD_REGISTER_IMM(1); > > *cs++ = CS_GPR(START_TS) + 4; > > *cs++ = 0; > > *cs++ = MI_LOAD_REGISTER_REG; > > @@ -144,7 +144,7 @@ static void delay(int i915, > > > > *cs++ = 0x5 << 23; /* MI_ARB_CHECK */ > > > > - *cs++ = MI_LOAD_REGISTER_IMM; > > + *cs++ = MI_LOAD_REGISTER_IMM(1); > > *cs++ = CS_GPR(NOW_TS) + 4; > > *cs++ = 0; > > *cs++ = MI_LOAD_REGISTER_REG; > > @@ -166,7 +166,7 @@ static void delay(int i915, > > > > /* Delay between SRM and COND_BBE to post the writes */ > > for (int n = 0; n < 8; n++) { > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > if (use_64b) { > > *cs++ = addr + 4064; > > *cs++ = addr >> 32; > > @@ -244,25 +244,25 @@ static void tslog(int i915, > > *cs++ = addr >> 32; > > > > /* Load the address + inc & mask variables */ > > - *cs++ = MI_LOAD_REGISTER_IMM; > > + *cs++ = MI_LOAD_REGISTER_IMM(1); > > *cs++ = CS_GPR(ADDR); > > addr_lo = cs; > > *cs++ = addr; > > - *cs++ = MI_LOAD_REGISTER_IMM; > > + *cs++ = MI_LOAD_REGISTER_IMM(1); > > *cs++ = CS_GPR(ADDR) + 4; > > *cs++ = addr >> 32; > > > > - *cs++ = MI_LOAD_REGISTER_IMM; > > + *cs++ = MI_LOAD_REGISTER_IMM(1); > > *cs++ = CS_GPR(INC); > > *cs++ = 4; > > - *cs++ = MI_LOAD_REGISTER_IMM; > > + *cs++ = MI_LOAD_REGISTER_IMM(1); > > *cs++ = CS_GPR(INC) + 4; > > *cs++ = 0; > > > > - *cs++ = MI_LOAD_REGISTER_IMM; > > + *cs++ = MI_LOAD_REGISTER_IMM(1); > > *cs++ = CS_GPR(MASK); > > *cs++ = 0xfffff7ff; > > - *cs++ = MI_LOAD_REGISTER_IMM; > > + *cs++ = MI_LOAD_REGISTER_IMM(1); > > *cs++ = CS_GPR(MASK) + 4; > > *cs++ = 0xffffffff; > > > > diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c > > index 6bf1cdb577..c2d874f84b 100644 > > --- a/tests/i915/gem_exec_fence.c > > +++ b/tests/i915/gem_exec_fence.c > > @@ -50,15 +50,6 @@ struct sync_merge_data { > > #define SYNC_IOC_MERGE _IOWR(SYNC_IOC_MAGIC, 3, struct sync_merge_data) > > #endif > > > > -#define MI_SEMAPHORE_WAIT (0x1c << 23) > > -#define MI_SEMAPHORE_POLL (1 << 15) > > -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > > -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > > -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > > -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > > -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > > -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > > - > > static bool fence_busy(int fence) > > { > > return poll(&(struct pollfd){fence, POLLIN}, 1, 0) == 0; > > @@ -345,7 +336,7 @@ static uint32_t timeslicing_batches(int i915, uint32_t *offset) > > for (int step = 0; step < 8; step++) { > > if (pair) { > > cs[i++] = > > - MI_SEMAPHORE_WAIT | > > + MI_SEMAPHORE_WAIT_CMD | > > MI_SEMAPHORE_POLL | > > MI_SEMAPHORE_SAD_EQ_SDD | > > (4 - 2); > > @@ -354,14 +345,14 @@ static uint32_t timeslicing_batches(int i915, uint32_t *offset) > > cs[i++] = 0; > > } > > > > - cs[i++] = MI_STORE_DWORD_IMM; > > + cs[i++] = MI_STORE_DWORD_IMM_GEN4; > > cs[i++] = *offset; > > cs[i++] = 0; > > cs[i++] = x++; > > > > if (!pair) { > > cs[i++] = > > - MI_SEMAPHORE_WAIT | > > + MI_SEMAPHORE_WAIT_CMD | > > MI_SEMAPHORE_POLL | > > MI_SEMAPHORE_SAD_EQ_SDD | > > (4 - 2); > > @@ -452,7 +443,7 @@ static uint32_t submitN_batches(int i915, uint32_t offset, int count) > > > > for (int step = 0; step < 8; step++) { > > cs[i++] = > > - MI_SEMAPHORE_WAIT | > > + MI_SEMAPHORE_WAIT_CMD | > > MI_SEMAPHORE_POLL | > > MI_SEMAPHORE_SAD_EQ_SDD | > > (4 - 2); > > @@ -460,7 +451,7 @@ static uint32_t submitN_batches(int i915, uint32_t offset, int count) > > cs[i++] = offset; > > cs[i++] = 0; > > > > - cs[i++] = MI_STORE_DWORD_IMM; > > + cs[i++] = MI_STORE_DWORD_IMM_GEN4; > > cs[i++] = offset; > > cs[i++] = 0; > > cs[i++] = x + 1; > > @@ -606,7 +597,7 @@ static void test_parallel(int i915, const intel_ctx_t *ctx, > > } > > > > i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = scratch_offset + reloc.delta; > > batch[++i] = scratch_offset >> 32; > > @@ -726,7 +717,7 @@ static void test_concurrent(int i915, const intel_ctx_t *ctx, > > close(fence); > > > > i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = target_offset + reloc.delta; > > batch[++i] = target_offset >> 32; > > @@ -2464,21 +2455,21 @@ build_wait_bb(int i915, > > map = gem_mmap__device_coherent(i915, obj.handle, 0, 4096, PROT_WRITE); > > bb = map; > > > > - *bb++ = MI_LOAD_REGISTER_IMM; > > + *bb++ = MI_LOAD_REGISTER_IMM(1); > > *bb++ = mmio_base + HSW_CS_GPR(0); > > *bb++ = wait_value & 0xffffffff; > > - *bb++ = MI_LOAD_REGISTER_IMM; > > + *bb++ = MI_LOAD_REGISTER_IMM(1); > > *bb++ = mmio_base + HSW_CS_GPR(0) + 4; > > *bb++ = wait_value >> 32; > > > > *bb++ = MI_LOAD_REGISTER_REG; > > *bb++ = mmio_base + RING_TIMESTAMP; > > *bb++ = mmio_base + HSW_CS_GPR(1); > > - *bb++ = MI_LOAD_REGISTER_IMM; > > + *bb++ = MI_LOAD_REGISTER_IMM(1); > > *bb++ = mmio_base + HSW_CS_GPR(1) + 4; > > *bb++ = 0; > > > > - *bb++ = MI_LOAD_REGISTER_IMM; > > + *bb++ = MI_LOAD_REGISTER_IMM(1); > > *bb++ = mmio_base + HSW_CS_GPR(2) + 4; > > *bb++ = 0; > > relocs->delta = offset_in_page(bb); > > @@ -2563,23 +2554,23 @@ static void build_increment_engine_bb(struct inter_engine_batches *batch, > > { > > uint32_t *bb = batch->increment_bb = calloc(1, 4096); > > > > - *bb++ = MI_LOAD_REGISTER_MEM | 2; > > + *bb++ = MI_LOAD_REGISTER_MEM_CMD | 2; > > *bb++ = mmio_base + HSW_CS_GPR(0); > > batch->read0_ptrs[0] = bb; > > *bb++ = 0; > > *bb++ = 0; > > - *bb++ = MI_LOAD_REGISTER_MEM | 2; > > + *bb++ = MI_LOAD_REGISTER_MEM_CMD | 2; > > *bb++ = mmio_base + HSW_CS_GPR(0) + 4; > > batch->read0_ptrs[1] = bb; > > *bb++ = 0; > > *bb++ = 0; > > > > - *bb++ = MI_LOAD_REGISTER_MEM | 2; > > + *bb++ = MI_LOAD_REGISTER_MEM_CMD | 2; > > *bb++ = mmio_base + HSW_CS_GPR(1); > > batch->read1_ptrs[0] = bb; > > *bb++ = 0; > > *bb++ = 0; > > - *bb++ = MI_LOAD_REGISTER_MEM | 2; > > + *bb++ = MI_LOAD_REGISTER_MEM_CMD | 2; > > *bb++ = mmio_base + HSW_CS_GPR(1) + 4; > > batch->read1_ptrs[1] = bb; > > *bb++ = 0; > > @@ -2591,12 +2582,12 @@ static void build_increment_engine_bb(struct inter_engine_batches *batch, > > *bb++ = MI_MATH_ADD; > > *bb++ = MI_MATH_STORE(MI_MATH_REG(0), MI_MATH_REG_ACCU); > > > > - *bb++ = MI_STORE_REGISTER_MEM | 2; > > + *bb++ = MI_STORE_REGISTER_MEM_GEN8; > > *bb++ = mmio_base + HSW_CS_GPR(0); > > batch->write_ptrs[0] = bb; > > *bb++ = 0; > > *bb++ = 0; > > - *bb++ = MI_STORE_REGISTER_MEM | 2; > > + *bb++ = MI_STORE_REGISTER_MEM_GEN8; > > *bb++ = mmio_base + HSW_CS_GPR(0) + 4; > > batch->write_ptrs[1] = bb; > > *bb++ = 0; > > diff --git a/tests/i915/gem_exec_flush.c b/tests/i915/gem_exec_flush.c > > index 40c58db2bb..bb120e0d6c 100644 > > --- a/tests/i915/gem_exec_flush.c > > +++ b/tests/i915/gem_exec_flush.c > > @@ -208,7 +208,7 @@ static void run(int fd, unsigned ring, int nchild, int timeout, > > reloc0[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > > > offset = obj[0].offset + reloc0[i].delta; > > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > *b++ = offset; > > *b++ = offset >> 32; > > @@ -242,7 +242,7 @@ static void run(int fd, unsigned ring, int nchild, int timeout, > > reloc1[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > > > offset = obj[0].offset + reloc1[i].delta; > > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > *b++ = offset; > > *b++ = offset >> 32; > > @@ -496,7 +496,7 @@ static void batch(int fd, unsigned ring, int nchild, int timeout, > > reloc.delta = i * sizeof(uint32_t); > > > > offset = reloc.presumed_offset + reloc.delta; > > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > *b++ = offset; > > *b++ = offset >> 32; > > diff --git a/tests/i915/gem_exec_gttfill.c b/tests/i915/gem_exec_gttfill.c > > index 137277fe53..d6c8f21920 100644 > > --- a/tests/i915/gem_exec_gttfill.c > > +++ b/tests/i915/gem_exec_gttfill.c > > @@ -70,7 +70,7 @@ static void submit(int fd, uint64_t ahnd, unsigned int gen, > > reloc[1].read_domains = I915_GEM_DOMAIN_INSTRUCTION; > > > > n = 0; > > - batch[n] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[n] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[n] |= 1 << 21; > > batch[n]++; > > diff --git a/tests/i915/gem_exec_nop.c b/tests/i915/gem_exec_nop.c > > index f35cc8401f..497f57f082 100644 > > --- a/tests/i915/gem_exec_nop.c > > +++ b/tests/i915/gem_exec_nop.c > > @@ -144,7 +144,7 @@ static void poll_ring(int fd, const intel_ctx_t *ctx, > > r->delta = 4092; > > r->read_domains = I915_GEM_DOMAIN_RENDER; > > > > - *b = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + *b = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > *++b = r->delta; > > *++b = 0; > > @@ -272,7 +272,7 @@ static void poll_sequential(int fd, const intel_ctx_t *ctx, > > r->read_domains = I915_GEM_DOMAIN_RENDER; > > r->write_domain = I915_GEM_DOMAIN_RENDER; > > > > - *b = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + *b = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > *++b = r->delta; > > *++b = 0; > > diff --git a/tests/i915/gem_exec_parallel.c b/tests/i915/gem_exec_parallel.c > > index 429620884b..705b22cb9f 100644 > > --- a/tests/i915/gem_exec_parallel.c > > +++ b/tests/i915/gem_exec_parallel.c > > @@ -92,7 +92,7 @@ static void *thread(void *data) > > } > > > > i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (t->gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (t->gen < 6 ? 1 << 22 : 0); > > if (t->gen >= 8) { > > batch[++i] = 4*t->id; > > batch[++i] = 0; > > diff --git a/tests/i915/gem_exec_params.c b/tests/i915/gem_exec_params.c > > index fd86afa16d..d0805d330f 100644 > > --- a/tests/i915/gem_exec_params.c > > +++ b/tests/i915/gem_exec_params.c > > @@ -120,7 +120,7 @@ static void test_batch_first(int fd) > > map = gem_mmap__cpu(fd, obj[0].handle, 0, 4096, PROT_WRITE); > > gem_set_domain(fd, obj[0].handle, > > I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); > > - map[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + map[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > map[++i] = obj[1].offset; > > map[++i] = obj[1].offset >> 32; > > @@ -152,7 +152,7 @@ static void test_batch_first(int fd) > > map = gem_mmap__cpu(fd, obj[2].handle, 0, 4096, PROT_WRITE); > > gem_set_domain(fd, obj[2].handle, > > I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); > > - map[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + map[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > map[++i] = obj[1].offset; > > map[++i] = obj[1].offset >> 32; > > diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c > > index 7a354a32a1..3ce89ca649 100644 > > --- a/tests/i915/gem_exec_reloc.c > > +++ b/tests/i915/gem_exec_reloc.c > > @@ -79,7 +79,7 @@ static void write_dword(int fd, > > obj[1].handle = gem_create(fd, 4096); > > > > i = 0; > > - buf[i++] = MI_STORE_DWORD_IMM | (gen < 6 ? 1<<22 : 0); > > + buf[i++] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1<<22 : 0); > > if (gen >= 8) { > > buf[i++] = target_offset; > > buf[i++] = target_offset >> 32; > > @@ -314,7 +314,7 @@ static void active(int fd, const intel_ctx_t *ctx, unsigned engine) > > for (pass = 0; pass < 1024; pass++) { > > uint32_t batch[16]; > > int i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = 0; > > batch[++i] = 0; > > @@ -526,17 +526,6 @@ static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags) > > gem_close(fd, obj.handle); > > } > > > > -static inline uint64_t sign_extend(uint64_t x, int index) > > -{ > > - int shift = 63 - index; > > - return (int64_t)(x << shift) >> shift; > > -} > > - > > -static uint64_t gen8_canonical_address(uint64_t address) > > -{ > > - return sign_extend(address, 47); > > -} > > - > > static void basic_range(int fd, unsigned flags) > > { > > struct drm_i915_gem_relocation_entry reloc[128]; > > @@ -563,7 +552,7 @@ static void basic_range(int fd, unsigned flags) > > for (int i = 0; i <= count; i++) { > > obj[n].handle = gem_create(fd, 4096); > > obj[n].offset = (1ull << (i + 12)) - 4096; > > - obj[n].offset = gen8_canonical_address(obj[n].offset); > > + obj[n].offset = gen8_canonical_addr(obj[n].offset); > > obj[n].flags = EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS; > > gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe)); > > execbuf.buffers_ptr = to_user_pointer(&obj[n]); > > @@ -583,7 +572,7 @@ static void basic_range(int fd, unsigned flags) > > for (int i = 1; i < count; i++) { > > obj[n].handle = gem_create(fd, 4096); > > obj[n].offset = 1ull << (i + 12); > > - obj[n].offset = gen8_canonical_address(obj[n].offset); > > + obj[n].offset = gen8_canonical_addr(obj[n].offset); > > obj[n].flags = EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS; > > gem_write(fd, obj[n].handle, 0, &bbe, sizeof(bbe)); > > execbuf.buffers_ptr = to_user_pointer(&obj[n]); > > @@ -714,10 +703,10 @@ static int flags_to_index(const struct intel_execution_engine2 *e) > > > > static void xchg_u32(void *array, unsigned i, unsigned j) > > { > > - uint32_t *u32 = array; > > - uint32_t tmp = u32[i]; > > - u32[i] = u32[j]; > > - u32[j] = tmp; > > + uint32_t *ui32 = array; > > + uint32_t tmp = ui32[i]; > > + ui32[i] = ui32[j]; > > + ui32[j] = tmp; > > Drop this change to separate code cleanup/refactor. > Ditto. > > } > > > > static void concurrent_child(int i915, const intel_ctx_t *ctx, > > @@ -790,7 +779,7 @@ static uint32_t create_concurrent_batch(int i915, unsigned int count) > > uint32_t *map, *cs; > > uint32_t cmd; > > > > - cmd = MI_STORE_DWORD_IMM; > > + cmd = MI_STORE_DWORD_IMM_GEN4; > > if (gen < 6) > > cmd |= 1 << 22; > > if (gen < 4) > > diff --git a/tests/i915/gem_exec_schedule.c b/tests/i915/gem_exec_schedule.c > > index 58b118c79e..ab1dd7749b 100644 > > --- a/tests/i915/gem_exec_schedule.c > > +++ b/tests/i915/gem_exec_schedule.c > > @@ -55,15 +55,6 @@ > > #define MAX_CONTEXTS 1024 > > #define MAX_ELSP_QLEN 16 > > > > -#define MI_SEMAPHORE_WAIT (0x1c << 23) > > -#define MI_SEMAPHORE_POLL (1 << 15) > > -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > > -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > > -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > > -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > > -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > > -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > > - > > IGT_TEST_DESCRIPTION("Check that we can control the order of execution"); > > > > static unsigned int offset_in_page(void *addr) > > @@ -148,7 +139,7 @@ static uint32_t __store_dword(int fd, uint64_t ahnd, const intel_ctx_t *ctx, > > obj[2].relocation_count = !ahnd ? 1 : 0; > > > > i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = reloc.presumed_offset + reloc.delta; > > batch[++i] = (reloc.presumed_offset + reloc.delta) >> 32; > > @@ -521,7 +512,7 @@ static uint32_t timeslicing_batches(int i915, uint32_t *offset) > > for (int step = 0; step < 8; step++) { > > if (pair) { > > cs[i++] = > > - MI_SEMAPHORE_WAIT | > > + MI_SEMAPHORE_WAIT_CMD | > > MI_SEMAPHORE_POLL | > > MI_SEMAPHORE_SAD_EQ_SDD | > > (4 - 2); > > @@ -530,14 +521,14 @@ static uint32_t timeslicing_batches(int i915, uint32_t *offset) > > cs[i++] = 0; > > } > > > > - cs[i++] = MI_STORE_DWORD_IMM; > > + cs[i++] = MI_STORE_DWORD_IMM_GEN4; > > cs[i++] = *offset; > > cs[i++] = 0; > > cs[i++] = x++; > > > > if (!pair) { > > cs[i++] = > > - MI_SEMAPHORE_WAIT | > > + MI_SEMAPHORE_WAIT_CMD | > > MI_SEMAPHORE_POLL | > > MI_SEMAPHORE_SAD_EQ_SDD | > > (4 - 2); > > @@ -629,7 +620,7 @@ static uint32_t timesliceN_batches(int i915, uint32_t offset, int count) > > > > for (int step = 0; step < 8; step++) { > > cs[i++] = > > - MI_SEMAPHORE_WAIT | > > + MI_SEMAPHORE_WAIT_CMD | > > MI_SEMAPHORE_POLL | > > MI_SEMAPHORE_SAD_EQ_SDD | > > (4 - 2); > > @@ -637,7 +628,7 @@ static uint32_t timesliceN_batches(int i915, uint32_t offset, int count) > > cs[i++] = offset; > > cs[i++] = 0; > > > > - cs[i++] = MI_STORE_DWORD_IMM; > > + cs[i++] = MI_STORE_DWORD_IMM_GEN4; > > cs[i++] = offset; > > cs[i++] = 0; > > cs[i++] = x + 1; > > @@ -797,7 +788,7 @@ static void cancel_spinner(int i915, > > map = gem_mmap__device_coherent(i915, obj.handle, 0, 4096, PROT_WRITE); > > cs = map; > > > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > *cs++ = spin->obj[IGT_SPIN_BATCH].offset + > > offset_in_page(spin->condition); > > *cs++ = spin->obj[IGT_SPIN_BATCH].offset >> 32; > > @@ -1108,13 +1099,13 @@ static void semaphore_resolve(int i915, const intel_ctx_cfg_t *cfg, > > cs = map = gem_mmap__cpu(i915, handle, 0, 4096, PROT_WRITE); > > > > /* Set semaphore initially to 1 for polling and signaling */ > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > *cs++ = SEMAPHORE_ADDR; > > *cs++ = 0; > > *cs++ = 1; > > > > /* Wait until another batch writes to our semaphore */ > > - *cs++ = MI_SEMAPHORE_WAIT | > > + *cs++ = MI_SEMAPHORE_WAIT_CMD | > > MI_SEMAPHORE_POLL | > > MI_SEMAPHORE_SAD_EQ_SDD | > > (4 - 2); > > @@ -1123,7 +1114,7 @@ static void semaphore_resolve(int i915, const intel_ctx_cfg_t *cfg, > > *cs++ = 0; > > > > /* Then cancel the spinner */ > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > *cs++ = spin->obj[IGT_SPIN_BATCH].offset + > > offset_in_page(spin->condition); > > *cs++ = 0; > > @@ -1161,7 +1152,7 @@ static void semaphore_resolve(int i915, const intel_ctx_cfg_t *cfg, > > /* Now the semaphore is spinning, cancel it */ > > cancel = gem_create(i915, 4096); > > cs = map = gem_mmap__cpu(i915, cancel, 0, 4096, PROT_WRITE); > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > *cs++ = SEMAPHORE_ADDR; > > *cs++ = 0; > > *cs++ = 0; > > @@ -1203,7 +1194,7 @@ static void semaphore_noskip(int i915, const intel_ctx_cfg_t *cfg, > > const intel_ctx_t *ctx0, *ctx1; > > uint64_t ahnd; > > > > - igt_require(gen >= 6); /* MI_STORE_DWORD_IMM convenience */ > > + igt_require(gen >= 6); /* MI_STORE_DWORD_IMM_GEN4 convenience */ > > > > ctx0 = intel_ctx_create(i915, cfg); > > ctx1 = intel_ctx_create(i915, cfg); > > @@ -1233,7 +1224,7 @@ static void semaphore_noskip(int i915, const intel_ctx_cfg_t *cfg, > > cs = map = gem_mmap__cpu(i915, handle, 0, 4096, PROT_WRITE); > > > > /* Cancel the following spinner */ > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > if (gen >= 8) { > > *cs++ = spin->obj[IGT_SPIN_BATCH].offset + > > offset_in_page(spin->condition); > > @@ -1359,14 +1350,14 @@ noreorder(int i915, const intel_ctx_cfg_t *cfg, > > addr = spin->obj[IGT_SPIN_BATCH].offset + > > offset_in_page(spin->condition); > > if (gen >= 8) { > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > *cs++ = addr; > > addr >>= 32; > > } else if (gen >= 4) { > > - *cs++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + *cs++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > *cs++ = 0; > > } else { > > - *cs++ = (MI_STORE_DWORD_IMM | 1 << 22) - 1; > > + *cs++ = (MI_STORE_DWORD_IMM_GEN4 | 1 << 22) - 1; > > } > > *cs++ = addr; > > *cs++ = MI_BATCH_BUFFER_END; > > @@ -2294,7 +2285,7 @@ static void reorder_wide(int fd, const intel_ctx_cfg_t *cfg, unsigned ring) > > addr = reloc.presumed_offset + reloc.delta; > > > > i = execbuf.batch_start_offset / sizeof(uint32_t); > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = addr; > > batch[++i] = addr >> 32; > > diff --git a/tests/i915/gem_exec_store.c b/tests/i915/gem_exec_store.c > > index efb9907ebb..7d23bcd5b4 100644 > > --- a/tests/i915/gem_exec_store.c > > +++ b/tests/i915/gem_exec_store.c > > @@ -94,7 +94,7 @@ static void store_dword(int fd, const intel_ctx_t *ctx, > > } > > > > i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = obj[0].offset; > > batch[++i] = obj[0].offset >> 32; > > @@ -180,7 +180,7 @@ static void store_cachelines(int fd, const intel_ctx_t *ctx, > > reloc[n].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > dst_offset = CANONICAL(reloc[n].presumed_offset + reloc[n].delta); > > > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = dst_offset; > > batch[++i] = dst_offset >> 32; > > @@ -283,7 +283,7 @@ static void store_all(int fd, const intel_ctx_t *ctx) > > > > offset = sizeof(uint32_t); > > i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[address = ++i] = 0; > > batch[++i] = 0; > > diff --git a/tests/i915/gem_exec_suspend.c b/tests/i915/gem_exec_suspend.c > > index 3b59966a11..1dadf06df0 100644 > > --- a/tests/i915/gem_exec_suspend.c > > +++ b/tests/i915/gem_exec_suspend.c > > @@ -159,7 +159,7 @@ static void run_test(int fd, const intel_ctx_t *ctx, > > } > > > > b = 0; > > - buf[b] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + buf[b] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > buf[++b] = offset; > > buf[++b] = offset >> 32; > > diff --git a/tests/i915/gem_exec_whisper.c b/tests/i915/gem_exec_whisper.c > > index 616231aa96..29d96cdcaa 100644 > > --- a/tests/i915/gem_exec_whisper.c > > +++ b/tests/i915/gem_exec_whisper.c > > @@ -312,7 +312,7 @@ static void whisper(int fd, const intel_ctx_t *ctx, > > } > > > > i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = store.offset + loc; > > batch[++i] = (store.offset + loc) >> 32; > > diff --git a/tests/i915/gem_pipe_control_store_loop.c b/tests/i915/gem_pipe_control_store_loop.c > > index df3da9f5b2..59959a3742 100644 > > --- a/tests/i915/gem_pipe_control_store_loop.c > > +++ b/tests/i915/gem_pipe_control_store_loop.c > > @@ -48,7 +48,6 @@ IGT_TEST_DESCRIPTION("Test (TLB-)Coherency of pipe_control QW writes."); > > > > static struct buf_ops *bops; > > > > -#define GFX_OP_PIPE_CONTROL ((0x3<<29)|(0x3<<27)|(0x2<<24)|2) > > #define PIPE_CONTROL_WRITE_IMMEDIATE (1<<14) > > #define PIPE_CONTROL_WRITE_TIMESTAMP (3<<14) > > #define PIPE_CONTROL_DEPTH_STALL (1<<13) > > @@ -96,7 +95,7 @@ store_pipe_control_loop(bool preuse_buffer, int timeout) > > * support code will do that for us. */ > > if (ibb->gen >= 8) { > > intel_bb_add_intel_buf(ibb, target_buf, true); > > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL + 1); > > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(5)); > > intel_bb_out(ibb, PIPE_CONTROL_WRITE_IMMEDIATE); > > intel_bb_emit_reloc_fenced(ibb, target_buf->handle, > > I915_GEM_DOMAIN_INSTRUCTION, > > @@ -108,13 +107,13 @@ store_pipe_control_loop(bool preuse_buffer, int timeout) > > /* work-around hw issue, see intel_emit_post_sync_nonzero_flush > > * in mesa sources. */ > > intel_bb_add_intel_buf(ibb, target_buf, true); > > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL); > > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(4)); > > intel_bb_out(ibb, PIPE_CONTROL_CS_STALL | > > PIPE_CONTROL_STALL_AT_SCOREBOARD); > > intel_bb_out(ibb, 0); /* address */ > > intel_bb_out(ibb, 0); /* write data */ > > > > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL); > > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(4)); > > intel_bb_out(ibb, PIPE_CONTROL_WRITE_IMMEDIATE); > > intel_bb_emit_reloc(ibb, target_buf->handle, > > I915_GEM_DOMAIN_INSTRUCTION, > > @@ -124,10 +123,10 @@ store_pipe_control_loop(bool preuse_buffer, int timeout) > > intel_bb_out(ibb, val); /* write data */ > > } else if (ibb->gen >= 4) { > > intel_bb_add_intel_buf(ibb, target_buf, true); > > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | > > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(4) | > > PIPE_CONTROL_WC_FLUSH | > > PIPE_CONTROL_TC_FLUSH | > > - PIPE_CONTROL_WRITE_IMMEDIATE | 2); > > + PIPE_CONTROL_WRITE_IMMEDIATE); > > intel_bb_emit_reloc(ibb, target_buf->handle, > > I915_GEM_DOMAIN_INSTRUCTION, > > I915_GEM_DOMAIN_INSTRUCTION, > > diff --git a/tests/i915/gem_pxp.c b/tests/i915/gem_pxp.c > > index 0c4224483f..af657d0e1b 100644 > > --- a/tests/i915/gem_pxp.c > > +++ b/tests/i915/gem_pxp.c > > @@ -748,10 +748,7 @@ static void test_pxp_pwrcycle_teardown_keychange(int i915, struct powermgt_data > > igt_assert_eq(matched_after_keychange, 0); > > } > > > > -#define GFX_OP_PIPE_CONTROL ((3 << 29) | (3 << 27) | (2 << 24)) > > -#define PIPE_CONTROL_CS_STALL (1 << 20) > > #define PIPE_CONTROL_RENDER_TARGET_FLUSH (1 << 12) > > -#define PIPE_CONTROL_FLUSH_ENABLE (1 << 7) > > #define PIPE_CONTROL_DATA_CACHE_INVALIDATE (1 << 5) > > #define PIPE_CONTROL_PROTECTEDPATH_DISABLE (1 << 27) > > #define PIPE_CONTROL_PROTECTEDPATH_ENABLE (1 << 22) > > @@ -765,7 +762,7 @@ static void emit_pipectrl(struct intel_bb *ibb, struct intel_buf *fenceb, bool b > > uint32_t pipe_ctl_flags = 0; > > uint32_t ps_op_id; > > > > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL); > > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(4)); > > intel_bb_out(ibb, pipe_ctl_flags); > > > > if (before) > > @@ -776,7 +773,7 @@ static void emit_pipectrl(struct intel_bb *ibb, struct intel_buf *fenceb, bool b > > pipe_ctl_flags = (PIPE_CONTROL_FLUSH_ENABLE | > > PIPE_CONTROL_CS_STALL | > > PIPE_CONTROL_POST_SYNC_OP); > > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | 4); > > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(6)); > > intel_bb_out(ibb, pipe_ctl_flags); > > intel_bb_emit_reloc(ibb, fenceb->handle, 0, I915_GEM_DOMAIN_COMMAND, (before?0:8), > > fenceb->addr.offset); > > diff --git a/tests/i915/gem_ringfill.c b/tests/i915/gem_ringfill.c > > index 8ab00525ff..afcd7b73ed 100644 > > --- a/tests/i915/gem_ringfill.c > > +++ b/tests/i915/gem_ringfill.c > > @@ -158,7 +158,7 @@ static void setup_execbuf(int fd, const intel_ctx_t *ctx, > > reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > > > offset = obj[0].offset + reloc[i].delta; > > - *b++ = MI_STORE_DWORD_IMM; > > + *b++ = MI_STORE_DWORD_IMM_GEN4; > > if (gen >= 8) { > > *b++ = offset; > > *b++ = offset >> 32; > > diff --git a/tests/i915/gem_softpin.c b/tests/i915/gem_softpin.c > > index c29bfd43d9..7682f772a1 100644 > > --- a/tests/i915/gem_softpin.c > > +++ b/tests/i915/gem_softpin.c > > @@ -41,18 +41,6 @@ IGT_TEST_DESCRIPTION("Tests softpin feature with normal usage, invalid inputs" > > > > #define LIMIT_32b ((1ull << 32) - (1ull << 12)) > > > > -/* gen8_canonical_addr > > - * Used to convert any address into canonical form, i.e. [63:48] == [47]. > > - * Based on kernel's sign_extend64 implementation. > > - * @address - a virtual address > > -*/ > > -#define GEN8_HIGH_ADDRESS_BIT 47 > > -static uint64_t gen8_canonical_addr(uint64_t address) > > -{ > > - __u8 shift = 63 - GEN8_HIGH_ADDRESS_BIT; > > - return (__s64)(address << shift) >> shift; > > -} > > - > > #define INTERRUPTIBLE 0x1 > > > > static void test_invalid(int fd) > > @@ -653,7 +641,7 @@ static void test_noreloc(int fd, enum sleep sleep, unsigned flags) > > gem_set_domain(fd, object[i].handle, > > I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); > > for (i = 0; i < ARRAY_SIZE(object) - 1; i++) { > > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > *b++ = object[i].offset; > > *b++ = object[i].offset >> 32; > > @@ -922,7 +910,7 @@ static void submit(int fd, unsigned int gen, > > BATCH_ALIGNMENT); > > address = obj.offset + BATCH_SIZE - eb->batch_start_offset - 8; > > n = 0; > > - batch[n] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[n] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[n] |= 1 << 21; > > batch[n]++; > > diff --git a/tests/i915/gem_sync.c b/tests/i915/gem_sync.c > > index 07cabf7abc..e7dc6637ab 100644 > > --- a/tests/i915/gem_sync.c > > +++ b/tests/i915/gem_sync.c > > @@ -588,7 +588,7 @@ store_ring(int fd, const intel_ctx_t *ctx, unsigned ring, > > reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > > > offset = object[0].offset + reloc[i].delta; > > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > *b++ = offset; > > *b++ = offset >> 32; > > @@ -698,7 +698,7 @@ switch_ring(int fd, const intel_ctx_t *ctx, unsigned ring, > > c->reloc[r].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > > > offset = c->object[0].offset + c->reloc[r].delta; > > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > *b++ = offset; > > *b++ = offset >> 32; > > @@ -772,10 +772,10 @@ switch_ring(int fd, const intel_ctx_t *ctx, unsigned ring, > > > > static void xchg(void *array, unsigned i, unsigned j) > > { > > - uint32_t *u32 = array; > > - uint32_t tmp = u32[i]; > > - u32[i] = u32[j]; > > - u32[j] = tmp; > > + uint32_t *ui32 = array; > > + uint32_t tmp = ui32[i]; > > + ui32[i] = ui32[j]; > > + ui32[j] = tmp; > > imho move this to separate patchset. Ditto. > > Rest looks ok, > Thanks for the review, according to your comments I'm going to extract huc change, other things need to stay intact (typedefs). -- Zbigniew > Regards, > Kamil > > > } > > > > struct waiter { > > @@ -859,7 +859,7 @@ __store_many(int fd, const intel_ctx_t *ctx, unsigned ring, > > reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > > > offset = object[0].offset + reloc[i].delta; > > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > *b++ = offset; > > *b++ = offset >> 32; > > @@ -1080,7 +1080,7 @@ store_all(int fd, const intel_ctx_t *ctx, int num_children, int timeout) > > reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > > > offset = object[0].offset + reloc[i].delta; > > - *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + *b++ = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > *b++ = offset; > > *b++ = offset >> 32; > > diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c > > index 483570d0ad..07a453229a 100644 > > --- a/tests/i915/gem_userptr_blits.c > > +++ b/tests/i915/gem_userptr_blits.c > > @@ -338,7 +338,7 @@ static void store_dword(int fd, uint32_t target, > > obj[1].relocation_count = 1; > > > > i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = offset; > > batch[++i] = 0; > > @@ -1318,7 +1318,7 @@ static void store_dword_rand(int i915, const intel_ctx_t *ctx, > > > > offset = reloc[n].presumed_offset + reloc[n].delta; > > > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = offset; > > batch[++i] = offset >> 32; > > @@ -1379,7 +1379,7 @@ static void test_readonly(int i915) > > > > /* > > * We have only a 31bit delta which we use for generating > > - * the target address for MI_STORE_DWORD_IMM, so our maximum > > + * the target address for MI_STORE_DWORD_IMM_GEN4, so our maximum > > * usable object size is only 2GiB. For now. > > */ > > igt_nsec_elapsed(memset(&tv, 0, sizeof(tv))); > > diff --git a/tests/i915/gem_vm_create.c b/tests/i915/gem_vm_create.c > > index 3005d347c3..f47d8c5569 100644 > > --- a/tests/i915/gem_vm_create.c > > +++ b/tests/i915/gem_vm_create.c > > @@ -268,7 +268,7 @@ write_to_address(int fd, uint32_t ctx, uint64_t addr, uint32_t value) > > int i; > > > > i = 0; > > - cs[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + cs[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > cs[++i] = addr; > > cs[++i] = addr >> 32; > > diff --git a/tests/i915/gem_watchdog.c b/tests/i915/gem_watchdog.c > > index 01eb007694..27f3a2d7fd 100644 > > --- a/tests/i915/gem_watchdog.c > > +++ b/tests/i915/gem_watchdog.c > > @@ -332,7 +332,7 @@ static void delay(int i915, > > > > cs = map = gem_mmap__device_coherent(i915, handle, 0, 4096, PROT_WRITE); > > > > - *cs++ = MI_LOAD_REGISTER_IMM; > > + *cs++ = MI_LOAD_REGISTER_IMM(1); > > *cs++ = CS_GPR(START_TS) + 4; > > *cs++ = 0; > > *cs++ = MI_LOAD_REGISTER_REG; > > @@ -345,7 +345,7 @@ static void delay(int i915, > > > > *cs++ = 0x5 << 23; /* MI_ARB_CHECK */ > > > > - *cs++ = MI_LOAD_REGISTER_IMM; > > + *cs++ = MI_LOAD_REGISTER_IMM(1); > > *cs++ = CS_GPR(NOW_TS) + 4; > > *cs++ = 0; > > *cs++ = MI_LOAD_REGISTER_REG; > > @@ -367,7 +367,7 @@ static void delay(int i915, > > > > /* Delay between SRM and COND_BBE to post the writes */ > > for (int n = 0; n < 8; n++) { > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > if (use_64b) { > > *cs++ = addr + 4064; > > *cs++ = addr >> 32; > > diff --git a/tests/i915/gem_workarounds.c b/tests/i915/gem_workarounds.c > > index 5fb2d73fdd..30c68d1ac9 100644 > > --- a/tests/i915/gem_workarounds.c > > +++ b/tests/i915/gem_workarounds.c > > @@ -121,7 +121,7 @@ static int workaround_fail_count(int i915, const intel_ctx_t *ctx) > > out = base = > > gem_mmap__cpu(i915, obj[1].handle, 0, batch_sz, PROT_WRITE); > > for (int i = 0; i < num_wa_regs; i++) { > > - *out++ = MI_STORE_REGISTER_MEM | (1 + (gen >= 8)); > > + *out++ = MI_STORE_REGISTER_MEM_CMD | (1 + (gen >= 8)); > > *out++ = wa_regs[i].addr; > > reloc[i].target_handle = obj[0].handle; > > reloc[i].offset = (out - base) * sizeof(*out); > > diff --git a/tests/i915/gen7_exec_parse.c b/tests/i915/gen7_exec_parse.c > > index 69b768ed29..e9751ea73f 100644 > > --- a/tests/i915/gen7_exec_parse.c > > +++ b/tests/i915/gen7_exec_parse.c > > @@ -48,10 +48,6 @@ > > #define INSTR_CLIENT_SHIFT 29 > > #define INSTR_INVALID_CLIENT 0x7 > > > > -#define MI_ARB_ON_OFF (0x8 << 23) > > -#define MI_DISPLAY_FLIP ((0x14 << 23) | 1) > > - > > -#define GFX_OP_PIPE_CONTROL ((0x3<<29)|(0x3<<27)|(0x2<<24)|2) > > #define PIPE_CONTROL_QW_WRITE (1<<14) > > #define PIPE_CONTROL_LRI_POST_OP (1<<23) > > > > @@ -298,7 +294,7 @@ static void > > test_lri(int fd, uint32_t handle, struct test_lri *test) > > { > > uint32_t lri[] = { > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > test->reg, > > test->test_val, > > MI_BATCH_BUFFER_END, > > @@ -372,13 +368,13 @@ static void test_allocations(int fd) > > static void hsw_load_register_reg(void) > > { > > uint32_t init_gpr0[16] = { > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > HSW_CS_GPR0, > > 0xabcdabc0, /* leave [1:0] zero */ > > MI_BATCH_BUFFER_END, > > }; > > uint32_t store_gpr0[16] = { > > - MI_STORE_REGISTER_MEM | (3 - 2), > > + MI_STORE_REGISTER_MEM_CMD | (3 - 2), > > HSW_CS_GPR0, > > 0, /* reloc*/ > > MI_BATCH_BUFFER_END, > > @@ -475,7 +471,7 @@ igt_main > > > > igt_subtest("basic-allowed") { > > uint32_t pc[] = { > > - GFX_OP_PIPE_CONTROL, > > + GFX_OP_PIPE_CONTROL(4), > > PIPE_CONTROL_QW_WRITE, > > 0, /* To be patched */ > > 0x12000000, > > @@ -490,7 +486,7 @@ igt_main > > > > igt_subtest("basic-offset") { > > uint32_t pc[] = { > > - GFX_OP_PIPE_CONTROL, > > + GFX_OP_PIPE_CONTROL(4), > > PIPE_CONTROL_QW_WRITE, > > 0, /* To be patched */ > > 0x12000000, > > @@ -597,7 +593,7 @@ igt_main > > > > igt_subtest("bitmasks") { > > uint32_t pc[] = { > > - GFX_OP_PIPE_CONTROL, > > + GFX_OP_PIPE_CONTROL(4), > > (PIPE_CONTROL_QW_WRITE | > > PIPE_CONTROL_LRI_POST_OP), > > 0, /* To be patched */ > > @@ -631,13 +627,13 @@ igt_main > > > > igt_subtest("cmd-crossing-page") { > > uint32_t lri_ok[] = { > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > SO_WRITE_OFFSET_0, /* allowed register address */ > > 0xdcbaabc0, /* [1:0] MBZ */ > > MI_BATCH_BUFFER_END, > > }; > > uint32_t store_reg[] = { > > - MI_STORE_REGISTER_MEM | (3 - 2), > > + MI_STORE_REGISTER_MEM_CMD | (3 - 2), > > SO_WRITE_OFFSET_0, > > 0, /* reloc */ > > MI_BATCH_BUFFER_END, > > @@ -655,29 +651,29 @@ igt_main > > > > igt_subtest("oacontrol-tracking") { > > uint32_t lri_ok[] = { > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > OACONTROL, > > 0x31337000, > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > OACONTROL, > > 0x0, > > MI_BATCH_BUFFER_END, > > 0 > > }; > > uint32_t lri_bad[] = { > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > OACONTROL, > > 0x31337000, > > MI_BATCH_BUFFER_END, > > }; > > uint32_t lri_extra_bad[] = { > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > OACONTROL, > > 0x31337000, > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > OACONTROL, > > 0x0, > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > OACONTROL, > > 0x31337000, > > MI_BATCH_BUFFER_END, > > @@ -701,7 +697,7 @@ igt_main > > > > igt_subtest("chained-batch") { > > uint32_t pc[] = { > > - GFX_OP_PIPE_CONTROL, > > + GFX_OP_PIPE_CONTROL(4), > > PIPE_CONTROL_QW_WRITE, > > 0, /* To be patched */ > > 0x12000000, > > diff --git a/tests/i915/gen9_exec_parse.c b/tests/i915/gen9_exec_parse.c > > index c8743a78a0..26b1517053 100644 > > --- a/tests/i915/gen9_exec_parse.c > > +++ b/tests/i915/gen9_exec_parse.c > > @@ -38,14 +38,6 @@ > > #define INSTR_CLIENT_SHIFT 29 > > #define INSTR_INVALID_CLIENT 0x7 > > > > -#define MI_ARB_ON_OFF (0x8 << 23) > > -#define MI_USER_INTERRUPT (0x02 << 23) > > -#define MI_FLUSH_DW (0x26 << 23) > > -#define MI_REPORT_HEAD (0x07 << 23) > > -#define MI_SUSPEND_FLUSH (0x0b << 23) > > -#define MI_LOAD_SCAN_LINES_EXCL (0x13 << 23) > > -#define MI_UPDATE_GTT (0x23 << 23) > > - > > #define BCS_SWCTRL 0x22200 > > #define BCS_GPR_BASE 0x22600 > > #define BCS_GPR(n) (0x22600 + (n) * 8) > > @@ -324,7 +316,7 @@ static const struct cmd allowed_cmds[] = { > > CMD_N(MI_NOOP), > > CMD_N(MI_USER_INTERRUPT), > > CMD_N(MI_WAIT_FOR_EVENT), > > - CMD(MI_FLUSH_DW, 5), > > + CMD(MI_FLUSH_DW_CMD, 5), > > CMD_N(MI_ARB_CHECK), > > CMD_N(MI_REPORT_HEAD), > > CMD_N(MI_FLUSH), > > @@ -453,11 +445,11 @@ static void test_bb_start(const int i915, const uint32_t handle, int test) > > MI_NOOP, > > MI_NOOP, > > MI_NOOP, > > - MI_STORE_DWORD_IMM, > > + MI_STORE_DWORD_IMM_GEN4, > > 0, > > 0, > > 1, > > - MI_STORE_DWORD_IMM, > > + MI_STORE_DWORD_IMM_GEN4, > > 4, > > 0, > > 2, > > @@ -680,13 +672,13 @@ static void test_bb_chained(const int i915, const uint32_t handle) > > static void test_cmd_crossing_page(const int i915, const uint32_t handle) > > { > > const uint32_t lri_ok[] = { > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > BCS_GPR(0), > > 0xbaadf00d, > > MI_BATCH_BUFFER_END, > > }; > > const uint32_t store_reg[] = { > > - MI_STORE_REGISTER_MEM | 2, > > + MI_STORE_REGISTER_MEM_CMD | 2, > > BCS_GPR(0), > > 0, /* reloc */ > > 0, /* reloc */ > > @@ -711,21 +703,21 @@ static void test_invalid_length(const int i915, const uint32_t handle) > > const uint32_t noops[8192] = { 0, }; > > > > const uint32_t lri_ok[] = { > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > BCS_GPR(0), > > ok_val, > > MI_BATCH_BUFFER_END, > > }; > > > > const uint32_t lri_bad[] = { > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > BCS_GPR(0), > > bad_val, > > MI_BATCH_BUFFER_END, > > }; > > > > const uint32_t store_reg[] = { > > - MI_STORE_REGISTER_MEM | 2, > > + MI_STORE_REGISTER_MEM_CMD | 2, > > BCS_GPR(0), > > 0, /* reloc */ > > 0, /* reloc */ > > @@ -824,21 +816,21 @@ static void test_register(const int i915, const uint32_t handle, > > const struct reg *r) > > { > > const uint32_t lri_zero[] = { > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > r->addr, > > r->masked_write ? 0xffff0000 : 0, > > MI_BATCH_BUFFER_END, > > }; > > > > const uint32_t lri_mask[] = { > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > r->addr, > > r->masked_write ? (r->mask << 16) | r->mask : r->mask, > > MI_BATCH_BUFFER_END, > > }; > > > > const uint32_t store_reg[] = { > > - MI_STORE_REGISTER_MEM | 2, > > + MI_STORE_REGISTER_MEM_CMD | 2, > > r->addr, > > 0, /* reloc */ > > 0, /* reloc */ > > @@ -877,7 +869,7 @@ static long int read_reg(const int i915, const uint32_t handle, > > const uint32_t addr) > > { > > const uint32_t store_reg[] = { > > - MI_STORE_REGISTER_MEM | 2, > > + MI_STORE_REGISTER_MEM_CMD | 2, > > addr, > > 0, /* reloc */ > > 0, /* reloc */ > > @@ -911,7 +903,7 @@ static int write_reg(const int i915, const uint32_t handle, > > const uint32_t addr, const uint32_t val) > > { > > const uint32_t lri[] = { > > - MI_LOAD_REGISTER_IMM, > > + MI_LOAD_REGISTER_IMM(1), > > addr, > > val, > > MI_BATCH_BUFFER_END, > > @@ -1088,17 +1080,6 @@ static inline uint32_t fill_and_copy_shadow(uint32_t *batch, uint32_t len, > > return i * sizeof(uint32_t); > > } > > > > -static inline uint64_t sign_extend(uint64_t x, int index) > > -{ > > - int shift = 63 - index; > > - return (int64_t)(x << shift) >> shift; > > -} > > - > > -static uint64_t gen8_canonical_address(uint64_t address) > > -{ > > - return sign_extend(address, 47); > > -} > > - > > static void test_shadow_peek(int fd) > > { > > uint64_t size = PAGE_SIZE; > > @@ -1130,7 +1111,7 @@ static void test_shadow_peek(int fd) > > > > exec[1].handle = gem_create(fd, size); /* batch */ > > exec[1].flags = EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS; > > - exec[1].offset = gen8_canonical_address(exec[0].pad_to_size); > > + exec[1].offset = gen8_canonical_addr(exec[0].pad_to_size); > > > > vaddr = gem_mmap__wc(fd, exec[1].handle, 0, size, PROT_WRITE); > > > > diff --git a/tests/i915/i915_module_load.c b/tests/i915/i915_module_load.c > > index d3a86b1133..725687dab4 100644 > > --- a/tests/i915/i915_module_load.c > > +++ b/tests/i915/i915_module_load.c > > @@ -80,7 +80,7 @@ static void store_all(int i915) > > int i; > > > > i = 0; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = 0; > > batch[++i] = 0; > > diff --git a/tests/i915/perf.c b/tests/i915/perf.c > > index dd1f1ac399..6453354cfc 100644 > > --- a/tests/i915/perf.c > > +++ b/tests/i915/perf.c > > @@ -58,30 +58,17 @@ IGT_TEST_DESCRIPTION("Test the i915 perf metrics streaming interface"); > > #define OAREPORT_REASON_GO (1<<4) > > #define OAREPORT_REASON_CLK_RATIO (1<<5) > > > > -#define GFX_OP_PIPE_CONTROL ((3 << 29) | (3 << 27) | (2 << 24)) > > -#define PIPE_CONTROL_CS_STALL (1 << 20) > > #define PIPE_CONTROL_GLOBAL_SNAPSHOT_COUNT_RESET (1 << 19) > > -#define PIPE_CONTROL_TLB_INVALIDATE (1 << 18) > > #define PIPE_CONTROL_SYNC_GFDT (1 << 17) > > -#define PIPE_CONTROL_MEDIA_STATE_CLEAR (1 << 16) > > #define PIPE_CONTROL_NO_WRITE (0 << 14) > > #define PIPE_CONTROL_WRITE_IMMEDIATE (1 << 14) > > #define PIPE_CONTROL_WRITE_DEPTH_COUNT (2 << 14) > > -#define PIPE_CONTROL_WRITE_TIMESTAMP (3 << 14) > > -#define PIPE_CONTROL_DEPTH_STALL (1 << 13) > > #define PIPE_CONTROL_RENDER_TARGET_FLUSH (1 << 12) > > #define PIPE_CONTROL_INSTRUCTION_INVALIDATE (1 << 11) > > -#define PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE (1 << 10) /* GM45+ only */ > > #define PIPE_CONTROL_ISP_DIS (1 << 9) > > #define PIPE_CONTROL_INTERRUPT_ENABLE (1 << 8) > > -#define PIPE_CONTROL_FLUSH_ENABLE (1 << 7) /* Gen7+ only */ > > /* GT */ > > #define PIPE_CONTROL_DATA_CACHE_INVALIDATE (1 << 5) > > -#define PIPE_CONTROL_VF_CACHE_INVALIDATE (1 << 4) > > -#define PIPE_CONTROL_CONST_CACHE_INVALIDATE (1 << 3) > > -#define PIPE_CONTROL_STATE_CACHE_INVALIDATE (1 << 2) > > -#define PIPE_CONTROL_STALL_AT_SCOREBOARD (1 << 1) > > -#define PIPE_CONTROL_DEPTH_CACHE_FLUSH (1 << 0) > > #define PIPE_CONTROL_PPGTT_WRITE (0 << 2) > > #define PIPE_CONTROL_GLOBAL_GTT_WRITE (1 << 2) > > > > @@ -3242,9 +3229,9 @@ emit_stall_timestamp_and_rpc(struct intel_bb *ibb, > > intel_bb_add_intel_buf(ibb, dst, true); > > > > if (intel_gen(devid) >= 8) > > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | (6 - 2)); > > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(6)); > > else > > - intel_bb_out(ibb, GFX_OP_PIPE_CONTROL | (5 - 2)); > > + intel_bb_out(ibb, GFX_OP_PIPE_CONTROL(5)); > > > > intel_bb_out(ibb, pipe_ctl_flags); > > intel_bb_emit_reloc(ibb, dst->handle, > > diff --git a/tests/i915/perf_pmu.c b/tests/i915/perf_pmu.c > > index c1779fc9d0..f387f8249a 100644 > > --- a/tests/i915/perf_pmu.c > > +++ b/tests/i915/perf_pmu.c > > @@ -681,12 +681,6 @@ no_sema(int gem_fd, const intel_ctx_t *ctx, > > assert_within_epsilon(val[0][1], 0.0f, tolerance); > > } > > > > -#define MI_INSTR(opcode, flags) (((opcode) << 23) | (flags)) > > -#define MI_SEMAPHORE_WAIT MI_INSTR(0x1c, 2) /* GEN8+ */ > > -#define MI_SEMAPHORE_POLL (1<<15) > > -#define MI_SEMAPHORE_SAD_GTE_SDD (1<<12) > > -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > > - > > static void > > sema_wait(int gem_fd, const intel_ctx_t *ctx, > > const struct intel_execution_engine2 *e, > > @@ -719,7 +713,7 @@ sema_wait(int gem_fd, const intel_ctx_t *ctx, > > > > obj_ptr = gem_mmap__device_coherent(gem_fd, obj_handle, 0, 4096, PROT_WRITE); > > > > - batch[0] = MI_STORE_DWORD_IMM; > > + batch[0] = MI_STORE_DWORD_IMM_GEN4; > > batch[1] = obj_offset + sizeof(*obj_ptr); > > batch[2] = (obj_offset + sizeof(*obj_ptr)) >> 32; > > batch[3] = 1; > > @@ -807,7 +801,7 @@ create_sema(int gem_fd, uint64_t ahnd, > > { > > uint32_t cs[] = { > > /* Reset our semaphore wait */ > > - MI_STORE_DWORD_IMM, > > + MI_STORE_DWORD_IMM_GEN4, > > 0, > > 0, > > 1, > > @@ -1108,17 +1102,17 @@ event_wait(int gem_fd, const intel_ctx_t *ctx, > > obj.handle = gem_create(gem_fd, 4096); > > > > b = batch; > > - *b++ = MI_LOAD_REGISTER_IMM; > > + *b++ = MI_LOAD_REGISTER_IMM(1); > > *b++ = FORCEWAKE_MT; > > *b++ = 2 << 16 | 2; > > - *b++ = MI_LOAD_REGISTER_IMM; > > + *b++ = MI_LOAD_REGISTER_IMM(1); > > *b++ = DERRMR; > > *b++ = ~0u; > > *b++ = MI_WAIT_FOR_EVENT; > > - *b++ = MI_LOAD_REGISTER_IMM; > > + *b++ = MI_LOAD_REGISTER_IMM(1); > > *b++ = DERRMR; > > *b++ = ~0u; > > - *b++ = MI_LOAD_REGISTER_IMM; > > + *b++ = MI_LOAD_REGISTER_IMM(1); > > *b++ = FORCEWAKE_MT; > > *b++ = 2 << 16; > > *b++ = MI_BATCH_BUFFER_END; > > diff --git a/tests/i915/sysfs_timeslice_duration.c b/tests/i915/sysfs_timeslice_duration.c > > index 95dc377785..80d34285e2 100644 > > --- a/tests/i915/sysfs_timeslice_duration.c > > +++ b/tests/i915/sysfs_timeslice_duration.c > > @@ -46,15 +46,6 @@ > > #define ATTR "timeslice_duration_ms" > > #define RESET_TIMEOUT 50 /* milliseconds, at least one jiffie for kworker */ > > > > -#define MI_SEMAPHORE_WAIT (0x1c << 23) > > -#define MI_SEMAPHORE_POLL (1 << 15) > > -#define MI_SEMAPHORE_SAD_GT_SDD (0 << 12) > > -#define MI_SEMAPHORE_SAD_GTE_SDD (1 << 12) > > -#define MI_SEMAPHORE_SAD_LT_SDD (2 << 12) > > -#define MI_SEMAPHORE_SAD_LTE_SDD (3 << 12) > > -#define MI_SEMAPHORE_SAD_EQ_SDD (4 << 12) > > -#define MI_SEMAPHORE_SAD_NEQ_SDD (5 << 12) > > - > > static bool __enable_hangcheck(int dir, bool state) > > { > > return igt_sysfs_set(dir, "enable_hangcheck", state ? "1" : "0"); > > @@ -214,7 +205,7 @@ static uint64_t __test_duration(int i915, int engine, unsigned int timeout) > > > > cs = map; > > for (i = 0; i < 10; i++) { > > - *cs++ = MI_SEMAPHORE_WAIT | > > + *cs++ = MI_SEMAPHORE_WAIT_CMD | > > MI_SEMAPHORE_POLL | > > MI_SEMAPHORE_SAD_NEQ_SDD | > > (4 - 2 + (gen >= 12)); > > @@ -229,7 +220,7 @@ static uint64_t __test_duration(int i915, int engine, unsigned int timeout) > > *cs++ = obj[1].offset + sizeof(uint32_t) * i; > > *cs++ = 0; > > > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > *cs++ = obj[0].offset + > > 4096 - sizeof(uint32_t) * i - sizeof(uint32_t); > > *cs++ = 0; > > @@ -240,12 +231,12 @@ static uint64_t __test_duration(int i915, int engine, unsigned int timeout) > > cs += 16 - ((cs - map) & 15); > > start = (cs - map) * sizeof(*cs); > > for (i = 0; i < 10; i++) { > > - *cs++ = MI_STORE_DWORD_IMM; > > + *cs++ = MI_STORE_DWORD_IMM_GEN4; > > *cs++ = obj[0].offset + sizeof(uint32_t) * i; > > *cs++ = 0; > > *cs++ = 1; > > > > - *cs++ = MI_SEMAPHORE_WAIT | > > + *cs++ = MI_SEMAPHORE_WAIT_CMD | > > MI_SEMAPHORE_POLL | > > MI_SEMAPHORE_SAD_NEQ_SDD | > > (4 - 2 + (gen >= 12)); > > diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c > > index 06be273c0b..7b473c03df 100644 > > --- a/tests/prime_vgem.c > > +++ b/tests/prime_vgem.c > > @@ -624,7 +624,7 @@ static void work(int i915, uint64_t ahnd, uint64_t scratch_offset, int dmabuf, > > store[count].delta = sizeof(uint32_t) * count; > > store[count].read_domains = I915_GEM_DOMAIN_INSTRUCTION; > > store[count].write_domain = I915_GEM_DOMAIN_INSTRUCTION; > > - batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0); > > + batch[i] = MI_STORE_DWORD_IMM_GEN4 | (gen < 6 ? 1 << 22 : 0); > > if (gen >= 8) { > > batch[++i] = scratch_offset + store[count].delta; > > batch[++i] = (scratch_offset + store[count].delta) >> 32; > > diff --git a/tools/intel_audio_dump.c b/tools/intel_audio_dump.c > > index 6d11659ec9..287dbd4759 100644 > > --- a/tools/intel_audio_dump.c > > +++ b/tools/intel_audio_dump.c > > @@ -48,6 +48,7 @@ static int disp_reg_base = 0; /* base address of display registers */ > > #define BITSTO(n) (n >= sizeof(long) * 8 ? ~0 : (1UL << (n)) - 1) > > #define BITMASK(high, low) (BITSTO(high+1) & ~BITSTO(low)) > > #define REG_BITS(reg, high, low) (((reg) & (BITMASK(high, low))) >> (low)) > > +#undef REG_BIT > > #define REG_BIT(reg, n) REG_BITS(reg, n, n) > > > > #define min_t(type, x, y) ({ \ > > diff --git a/tools/intel_reg.c b/tools/intel_reg.c > > index b0d91473a8..6c37e14d12 100644 > > --- a/tools/intel_reg.c > > +++ b/tools/intel_reg.c > > @@ -322,7 +322,7 @@ static int register_srm(struct config *config, struct reg *reg, > > batch[i++] = MI_NOOP; > > batch[i++] = MI_NOOP; > > > > - batch[i++] = MI_LOAD_REGISTER_IMM; > > + batch[i++] = MI_LOAD_REGISTER_IMM(1); > > batch[i++] = reg->addr; > > batch[i++] = *val_in; > > batch[i++] = MI_NOOP; > > -- > > 2.34.1 > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for Start using intel_gpu_commands.h header 2023-03-03 12:55 [igt-dev] [PATCH i-g-t 0/2] Start using intel_gpu_commands.h header Zbigniew Kempczyński 2023-03-03 12:55 ` [igt-dev] [PATCH i-g-t 1/2] intel_gpu_commands: Use kernel copy commands definition Zbigniew Kempczyński 2023-03-03 12:55 ` [igt-dev] [PATCH i-g-t 2/2] igt: Remove duplicated macros Zbigniew Kempczyński @ 2023-03-03 13:44 ` Patchwork 2023-03-06 20:14 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork 3 siblings, 0 replies; 11+ messages in thread From: Patchwork @ 2023-03-03 13:44 UTC (permalink / raw) To: Zbigniew Kempczyński; +Cc: igt-dev [-- Attachment #1: Type: text/plain, Size: 9926 bytes --] == Series Details == Series: Start using intel_gpu_commands.h header URL : https://patchwork.freedesktop.org/series/114619/ State : success == Summary == CI Bug Log - changes from CI_DRM_12807 -> IGTPW_8559 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/index.html Participating hosts (36 -> 40) ------------------------------ Additional (4): fi-kbl-soraka bat-atsm-1 fi-apl-guc fi-pnv-d510 Known issues ------------ Here are the changes found in IGTPW_8559 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@fbdev@eof: - bat-atsm-1: NOTRUN -> [SKIP][1] ([i915#2582]) +4 similar issues [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@fbdev@eof.html * igt@gem_exec_gttfill@basic: - fi-pnv-d510: NOTRUN -> [FAIL][2] ([i915#7229]) [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/fi-pnv-d510/igt@gem_exec_gttfill@basic.html * igt@gem_huc_copy@huc-copy: - fi-kbl-soraka: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#2190]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/fi-kbl-soraka/igt@gem_huc_copy@huc-copy.html * igt@gem_lmem_swapping@basic: - fi-apl-guc: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#4613]) +3 similar issues [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/fi-apl-guc/igt@gem_lmem_swapping@basic.html - fi-kbl-soraka: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613]) +3 similar issues [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/fi-kbl-soraka/igt@gem_lmem_swapping@basic.html * igt@gem_mmap@basic: - bat-atsm-1: NOTRUN -> [SKIP][6] ([i915#4083]) [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@gem_mmap@basic.html * igt@gem_tiled_fence_blits@basic: - bat-atsm-1: NOTRUN -> [SKIP][7] ([i915#4077]) +2 similar issues [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@gem_tiled_fence_blits@basic.html * igt@gem_tiled_pread_basic: - bat-atsm-1: NOTRUN -> [SKIP][8] ([i915#4079]) +1 similar issue [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@gem_tiled_pread_basic.html * igt@i915_pm_rps@basic-api: - bat-atsm-1: NOTRUN -> [SKIP][9] ([i915#6621]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@i915_pm_rps@basic-api.html * igt@i915_selftest@live@gt_heartbeat: - fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][10] ([i915#5334] / [i915#7872]) [10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/fi-kbl-soraka/igt@i915_selftest@live@gt_heartbeat.html * igt@i915_selftest@live@gt_pm: - fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][11] ([i915#1886]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html * igt@i915_selftest@live@hangcheck: - fi-kbl-soraka: NOTRUN -> [INCOMPLETE][12] ([i915#7913]) [12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/fi-kbl-soraka/igt@i915_selftest@live@hangcheck.html * igt@i915_selftest@live@requests: - bat-rpls-2: [PASS][13] -> [ABORT][14] ([i915#7694] / [i915#7913] / [i915#7982]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/bat-rpls-2/igt@i915_selftest@live@requests.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-rpls-2/igt@i915_selftest@live@requests.html * igt@i915_suspend@basic-s3-without-i915: - bat-adlm-1: [PASS][15] -> [DMESG-WARN][16] ([i915#2867]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/bat-adlm-1/igt@i915_suspend@basic-s3-without-i915.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-adlm-1/igt@i915_suspend@basic-s3-without-i915.html - bat-atsm-1: NOTRUN -> [SKIP][17] ([i915#6645]) [17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@i915_suspend@basic-s3-without-i915.html * igt@kms_addfb_basic@size-max: - bat-atsm-1: NOTRUN -> [SKIP][18] ([i915#6077]) +36 similar issues [18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@kms_addfb_basic@size-max.html * igt@kms_chamelium_frames@hdmi-crc-fast: - fi-kbl-soraka: NOTRUN -> [SKIP][19] ([fdo#109271]) +16 similar issues [19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/fi-kbl-soraka/igt@kms_chamelium_frames@hdmi-crc-fast.html * igt@kms_chamelium_hpd@vga-hpd-fast: - fi-apl-guc: NOTRUN -> [SKIP][20] ([fdo#109271]) +22 similar issues [20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/fi-apl-guc/igt@kms_chamelium_hpd@vga-hpd-fast.html * igt@kms_cursor_legacy@basic-flip-after-cursor-atomic: - bat-atsm-1: NOTRUN -> [SKIP][21] ([i915#6078]) +19 similar issues [21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@kms_cursor_legacy@basic-flip-after-cursor-atomic.html * igt@kms_flip@basic-plain-flip: - bat-atsm-1: NOTRUN -> [SKIP][22] ([i915#6166]) +3 similar issues [22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@kms_flip@basic-plain-flip.html * igt@kms_force_connector_basic@prune-stale-modes: - bat-atsm-1: NOTRUN -> [SKIP][23] ([i915#6093]) +3 similar issues [23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@kms_force_connector_basic@prune-stale-modes.html * igt@kms_pipe_crc_basic@hang-read-crc: - bat-atsm-1: NOTRUN -> [SKIP][24] ([i915#1836]) +6 similar issues [24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@kms_pipe_crc_basic@hang-read-crc.html * igt@kms_prop_blob@basic: - bat-atsm-1: NOTRUN -> [SKIP][25] ([i915#7357]) [25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@kms_prop_blob@basic.html * igt@kms_psr@primary_page_flip: - fi-pnv-d510: NOTRUN -> [SKIP][26] ([fdo#109271]) +38 similar issues [26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/fi-pnv-d510/igt@kms_psr@primary_page_flip.html * igt@kms_psr@sprite_plane_onoff: - bat-atsm-1: NOTRUN -> [SKIP][27] ([i915#1072]) +3 similar issues [27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@kms_psr@sprite_plane_onoff.html * igt@kms_setmode@basic-clone-single-crtc: - bat-atsm-1: NOTRUN -> [SKIP][28] ([i915#6094]) [28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@kms_setmode@basic-clone-single-crtc.html * igt@prime_vgem@basic-fence-flip: - bat-atsm-1: NOTRUN -> [SKIP][29] ([fdo#109295] / [i915#6078]) [29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@prime_vgem@basic-fence-flip.html * igt@prime_vgem@basic-fence-mmap: - bat-atsm-1: NOTRUN -> [SKIP][30] ([fdo#109295] / [i915#4077]) +1 similar issue [30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@prime_vgem@basic-fence-mmap.html * igt@prime_vgem@basic-write: - bat-atsm-1: NOTRUN -> [SKIP][31] ([fdo#109295]) +3 similar issues [31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/bat-atsm-1/igt@prime_vgem@basic-write.html [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295 [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072 [i915#1836]: https://gitlab.freedesktop.org/drm/intel/issues/1836 [i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886 [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190 [i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582 [i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867 [i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077 [i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079 [i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083 [i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613 [i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334 [i915#6077]: https://gitlab.freedesktop.org/drm/intel/issues/6077 [i915#6078]: https://gitlab.freedesktop.org/drm/intel/issues/6078 [i915#6093]: https://gitlab.freedesktop.org/drm/intel/issues/6093 [i915#6094]: https://gitlab.freedesktop.org/drm/intel/issues/6094 [i915#6166]: https://gitlab.freedesktop.org/drm/intel/issues/6166 [i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621 [i915#6645]: https://gitlab.freedesktop.org/drm/intel/issues/6645 [i915#7229]: https://gitlab.freedesktop.org/drm/intel/issues/7229 [i915#7357]: https://gitlab.freedesktop.org/drm/intel/issues/7357 [i915#7694]: https://gitlab.freedesktop.org/drm/intel/issues/7694 [i915#7872]: https://gitlab.freedesktop.org/drm/intel/issues/7872 [i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913 [i915#7982]: https://gitlab.freedesktop.org/drm/intel/issues/7982 Build changes ------------- * CI: CI-20190529 -> None * IGT: IGT_7180 -> IGTPW_8559 CI-20190529: 20190529 CI_DRM_12807: 2b332905a3202e5c218463de58bfa3da55e641e5 @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_8559: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/index.html IGT_7180: b6b1ceb4fc4d8f83a9540e4628a6c2648514bb19 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git Testlist changes ---------------- +igt@drm_buddy@all-tests +igt@drm_mm@all-tests -igt@kms_selftest@drm_cmdline_parser_test -igt@kms_selftest@drm_damage_helper_test -igt@kms_selftest@drm_dp_mst_helper_test -igt@kms_selftest@drm_format_helper_test -igt@kms_selftest@drm_format_test -igt@kms_selftest@drm_framebuffer_test -igt@kms_selftest@drm_plane_helper_test == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/index.html [-- Attachment #2: Type: text/html, Size: 12009 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for Start using intel_gpu_commands.h header 2023-03-03 12:55 [igt-dev] [PATCH i-g-t 0/2] Start using intel_gpu_commands.h header Zbigniew Kempczyński ` (2 preceding siblings ...) 2023-03-03 13:44 ` [igt-dev] ✓ Fi.CI.BAT: success for Start using intel_gpu_commands.h header Patchwork @ 2023-03-06 20:14 ` Patchwork 3 siblings, 0 replies; 11+ messages in thread From: Patchwork @ 2023-03-06 20:14 UTC (permalink / raw) To: Zbigniew Kempczyński; +Cc: igt-dev [-- Attachment #1: Type: text/plain, Size: 22093 bytes --] == Series Details == Series: Start using intel_gpu_commands.h header URL : https://patchwork.freedesktop.org/series/114619/ State : success == Summary == CI Bug Log - changes from CI_DRM_12807_full -> IGTPW_8559_full ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/index.html Participating hosts (9 -> 9) ------------------------------ No changes in participating hosts Possible new issues ------------------- Here are the unknown changes that may have been introduced in IGTPW_8559_full: ### IGT changes ### #### Suppressed #### The following results come from untrusted machines, tests, or statuses. They do not affect the overall result. * igt@i915_selftest@live@hangcheck: - {shard-rkl}: [PASS][1] -> [INCOMPLETE][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-rkl-4/igt@i915_selftest@live@hangcheck.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-rkl-4/igt@i915_selftest@live@hangcheck.html Known issues ------------ Here are the changes found in IGTPW_8559_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_ctx_persistence@processes: - shard-snb: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#1099]) +3 similar issues [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-snb1/igt@gem_ctx_persistence@processes.html * igt@gem_exec_fair@basic-deadline: - shard-apl: NOTRUN -> [FAIL][4] ([i915#2846]) [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-apl2/igt@gem_exec_fair@basic-deadline.html * igt@gem_exec_fair@basic-pace-share@rcs0: - shard-glk: [PASS][5] -> [FAIL][6] ([i915#2842]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-glk1/igt@gem_exec_fair@basic-pace-share@rcs0.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-glk5/igt@gem_exec_fair@basic-pace-share@rcs0.html * igt@gem_huc_copy@huc-copy: - shard-apl: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#2190]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-apl2/igt@gem_huc_copy@huc-copy.html * igt@gem_lmem_swapping@heavy-verify-multi-ccs: - shard-glk: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#4613]) +1 similar issue [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-glk1/igt@gem_lmem_swapping@heavy-verify-multi-ccs.html * igt@gem_lmem_swapping@parallel-random-verify: - shard-apl: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#4613]) +2 similar issues [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-apl2/igt@gem_lmem_swapping@parallel-random-verify.html * igt@gem_render_copy@x-tiled-to-vebox-yf-tiled: - shard-apl: NOTRUN -> [SKIP][10] ([fdo#109271]) +301 similar issues [10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-apl2/igt@gem_render_copy@x-tiled-to-vebox-yf-tiled.html * igt@gem_userptr_blits@dmabuf-sync: - shard-apl: NOTRUN -> [SKIP][11] ([fdo#109271] / [i915#3323]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-apl3/igt@gem_userptr_blits@dmabuf-sync.html * igt@gem_userptr_blits@vma-merge: - shard-snb: NOTRUN -> [FAIL][12] ([i915#2724]) [12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-snb4/igt@gem_userptr_blits@vma-merge.html * igt@gen9_exec_parse@allowed-single: - shard-glk: NOTRUN -> [ABORT][13] ([i915#5566]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-glk1/igt@gen9_exec_parse@allowed-single.html * igt@gen9_exec_parse@basic-rejected-ctx-param: - shard-snb: NOTRUN -> [SKIP][14] ([fdo#109271]) +480 similar issues [14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-snb4/igt@gen9_exec_parse@basic-rejected-ctx-param.html * igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp: - shard-apl: NOTRUN -> [SKIP][15] ([fdo#109271] / [i915#1937]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-apl1/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp.html * igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a: - shard-glk: NOTRUN -> [SKIP][16] ([fdo#109271] / [i915#1937]) [16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-glk3/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a.html * igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_mc_ccs: - shard-glk: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#3886]) +3 similar issues [17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-glk7/igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_mc_ccs.html * igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_mc_ccs: - shard-apl: NOTRUN -> [SKIP][18] ([fdo#109271] / [i915#3886]) +6 similar issues [18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-apl2/igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_mc_ccs.html * igt@kms_cursor_crc@cursor-random-max-size: - shard-glk: NOTRUN -> [SKIP][19] ([fdo#109271]) +177 similar issues [19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-glk1/igt@kms_cursor_crc@cursor-random-max-size.html * igt@kms_flip@flip-vs-suspend-interruptible@c-dp1: - shard-apl: NOTRUN -> [ABORT][20] ([i915#180]) [20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-apl1/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html * igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes: - shard-apl: [PASS][21] -> [ABORT][22] ([i915#180]) [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-apl2/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-apl2/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html * igt@kms_plane_alpha_blend@alpha-basic@pipe-a-dp-1: - shard-apl: NOTRUN -> [FAIL][23] ([i915#7862]) +1 similar issue [23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-apl3/igt@kms_plane_alpha_blend@alpha-basic@pipe-a-dp-1.html * igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-sf: - shard-glk: NOTRUN -> [SKIP][24] ([fdo#109271] / [i915#658]) +2 similar issues [24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-glk4/igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-sf.html * igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-big-fb: - shard-apl: NOTRUN -> [SKIP][25] ([fdo#109271] / [i915#658]) +3 similar issues [25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-apl2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-big-fb.html * igt@kms_writeback@writeback-invalid-parameters: - shard-glk: NOTRUN -> [SKIP][26] ([fdo#109271] / [i915#2437]) +1 similar issue [26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-glk4/igt@kms_writeback@writeback-invalid-parameters.html * igt@kms_writeback@writeback-pixel-formats: - shard-apl: NOTRUN -> [SKIP][27] ([fdo#109271] / [i915#2437]) +1 similar issue [27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-apl3/igt@kms_writeback@writeback-pixel-formats.html #### Possible fixes #### * igt@gem_exec_fair@basic-pace@rcs0: - shard-glk: [FAIL][28] ([i915#2842]) -> [PASS][29] [28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-glk2/igt@gem_exec_fair@basic-pace@rcs0.html [29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-glk3/igt@gem_exec_fair@basic-pace@rcs0.html * igt@gem_exec_reloc@basic-cpu: - {shard-rkl}: [SKIP][30] ([i915#3281]) -> [PASS][31] [30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-rkl-2/igt@gem_exec_reloc@basic-cpu.html [31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-rkl-5/igt@gem_exec_reloc@basic-cpu.html * igt@gem_partial_pwrite_pread@reads-display: - {shard-rkl}: [SKIP][32] ([i915#3282]) -> [PASS][33] +1 similar issue [32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-rkl-4/igt@gem_partial_pwrite_pread@reads-display.html [33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-rkl-5/igt@gem_partial_pwrite_pread@reads-display.html * igt@gen9_exec_parse@batch-zero-length: - {shard-rkl}: [SKIP][34] ([i915#2527]) -> [PASS][35] +1 similar issue [34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-rkl-4/igt@gen9_exec_parse@batch-zero-length.html [35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-rkl-5/igt@gen9_exec_parse@batch-zero-length.html * igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip: - {shard-tglu}: [SKIP][36] ([i915#1845] / [i915#7651]) -> [PASS][37] +4 similar issues [36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-tglu-6/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip.html [37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-tglu-1/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip.html * igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions: - shard-glk: [FAIL][38] ([i915#2346]) -> [PASS][39] [38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-glk5/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html [39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-glk8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html * igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions: - {shard-tglu}: [SKIP][40] ([i915#1845]) -> [PASS][41] +3 similar issues [40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-tglu-6/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions.html [41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-tglu-5/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions.html * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-wc: - {shard-tglu}: [SKIP][42] ([i915#1849]) -> [PASS][43] +1 similar issue [42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-tglu-6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-wc.html [43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-tglu-7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-wc.html * igt@kms_universal_plane@cursor-fb-leak-pipe-b: - {shard-tglu}: [SKIP][44] ([fdo#109274]) -> [PASS][45] [44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-tglu-6/igt@kms_universal_plane@cursor-fb-leak-pipe-b.html [45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-tglu-7/igt@kms_universal_plane@cursor-fb-leak-pipe-b.html * igt@perf@gen12-mi-rpc: - {shard-rkl}: [SKIP][46] ([fdo#109289]) -> [PASS][47] [46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-rkl-5/igt@perf@gen12-mi-rpc.html [47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-rkl-2/igt@perf@gen12-mi-rpc.html * igt@prime_vgem@basic-fence-blt: - {shard-rkl}: [SKIP][48] ([fdo#109315]) -> [PASS][49] +4 similar issues [48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12807/shard-rkl-5/igt@prime_vgem@basic-fence-blt.html [49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/shard-rkl-2/igt@prime_vgem@basic-fence-blt.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274 [fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280 [fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283 [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285 [fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289 [fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295 [fdo#109300]: https://bugs.freedesktop.org/show_bug.cgi?id=109300 [fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302 [fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309 [fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312 [fdo#109313]: https://bugs.freedesktop.org/show_bug.cgi?id=109313 [fdo#109314]: https://bugs.freedesktop.org/show_bug.cgi?id=109314 [fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315 [fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506 [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642 [fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189 [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068 [fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614 [fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615 [fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656 [fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825 [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827 [fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054 [fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283 [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072 [i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099 [i915#1257]: https://gitlab.freedesktop.org/drm/intel/issues/1257 [i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397 [i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180 [i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839 [i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845 [i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849 [i915#1902]: https://gitlab.freedesktop.org/drm/intel/issues/1902 [i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937 [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190 [i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346 [i915#2433]: https://gitlab.freedesktop.org/drm/intel/issues/2433 [i915#2434]: https://gitlab.freedesktop.org/drm/intel/issues/2434 [i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437 [i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527 [i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575 [i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582 [i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587 [i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658 [i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672 [i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705 [i915#2724]: https://gitlab.freedesktop.org/drm/intel/issues/2724 [i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280 [i915#284]: https://gitlab.freedesktop.org/drm/intel/issues/284 [i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842 [i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846 [i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856 [i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281 [i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282 [i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297 [i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299 [i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323 [i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359 [i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361 [i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458 [i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469 [i915#3528]: https://gitlab.freedesktop.org/drm/intel/issues/3528 [i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539 [i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546 [i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555 [i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637 [i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638 [i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689 [i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708 [i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742 [i915#3826]: https://gitlab.freedesktop.org/drm/intel/issues/3826 [i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886 [i915#3952]: https://gitlab.freedesktop.org/drm/intel/issues/3952 [i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955 [i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070 [i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077 [i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078 [i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083 [i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098 [i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103 [i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212 [i915#426]: https://gitlab.freedesktop.org/drm/intel/issues/426 [i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270 [i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281 [i915#433]: https://gitlab.freedesktop.org/drm/intel/issues/433 [i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349 [i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391 [i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525 [i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538 [i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613 [i915#4771]: https://gitlab.freedesktop.org/drm/intel/issues/4771 [i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812 [i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833 [i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852 [i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860 [i915#4880]: https://gitlab.freedesktop.org/drm/intel/issues/4880 [i915#4958]: https://gitlab.freedesktop.org/drm/intel/issues/4958 [i915#5115]: https://gitlab.freedesktop.org/drm/intel/issues/5115 [i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176 [i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235 [i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286 [i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288 [i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289 [i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325 [i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533 [i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439 [i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461 [i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563 [i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566 [i915#5723]: https://gitlab.freedesktop.org/drm/intel/issues/5723 [i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784 [i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095 [i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227 [i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245 [i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248 [i915#6252]: https://gitlab.freedesktop.org/drm/intel/issues/6252 [i915#6259]: https://gitlab.freedesktop.org/drm/intel/issues/6259 [i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268 [i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334 [i915#6344]: https://gitlab.freedesktop.org/drm/intel/issues/6344 [i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433 [i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524 [i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658 [i915#6590]: https://gitlab.freedesktop.org/drm/intel/issues/6590 [i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621 [i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768 [i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944 [i915#7052]: https://gitlab.freedesktop.org/drm/intel/issues/7052 [i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116 [i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118 [i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456 [i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561 [i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651 [i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697 [i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701 [i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711 [i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742 [i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828 [i915#7862]: https://gitlab.freedesktop.org/drm/intel/issues/7862 [i915#7949]: https://gitlab.freedesktop.org/drm/intel/issues/7949 [i915#7957]: https://gitlab.freedesktop.org/drm/intel/issues/7957 [i915#8150]: https://gitlab.freedesktop.org/drm/intel/issues/8150 [i915#8151]: https://gitlab.freedesktop.org/drm/intel/issues/8151 [i915#8152]: https://gitlab.freedesktop.org/drm/intel/issues/8152 Build changes ------------- * CI: CI-20190529 -> None * IGT: IGT_7180 -> IGTPW_8559 * Piglit: piglit_4509 -> None CI-20190529: 20190529 CI_DRM_12807: 2b332905a3202e5c218463de58bfa3da55e641e5 @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_8559: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/index.html IGT_7180: b6b1ceb4fc4d8f83a9540e4628a6c2648514bb19 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8559/index.html [-- Attachment #2: Type: text/html, Size: 16958 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-03-07 10:11 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-03-03 12:55 [igt-dev] [PATCH i-g-t 0/2] Start using intel_gpu_commands.h header Zbigniew Kempczyński 2023-03-03 12:55 ` [igt-dev] [PATCH i-g-t 1/2] intel_gpu_commands: Use kernel copy commands definition Zbigniew Kempczyński 2023-03-06 14:11 ` Kamil Konieczny 2023-03-06 15:05 ` Zbigniew Kempczyński 2023-03-07 9:22 ` Kamil Konieczny 2023-03-07 10:11 ` Zbigniew Kempczyński 2023-03-03 12:55 ` [igt-dev] [PATCH i-g-t 2/2] igt: Remove duplicated macros Zbigniew Kempczyński 2023-03-06 15:30 ` Kamil Konieczny 2023-03-06 15:50 ` Zbigniew Kempczyński 2023-03-03 13:44 ` [igt-dev] ✓ Fi.CI.BAT: success for Start using intel_gpu_commands.h header Patchwork 2023-03-06 20:14 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox