Skip to content

Commit f5232d6

Browse files
akhilpo-qcomRob Clark
authored andcommitted
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: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Signed-off-by: Akhil 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: Rob Clark <robin.clark@oss.qualcomm.com>
1 parent f2a742e commit f5232d6

7 files changed

Lines changed: 617 additions & 613 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ struct gen7_sptp_cluster_registers {
575575
/* statetype: SP block state type for the cluster */
576576
enum a7xx_statetype_id statetype;
577577
/* pipe_id: Pipe identifier */
578-
enum a7xx_pipe pipe_id;
578+
enum adreno_pipe pipe_id;
579579
/* context_id: Context identifier */
580580
int context_id;
581581
/* location_id: Location identifier */
@@ -801,10 +801,10 @@ static const char *a7xx_statetype_names[] = {
801801
};
802802

803803
static const char *a7xx_pipe_names[] = {
804-
A7XX_NAME(A7XX_PIPE_NONE),
805-
A7XX_NAME(A7XX_PIPE_BR),
806-
A7XX_NAME(A7XX_PIPE_BV),
807-
A7XX_NAME(A7XX_PIPE_LPAC),
804+
A7XX_NAME(PIPE_NONE),
805+
A7XX_NAME(PIPE_BR),
806+
A7XX_NAME(PIPE_BV),
807+
A7XX_NAME(PIPE_LPAC),
808808
};
809809

810810
static const char *a7xx_cluster_names[] = {

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

Lines changed: 206 additions & 206 deletions
Large diffs are not rendered by default.

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

Lines changed: 162 additions & 162 deletions
Large diffs are not rendered by default.

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

Lines changed: 231 additions & 231 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ by a particular renderpass/blit.
249249
</reg32>
250250

251251
<bitset name="a7xx_aperture_cntl" inline="yes">
252-
<bitfield name="PIPE" low="12" high="13" type="a7xx_pipe"/>
252+
<bitfield name="PIPE" low="12" high="13" type="adreno_pipe"/>
253253
<bitfield name="CLUSTER" low="8" high="10" type="a7xx_cluster"/>
254254
<bitfield name="CONTEXT" low="4" high="5"/>
255255
</bitset>
@@ -3267,7 +3267,7 @@ by a particular renderpass/blit.
32673267
<reg32 offset="0xae6c" name="SP_HLSQ_DBG_ECO_CNTL" variants="A7XX-" usage="cmd"/>
32683268
<reg32 offset="0xae6d" name="SP_READ_SEL" variants="A7XX-">
32693269
<bitfield name="LOCATION" low="18" high="20" type="a7xx_state_location"/>
3270-
<bitfield name="PIPE" low="16" high="17" type="a7xx_pipe"/>
3270+
<bitfield name="PIPE" low="16" high="17" type="adreno_pipe"/>
32713271
<bitfield name="STATETYPE" low="8" high="15" type="a7xx_statetype_id"/>
32723272
<bitfield name="USPTP" low="4" high="7"/>
32733273
<bitfield name="SPTP" low="0" high="3"/>

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,6 @@ xsi:schemaLocation="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd">
9393
<value value="4" name="A7XX_HLSQ_DP_STR"/>
9494
</enum>
9595

96-
<enum name="a7xx_pipe">
97-
<value value="0" name="A7XX_PIPE_NONE"/>
98-
<value value="1" name="A7XX_PIPE_BR"/>
99-
<value value="2" name="A7XX_PIPE_BV"/>
100-
<value value="3" name="A7XX_PIPE_LPAC"/>
101-
</enum>
102-
10396
<enum name="a7xx_cluster">
10497
<value value="0" name="A7XX_CLUSTER_NONE"/>
10598
<value value="1" name="A7XX_CLUSTER_FE"/>

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,4 +397,15 @@ xsi:schemaLocation="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd">
397397
<value value="0x7" name="TEX_PREFETCH_UNK7"/>
398398
</enum>
399399

400+
<enum name="adreno_pipe">
401+
<value value="0" name="PIPE_NONE"/>
402+
<value value="1" name="PIPE_BR"/>
403+
<value value="2" name="PIPE_BV"/>
404+
<value value="3" name="PIPE_LPAC"/>
405+
<value value="4" name="PIPE_AQE0"/>
406+
<value value="5" name="PIPE_AQE1"/>
407+
<value value="6" name="PIPE_DDE_BR"/>
408+
<value value="7" name="PIPE_DDE_BV"/>
409+
</enum>
410+
400411
</database>

0 commit comments

Comments
 (0)