freedreno/registers: Common-ize PIPE definitions

PIPE enum definitions are backward compatible. So move its definition
to adreno_common.xml.

Signed-off-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
Signed-off-by: Rob Clark <rob.clark@oss.qualcomm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37727>
This commit is contained in:
Rob Clark 2025-09-17 09:44:05 -07:00 committed by Marge Bot
parent 6959bd9f54
commit 8edd6eb42e
4 changed files with 15 additions and 11 deletions

View file

@ -236,9 +236,9 @@ statetype_id(const char *name)
static uint32_t
pipe_id(const char *name)
{
if (!is_a7xx())
if (!name)
return 0;
return enumval("a7xx_pipe", name);
return enumval("adreno_pipe", name);
}
static uint32_t

View file

@ -244,7 +244,7 @@ by a particular renderpass/blit.
<reg32 offset="0x094d" name="CP_ROQ_AVAIL_VSD" type="a6xx_cp_roq_avail" variants="A6XX-A7XX"/>
<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>
@ -3265,7 +3265,7 @@ by a particular renderpass/blit.
<reg32 offset="0xae6c" name="SP_HLSQ_DBG_ECO_CNTL" variants="A7XX-" usage="init"/>
<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"/>

View file

@ -93,13 +93,6 @@ xsi:schemaLocation="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd">
<value value="4" name="A7XX_HLSQ_DP_STR"/>
</enum>
<enum name="a7xx_pipe">
<value value="0" name="A7XX_PIPE_NONE"/>
<value value="1" name="A7XX_PIPE_BR"/>
<value value="2" name="A7XX_PIPE_BV"/>
<value value="3" name="A7XX_PIPE_LPAC"/>
</enum>
<enum name="a7xx_cluster">
<value value="0" name="A7XX_CLUSTER_NONE"/>
<value value="1" name="A7XX_CLUSTER_FE"/>

View file

@ -397,4 +397,15 @@ xsi:schemaLocation="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd">
<value value="0x7" name="TEX_PREFETCH_UNK7"/>
</enum>
<enum name="adreno_pipe">
<value value="0" name="PIPE_NONE"/>
<value value="1" name="PIPE_BR"/>
<value value="2" name="PIPE_BV"/>
<value value="3" name="PIPE_LPAC"/>
<value value="4" name="PIPE_AQE0"/>
<value value="5" name="PIPE_AQE1"/>
<value value="6" name="PIPE_DDE_BR"/>
<value value="7" name="PIPE_DDE_BV"/>
</enum>
</database>