Commit 4a0836a2 authored by Matt Roper's avatar Matt Roper Committed by Gustavo Sousa
Browse files

drm/xe/xe3p_lpg: Add LRC parsing for additional RCS engine state 



Xe3p_LPG adds some additional state instructions to the RCS engine's
LRC.  Add support for these to the debugfs LRC parser.

Note that the bspec's LRC description page seems to have a few mistakes
in the name/spelling of these new instructions (e.g.,
"3DSTATE_TASK_DATA_EXT" instead of "3DSTATE_TASK_SHADER_DATA_EXT" or
"3DSTATE_VIEWPORT_STATE_POINTERS_CL_SF_2" instead of
"3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_2").

Bspec: 65182
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarMatt Atwood <matthew.s.atwood@intel.com>
Link: https://patch.msgid.link/20260206-nvl-p-upstreaming-v3-6-636e1ad32688@intel.com


Signed-off-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
parent 641a2208

drivers/gpu/drm/xe/instructions/xe_gfxpipe_commands.h

+10 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#define PIPELINE_SELECT				GFXPIPE_SINGLE_DW_CMD(0x1, 0x4)



#define CMD_3DSTATE_DRAWING_RECTANGLE_FAST	GFXPIPE_3D_CMD(0x0, 0x0)

#define CMD_3DSTATE_CUSTOM_SAMPLE_PATTERN	GFXPIPE_3D_CMD(0x0, 0x2)

#define CMD_3DSTATE_CLEAR_PARAMS		GFXPIPE_3D_CMD(0x0, 0x4)

#define CMD_3DSTATE_DEPTH_BUFFER		GFXPIPE_3D_CMD(0x0, 0x5)

#define CMD_3DSTATE_STENCIL_BUFFER		GFXPIPE_3D_CMD(0x0, 0x6)
@@ -138,8 +139,16 @@ 
#define CMD_3DSTATE_SBE_MESH			GFXPIPE_3D_CMD(0x0, 0x82)

#define CMD_3DSTATE_CPSIZE_CONTROL_BUFFER	GFXPIPE_3D_CMD(0x0, 0x83)

#define CMD_3DSTATE_COARSE_PIXEL		GFXPIPE_3D_CMD(0x0, 0x89)

#define CMD_3DSTATE_MESH_SHADER_DATA_EXT	GFXPIPE_3D_CMD(0x0, 0x8A)

#define CMD_3DSTATE_TASK_SHADER_DATA_EXT	GFXPIPE_3D_CMD(0x0, 0x8B)

#define CMD_3DSTATE_VIEWPORT_STATE_POINTERS_CC_2	GFXPIPE_3D_CMD(0x0, 0x8D)

#define CMD_3DSTATE_CC_STATE_POINTERS_2		GFXPIPE_3D_CMD(0x0, 0x8E)

#define CMD_3DSTATE_SCISSOR_STATE_POINTERS_2	GFXPIPE_3D_CMD(0x0, 0x8F)

#define CMD_3DSTATE_BLEND_STATE_POINTERS_2	GFXPIPE_3D_CMD(0x0, 0xA0)

#define CMD_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_2	GFXPIPE_3D_CMD(0x0, 0xA1)



#define CMD_3DSTATE_DRAWING_RECTANGLE		GFXPIPE_3D_CMD(0x1, 0x0)

#define CMD_3DSTATE_URB_MEMORY			GFXPIPE_3D_CMD(0x1, 0x1)

#define CMD_3DSTATE_CHROMA_KEY			GFXPIPE_3D_CMD(0x1, 0x4)

#define CMD_3DSTATE_POLY_STIPPLE_OFFSET		GFXPIPE_3D_CMD(0x1, 0x6)

#define CMD_3DSTATE_POLY_STIPPLE_PATTERN	GFXPIPE_3D_CMD(0x1, 0x7)
@@ -160,5 +169,6 @@ 
#define CMD_3DSTATE_SUBSLICE_HASH_TABLE		GFXPIPE_3D_CMD(0x1, 0x1F)

#define CMD_3DSTATE_SLICE_TABLE_STATE_POINTERS	GFXPIPE_3D_CMD(0x1, 0x20)

#define CMD_3DSTATE_PTBR_TILE_PASS_INFO		GFXPIPE_3D_CMD(0x1, 0x22)

#define CMD_3DSTATE_SLICE_TABLE_STATE_POINTER_2	GFXPIPE_3D_CMD(0x1, 0xA0)



#endif

drivers/gpu/drm/xe/xe_lrc.c

+10 −0
Original line number Diff line number Diff line
@@ -1966,6 +1966,7 @@ static int dump_gfxpipe_command(struct drm_printer *p, 
	MATCH(PIPELINE_SELECT);



	MATCH3D(3DSTATE_DRAWING_RECTANGLE_FAST);

	MATCH3D(3DSTATE_CUSTOM_SAMPLE_PATTERN);

	MATCH3D(3DSTATE_CLEAR_PARAMS);

	MATCH3D(3DSTATE_DEPTH_BUFFER);

	MATCH3D(3DSTATE_STENCIL_BUFFER);
@@ -2049,8 +2050,16 @@ static int dump_gfxpipe_command(struct drm_printer *p, 
	MATCH3D(3DSTATE_SBE_MESH);

	MATCH3D(3DSTATE_CPSIZE_CONTROL_BUFFER);

	MATCH3D(3DSTATE_COARSE_PIXEL);

	MATCH3D(3DSTATE_MESH_SHADER_DATA_EXT);

	MATCH3D(3DSTATE_TASK_SHADER_DATA_EXT);

	MATCH3D(3DSTATE_VIEWPORT_STATE_POINTERS_CC_2);

	MATCH3D(3DSTATE_CC_STATE_POINTERS_2);

	MATCH3D(3DSTATE_SCISSOR_STATE_POINTERS_2);

	MATCH3D(3DSTATE_BLEND_STATE_POINTERS_2);

	MATCH3D(3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP_2);



	MATCH3D(3DSTATE_DRAWING_RECTANGLE);

	MATCH3D(3DSTATE_URB_MEMORY);

	MATCH3D(3DSTATE_CHROMA_KEY);

	MATCH3D(3DSTATE_POLY_STIPPLE_OFFSET);

	MATCH3D(3DSTATE_POLY_STIPPLE_PATTERN);
@@ -2070,6 +2079,7 @@ static int dump_gfxpipe_command(struct drm_printer *p, 
	MATCH3D(3DSTATE_SUBSLICE_HASH_TABLE);

	MATCH3D(3DSTATE_SLICE_TABLE_STATE_POINTERS);

	MATCH3D(3DSTATE_PTBR_TILE_PASS_INFO);

	MATCH3D(3DSTATE_SLICE_TABLE_STATE_POINTER_2);



	default:

		drm_printf(p, "[%#010x] unknown GFXPIPE command (pipeline=%#x, opcode=%#x, subopcode=%#x), likely %d dwords\n",