Commit f5232d63 authored by Akhil P Oommen's avatar Akhil P Oommen Committed by Rob Clark
Browse files

drm/msm/adreno: Common-ize PIPE definitions 



Newer gen's introduce pipe enums which do not exist on older gens, but
the numeric values do not conflict. IOW, they are backward compatible.
So move its definition to adreno_common.xml.

Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: default avatarAkhil P Oommen <akhilpo@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/689001/


Message-ID: <20251118-kaana-gpu-support-v4-5-86eeb8e93fb6@oss.qualcomm.com>
Signed-off-by: default avatarRob Clark <robin.clark@oss.qualcomm.com>
parent f2a742eb

drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h

+5 −5
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ struct gen7_sptp_cluster_registers { 
	/* statetype: SP block state type for the cluster */

	enum a7xx_statetype_id statetype;

	/* pipe_id: Pipe identifier */

	enum a7xx_pipe pipe_id;

	enum adreno_pipe pipe_id;

	/* context_id: Context identifier */

	int context_id;

	/* location_id: Location identifier */
@@ -801,10 +801,10 @@ static const char *a7xx_statetype_names[] = { 
};



static const char *a7xx_pipe_names[] = {

	A7XX_NAME(A7XX_PIPE_NONE),

	A7XX_NAME(A7XX_PIPE_BR),

	A7XX_NAME(A7XX_PIPE_BV),

	A7XX_NAME(A7XX_PIPE_LPAC),

	A7XX_NAME(PIPE_NONE),

	A7XX_NAME(PIPE_BR),

	A7XX_NAME(PIPE_BV),

	A7XX_NAME(PIPE_LPAC),

};



static const char *a7xx_cluster_names[] = {

drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h

+206 −206

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h

+162 −162

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h

+231 −231

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/msm/registers/adreno/a6xx.xml

+2 −2
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ by a particular renderpass/blit. 
	</reg32>



	<bitset name="a7xx_aperture_cntl" inline="yes">

		<bitfield name="PIPE" low="12" high="13" type="a7xx_pipe"/>

		<bitfield name="PIPE" low="12" high="13" type="adreno_pipe"/>

		<bitfield name="CLUSTER" low="8" high="10" type="a7xx_cluster"/>

		<bitfield name="CONTEXT" low="4" high="5"/>

	</bitset>
@@ -3267,7 +3267,7 @@ by a particular renderpass/blit. 
	<reg32 offset="0xae6c" name="SP_HLSQ_DBG_ECO_CNTL" variants="A7XX-" usage="cmd"/>

	<reg32 offset="0xae6d" name="SP_READ_SEL" variants="A7XX-">

		<bitfield name="LOCATION" low="18" high="20" type="a7xx_state_location"/>

		<bitfield name="PIPE" low="16" high="17" type="a7xx_pipe"/>

		<bitfield name="PIPE" low="16" high="17" type="adreno_pipe"/>

		<bitfield name="STATETYPE" low="8" high="15" type="a7xx_statetype_id"/>

		<bitfield name="USPTP" low="4" high="7"/>

		<bitfield name="SPTP" low="0" high="3"/>