drm/msm: Support for Eliza GPU
Subsystems (9)
Akhil P Oommen
reviewerv2 cover drm/msm: Support for Eliza GPU
Adreno 722 found in Eliza chipset belongs to the A7x Gen1 family. It is derived from A730 and shares the same IP-level configurations: HWCG registers, protected registers, GBIF CX registers and gmu_cgc_mode. Major differences include smaller cache/core counts, 1MB GMEM, no Concurrent Binning & LPAC support. Some of the peripheral blocks like RSCC are from A740 that resulted in updates to RSC layout.
The first few patches that updates driver and dt binding docs are for Rob Clark and the remaining devicetree bits are for Bjorn to pick up.
---
Changes in v2:
- Add a new patch for GPU passive cooling
- Rename firmwares to gen717*
- Capture trailers
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Abel Vesa (1):
arm64: dts: qcom: eliza: Add GPU SMMU node
Akhil P Oommen (2):
drm/msm/a6xx: Rename GBIF_CX_CONFIG to a A6XX- variant register
dt-bindings: arm-smmu: Document GPU SMMU for Eliza SoC
Gaurav Kohli (1):
arm64: dts: qcom: eliza: Add GPU cooling
Puranam V G Tejaswi (5):
drm/msm/a6xx: Fix RBBM_CLOCK_CNTL3_TP0 value in a730_hwcg drm/msm/a6xx: Add Adreno 722 support
dt-bindings: display/msm: Document Adreno 722 GPU and GMU
arm64: dts: qcom: eliza: Add GPU nodes
arm64: dts: qcom: eliza-mtp: Enable Adreno A722 GPU
.../devicetree/bindings/display/msm/gmu.yaml | 1 + .../devicetree/bindings/display/msm/gpu.yaml | 1 + .../devicetree/bindings/iommu/arm,smmu.yaml | 2 + arch/arm64/boot/dts/qcom/eliza-mtp.dts | 8 + arch/arm64/boot/dts/qcom/eliza.dtsi | 209 +++++++++- drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 38 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 17 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 81 +++- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 5 + drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 2 +- .../gpu/drm/msm/adreno/adreno_gen7_17_0_snapshot.h | 428 +++++++++++++++++++++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 5 + drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 2 +- 14 files changed, 773 insertions(+), 30 deletions(-)
---
base-commit: a9498e40e3e314ade387d3ab0d5cb14f0f3aa1ad
change-id: 20260704-eliza-gpu-eccf1946cb3c
prerequisite-message-id: <[email protected]>
prerequisite-patch-id: ecae5e45a33a79ec3f500e3f318e3a0129fddfb7
prerequisite-patch-id: 19fe32e5af810250eef42dab488c982ef70c055c
prerequisite-patch-id: 60dde5421adbc86f355b4899bedd0d7a1a0c4e5e
prerequisite-patch-id: 58c9dbb18795c662ea22c3a82b07d6465f604e08
prerequisite-patch-id: 0c6e220ecf2b42776f990ea5b98ba4ee97d229ee
prerequisite-patch-id: 0e0bed1091d12c102e2542b1c2931f61a543f2b0
prerequisite-patch-id: c0f22b4ff0bb79935848dde50c524f6063011ebb
Best regards,
Signature · 1 line
Akhil P Oommen <[email protected]>
Akhil P Oommen
reviewerPATCH v2 1/9 drm/msm/a6xx: Fix RBBM_CLOCK_CNTL3_TP0 value in a730_hwcg
From: Puranam V G Tejaswi <[email protected]>
The RBBM_CLOCK_CNTL3_TP0 entry in a730_hwcg has bits[19:16] set to 2 (clock gating enabled for that TP0 stage). As per the latest recommendation, clear this nibble to disable clock gating for this particular stage.
--- drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a6xx_catalog.c +1 -1
@@ -1199,7 +1199,7 @@ static const struct adreno_reglist a730_hwcg[] = { { REG_A6XX_RBBM_CLOCK_DELAY_SP0, 0x00000080 }, { REG_A6XX_RBBM_CLOCK_CNTL_TP0, 0x22222220 }, { REG_A6XX_RBBM_CLOCK_CNTL2_TP0, 0x22222222 }, - { REG_A6XX_RBBM_CLOCK_CNTL3_TP0, 0x22222222 }, + { REG_A6XX_RBBM_CLOCK_CNTL3_TP0, 0x22220222 }, { REG_A6XX_RBBM_CLOCK_CNTL4_TP0, 0x00222222 }, { REG_A6XX_RBBM_CLOCK_HYST_TP0, 0x77777777 }, { REG_A6XX_RBBM_CLOCK_HYST2_TP0, 0x77777777 },
Signature · 1 line
2.54.0
Akhil P Oommen
reviewerPATCH v2 2/9 drm/msm/a6xx: Rename GBIF_CX_CONFIG to a A6XX- variant register
In reply to Akhil P OommenThe GBIF_CX_CONFIG register exists on GPUs prior to A8XX (it is used on A722, for example), so it should be tagged as an A6XX variant to match the register spec. Widen its variant range from "A8XX-" to "A6XX-" in the register XML and rename the generated macro accordingly at all existing usage sites.
--- drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 2 +- drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_catalog.c +1 -1
@@ -2180,7 +2180,7 @@ static const struct adreno_reglist a840_gbif[] = { { REG_A6XX_GBIF_QSB_SIDE1, 0x00071e20 }, { REG_A6XX_GBIF_QSB_SIDE2, 0x00071e20 }, { REG_A6XX_GBIF_QSB_SIDE3, 0x00071e20 }, - { REG_A8XX_GBIF_CX_CONFIG, 0x20023000 }, + { REG_A6XX_GBIF_CX_CONFIG, 0x20023000 }, { }, };
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +1 -1
@@ -1032,7 +1032,7 @@ static int a6xx_gmu_fw_start(struct a6xx_gmu *gmu, unsigned int state)gpu_write (gpu, gbif_cx[i].offset, gbif_cx[i].value);if (adreno_is_a8xx (adreno_gpu)) { -gpu_write (gpu,REG_A8XX_GBIF_CX_CONFIG ,0x20023000 ); +gpu_write (gpu,REG_A6XX_GBIF_CX_CONFIG ,0x20023000 );gmu_write (gmu,REG_A6XX_GMU_MRC_GBIF_QOS_CTRL ,0x33 ); }
drivers/gpu/drm/msm/adreno/a8xx_gpu.c +1 -1
@@ -228,7 +228,7 @@ static void a8xx_set_hwcg(struct msm_gpu *gpu, bool state)* GMU enables clk gating in GBIF during boot up. So, * override that here when hwcg feature is disabled */ -gpu_rmw (gpu,REG_A8XX_GBIF_CX_CONFIG ,BIT (0 ),0 ); +gpu_rmw (gpu,REG_A6XX_GBIF_CX_CONFIG ,BIT (0 ),0 ); } }
drivers/gpu/drm/msm/registers/adreno/a6xx.xml +1 -1
@@ -1268,7 +1268,7 @@ by a particular renderpass/blit. <reg32 offset="0x3119" name="VBIF_PERF_PWR_CNT_HIGH1" variants="A6XX"/> <reg32 offset="0x311a" name="VBIF_PERF_PWR_CNT_HIGH2" variants="A6XX"/> - <reg32 offset="0x3c00" name="GBIF_CX_CONFIG" variants="A8XX-"/> + <reg32 offset="0x3c00" name="GBIF_CX_CONFIG" variants="A6XX-"/> <reg32 offset="0x3c01" name="GBIF_SCACHE_CNTL0"/> <reg32 offset="0x3c02" name="GBIF_SCACHE_CNTL1"/> <reg32 offset="0x3c03" name="GBIF_QSB_SIDE0"/>
Signature · 1 line
2.54.0
Akhil P Oommen
reviewerPATCH v2 3/9 drm/msm/a6xx: Add Adreno 722 support
In reply to Akhil P OommenFrom: Puranam V G Tejaswi <[email protected]>
Add support for Adreno A722, a member of the GEN1 A7xx family. It is derived from A730 and shares the same IP-level configurations: HWCG registers, protected registers, GBIF CX registers and gmu_cgc_mode. Major differences include lower cache/core counts, 1MB GMEM, no Concurrent Binning & LPAC support. Some of the peripheral blocks like RSCC are from A740 that resulted in updates to RSC layout.
Add a new entry to the catalog to describe the usual configuration and few additional fixup mainly due to missing CB/LPAC features and updated RSC layout.
--- drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 34 ++ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 15 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 81 +++- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 5 + .../gpu/drm/msm/adreno/adreno_gen7_17_0_snapshot.h | 428 +++++++++++++++++++++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 5 + 7 files changed, 549 insertions(+), 23 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_catalog.c +34 -0
@@ -1500,6 +1500,40 @@ static const struct adreno_info a7xx_gpus[] = { .gmu_cgc_mode = 0x00020000, }, .preempt_record_size = 2860 * SZ_1K, + }, { + .chip_ids = ADRENO_CHIP_IDS(0x43020100), + .family = ADRENO_7XX_GEN1, + .fw = { + [ADRENO_FW_SQE] = "qcom/gen71700_sqe.fw", + [ADRENO_FW_GMU] = "qcom/gen71700_gmu.bin", + }, + .gmem = SZ_1M, + .inactive_period = DRM_MSM_INACTIVE_PERIOD, + .quirks =ADRENO_QUIRK_HAS_CACHED_COHERENT | +ADRENO_QUIRK_HAS_HW_APRIV | + ADRENO_QUIRK_PREEMPTION, + .funcs = &a7xx_gpu_funcs, + .a6xx = &(const struct a6xx_info ) { + .hwcg = a730_hwcg, + .protect = &a730_protect, + .pwrup_reglist = &a7xx_pwrup_reglist, + .dyn_pwrup_reglist = &a7xx_dyn_pwrup_reglist, + .gbif_cx = a640_gbif, + .gmu_chipid =0x07110000 , + .gmu_cgc_mode =0x00020000 , + .bcms = (const struct a6xx_bcm []) { + { .name ="SH0" , .buswidth =16 }, + { .name ="MC0" , .buswidth =4 }, + { + .name ="ACV" , + .fixed = true, + .perfmode =BIT (3 ), + .perfmode_bw =16500000 , + }, + {/* sentinel */ }, + }, + }, + .preempt_record_size = 1536 * SZ_1K, }, { .chip_ids = ADRENO_CHIP_IDS(0x43050a01), /* "C510v2" */ .family = ADRENO_7XX_GEN2,
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +10 -5
@@ -710,7 +710,8 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)gmu_write_rscc (gmu,REG_A6XX_RSCC_HIDDEN_TCS_CMD0_DATA +2 ,0 );gmu_write_rscc (gmu,REG_A6XX_RSCC_HIDDEN_TCS_CMD0_ADDR +2 ,0 );gmu_write_rscc (gmu,REG_A6XX_RSCC_HIDDEN_TCS_CMD0_DATA +4 , -adreno_is_a740_family (adreno_gpu) ?0x80000021 :0x80000000 ); + (adreno_is_a740_family (adreno_gpu) || +adreno_is_a722 (adreno_gpu)) ?0x80000021 :0x80000000 );gmu_write_rscc (gmu,REG_A6XX_RSCC_HIDDEN_TCS_CMD0_ADDR +4 ,0 );gmu_write_rscc (gmu,REG_A6XX_RSCC_OVERRIDE_START_ADDR ,0 );gmu_write_rscc (gmu,REG_A6XX_RSCC_PDC_SEQ_START_ADDR ,0x4520 );
@@ -718,7 +719,7 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)gmu_write_rscc (gmu,REG_A6XX_RSCC_PDC_MATCH_VALUE_HI ,0x4514 );/* The second spin of A7xx GPUs messed with some register offsets.. */ -if (adreno_is_a740_family (adreno_gpu)) +if (adreno_is_a740_family (adreno_gpu) ||adreno_is_a722 (adreno_gpu)) seqmem0_drv0_reg =REG_A7XX_RSCC_SEQ_MEM_0_DRV0_A740 ;/* Load RSC sequencer uCode for sleep and wakeup */
@@ -1034,7 +1035,9 @@ static int a6xx_gmu_fw_start(struct a6xx_gmu *gmu, unsigned int state)if (adreno_is_a8xx (adreno_gpu)) {gpu_write (gpu,REG_A6XX_GBIF_CX_CONFIG ,0x20023000 );gmu_write (gmu,REG_A6XX_GMU_MRC_GBIF_QOS_CTRL ,0x33 ); - } + }else if (adreno_is_a722 (adreno_gpu)) +gpu_rmw (gpu,REG_A6XX_GBIF_CX_CONFIG ,GENMASK (31 ,29 ), +FIELD_PREP (GENMASK (31 ,29 ),2 ));/* Set up the lowest idle level on the GMU */ a6xx_gmu_power_config (gmu);
@@ -1087,7 +1090,8 @@ static void a6xx_gmu_rpmh_off(struct a6xx_gmu *gmu)u32 val, seqmem_off =0 ;/* The second spin of A7xx GPUs messed with some register offsets.. */ -if (adreno_is_a740_family (adreno_gpu) ||adreno_is_a8xx (adreno_gpu)) +if (adreno_is_a740_family (adreno_gpu) ||adreno_is_a722 (adreno_gpu) || +adreno_is_a8xx (adreno_gpu)) seqmem_off =4 ;/* Make sure there are no outstanding RPMh votes */
@@ -1100,7 +1104,8 @@ static void a6xx_gmu_rpmh_off(struct a6xx_gmu *gmu)gmu_poll_timeout_rscc (gmu,REG_A6XX_RSCC_TCS3_DRV0_STATUS + seqmem_off, val, (val &1 ),100 ,1000 ); -if (!adreno_is_a740_family (adreno_gpu) && !adreno_is_a8xx (adreno_gpu)) +if (!adreno_is_a740_family (adreno_gpu) && !adreno_is_a722 (adreno_gpu) && + !adreno_is_a8xx (adreno_gpu))return ; gmu_poll_timeout_rscc(gmu, REG_A7XX_RSCC_TCS4_DRV0_STATUS + seqmem_off,
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +3 -1
@@ -1273,7 +1273,8 @@ static int hw_init(struct msm_gpu *gpu)if (!(adreno_is_a650_family (adreno_gpu) ||adreno_is_a702 (adreno_gpu) ||adreno_is_a730 (adreno_gpu))) { - gmem_range_min =adreno_is_a740_family (adreno_gpu) ?SZ_16M :SZ_1M ; + gmem_range_min = (adreno_is_a740_family (adreno_gpu) || +adreno_is_a722 (adreno_gpu)) ?SZ_16M :SZ_1M ;/* Set the GMEM VA range [0x100000:0x100000 + gpu->gmem - 1] */ gpu_write64 (gpu,REG_A6XX_UCHE_GMEM_RANGE_MIN , gmem_range_min);
@@ -1338,6 +1339,7 @@ static int hw_init(struct msm_gpu *gpu)/* Enable fault detection */ if (adreno_is_a612 (adreno_gpu) || +adreno_is_a722 (adreno_gpu) ||adreno_is_a730 (adreno_gpu) ||adreno_is_a740_family (adreno_gpu))gpu_write (gpu,REG_A6XX_RBBM_INTERFACE_HANG_INT_CNTL , (1 <<30 ) |0xcfffff );
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +64 -17
157 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h +5 -0
@@ -462,6 +462,11 @@ static const struct a6xx_indexed_registers a7xx_cp_bv_mempool_indexed[] = { REG_A7XX_CP_BV_MEM_POOL_DBG_DATA, 0x2200, NULL }, }; +static const struct a6xx_indexed_registers a7xx_cp_mempool_indexed[] = { + {"CP_MEM_POOL_DBG" ,REG_A6XX_CP_MEM_POOL_DBG_ADDR , +REG_A6XX_CP_MEM_POOL_DBG_DATA ,0x2200 ,NULL }, +}; +#define DEBUGBUS (_id, _count) { .id = _id, .name = #_id, .count = _count } static const struct a6xx_debugbus_block {
drivers/gpu/drm/msm/adreno/adreno_gen7_17_0_snapshot.h new file +428 -0
428 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/adreno_gpu.h +5 -0
@@ -562,6 +562,11 @@ static inline int adreno_is_x185(struct adreno_gpu *gpu)return gpu->info->chip_ids[0 ] ==0x43050c01 ; } +static inline int adreno_is_a722 (struct adreno_gpu *gpu) +{ +return gpu->info->chip_ids[0 ] ==0x43020100 ; +} +static inline int adreno_is_a740_family (struct adreno_gpu *gpu) {if (WARN_ON_ONCE (!gpu->info))
Signature · 1 line
2.54.0
Akhil P Oommen
reviewerPATCH v2 4/9 dt-bindings: arm-smmu: Document GPU SMMU for Eliza SoC
In reply to Akhil P OommenAdd specific compatible strings to document the GPU SMMU present in the Eliza SoC.
--- Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +2 -0
@@ -95,6 +95,7 @@ properties: - description: Qcom Adreno GPUs implementing "qcom,smmu-500" and "arm,mmu-500" items: - enum: + - qcom,eliza-smmu-500 - qcom,glymur-smmu-500 - qcom,hawi-smmu-500 - qcom,kaanapali-smmu-500
@@ -570,6 +571,7 @@ allOf: compatible: items: - enum: + - qcom,eliza-smmu-500 - qcom,glymur-smmu-500 - qcom,hawi-smmu-500 - qcom,kaanapali-smmu-500
Signature · 1 line
2.54.0
Akhil P Oommen
reviewerPATCH v2 5/9 dt-bindings: display/msm: Document Adreno 722 GPU and GMU
In reply to Akhil P OommenFrom: Puranam V G Tejaswi <[email protected]>
Adreno 722 found in Eliza chipset belongs to the A7x Gen1 family. It is derived from A730 and shares the same IP-level configurations: HWCG registers, protected registers, GBIF CX registers and gmu_cgc_mode. Major differences include lower cache/core counts, 1MB GMEM, no Concurrent Binning & LPAC support. Some of the peripheral blocks like RSCC are from A740 that resulted in updates to RSC layout.
Update the dt-binding docs to document this GPU and GMU.
--- Documentation/devicetree/bindings/display/msm/gmu.yaml | 1 + Documentation/devicetree/bindings/display/msm/gpu.yaml | 1 + 2 files changed, 2 insertions(+)
Documentation/devicetree/bindings/display/msm/gmu.yaml +1 -0
@@ -262,6 +262,7 @@ allOf: compatible: contains: enum: + - qcom,adreno-gmu-722.0 - qcom,adreno-gmu-730.1 - qcom,adreno-gmu-740.1 - qcom,adreno-gmu-750.1
Documentation/devicetree/bindings/display/msm/gpu.yaml +1 -0
@@ -443,6 +443,7 @@ allOf: - qcom,adreno-680.1 - qcom,adreno-690.0 - qcom,adreno-730.1 + - qcom,adreno-43020100 - qcom,adreno-43030c00 - qcom,adreno-43050a01 - qcom,adreno-43050c01
Signature · 1 line
2.54.0
Akhil P Oommen
reviewerPATCH v2 6/9 arm64: dts: qcom: eliza: Add GPU SMMU node
In reply to Akhil P OommenFrom: Abel Vesa <[email protected]>
Add the nodes to describe the GPU SMMU.
--- arch/arm64/boot/dts/qcom/eliza.dtsi | 38 +++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
arch/arm64/boot/dts/qcom/eliza.dtsi +38 -0
@@ -2674,6 +2674,44 @@ mdss_dp0_out: endpoint { }; }; + adreno_smmu: iommu@3da0000 { + compatible = "qcom,eliza-smmu-500", "qcom,adreno-smmu", + "qcom,smmu-500", "arm,mmu-500"; + reg = <0x0 0x03da0000 0x0 0x40000>; + #iommu-cells = <2>; + #global-interrupts = <1>; + interrupts = <GIC_SPI 673 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 677 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 678 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 679 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 680 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 681 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 682 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 683 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 684 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 685 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 686 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 687 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 476 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 574 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 575 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 576 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 577 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 659 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 661 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 664 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 665 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 666 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 668 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 669 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 699 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>; + clock-names = "hlos"; + power-domains = <&gpucc GPU_CC_CX_GDSC>; + dma-coherent; + }; + gpucc: clock-controller@3d90000 { compatible = "qcom,eliza-gpucc"; reg = <0x0 0x03d90000 0x0 0xa000>;
Signature · 1 line
2.54.0
Re: [PATCH v2 6/9] arm64: dts: qcom: eliza: Add GPU SMMU node
Quoted 7 lines · Akhil P Oommen
From: Abel Vesa <[email protected]>
Add the nodes to describe the GPU SMMU.
Signed-off-by Abel Vesa <[email protected]>Signed-off-by Akhil P Oommen <[email protected]>---
Konrad
Akhil P Oommen
reviewerPATCH v2 7/9 arm64: dts: qcom: eliza: Add GPU nodes
In reply to Akhil P OommenFrom: Puranam V G Tejaswi <[email protected]>
Adreno 722 found in Eliza chipset belongs to the A7x GEN1 family. It is derived from A730 and shares the same IP-level configurations: HWCG registers, protected registers, GBIF CX registers and gmu_cgc_mode. Major differences include lower cache/core counts, 1MB GMEM, no Concurrent Binning & LPAC support. Some of the peripheral blocks like RSCC are from A740 that resulted in updates to RSC layout.
Add the necessary devicetree nodes to describe this GPU.
--- arch/arm64/boot/dts/qcom/eliza.dtsi | 152 ++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+)
arch/arm64/boot/dts/qcom/eliza.dtsi +152 -0
@@ -3742,6 +3742,158 @@ nsp_noc: interconnect@320c0000 { qcom,bcm-voters = <&apps_bcm_voter>; #interconnect-cells = <2>; }; + + gpu: gpu@3d00000 { + compatible = "qcom,adreno-43020100", "qcom,adreno"; + reg = <0x0 0x03d00000 0x0 0x40000>, + <0x0 0x03d9e000 0x0 0x1000>, + <0x0 0x03d61000 0x0 0x800>; + reg-names = "kgsl_3d0_reg_memory", + "cx_mem", + "cx_dbgc"; + + interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>; + + iommus = <&adreno_smmu 0x0 0x0>; + + operating-points-v2 = <&gpu_opp_table>; + qcom,gmu = <&gmu>; + #cooling-cells = <2>; + interconnects = <&gem_noc MASTER_GFX3D QCOM_ICC_TAG_ALWAYS + &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>; + interconnect-names = "gfx-mem"; + + status = "disabled"; + + gpu_zap_shader: zap-shader { + memory-region = <&gpu_micro_code_mem>; + }; + + gpu_opp_table: opp-table { + compatible = "operating-points-v2-adreno", + "operating-points-v2"; + + opp-259000000 { + opp-hz = /bits/ 64 <259000000>; + opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D1>; + opp-peak-kBps = <781250>; + qcom,opp-acd-level = <0xc82f5ffd>; + }; + + opp-345000000 { + opp-hz = /bits/ 64 <345000000>; + opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>; + opp-peak-kBps = <2136718>; + qcom,opp-acd-level = <0xc82f5ffd>; + }; + + opp-515000000 { + opp-hz = /bits/ 64 <515000000>; + opp-level = <RPMH_REGULATOR_LEVEL_SVS>; + opp-peak-kBps = <5285156>; + qcom,opp-acd-level = <0xc02d5ffd>; + }; + + opp-645000000 { + opp-hz = /bits/ 64 <645000000>; + opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>; + opp-peak-kBps = <6074218>; + qcom,opp-acd-level = <0x882f5ffd>; + }; + + opp-724000000 { + opp-hz = /bits/ 64 <724000000>; + opp-level = <RPMH_REGULATOR_LEVEL_SVS_L2>; + opp-peak-kBps = <6671875>; + qcom,opp-acd-level = <0xa82d5ffd>; + }; + + opp-796000000 { + opp-hz = /bits/ 64 <796000000>; + opp-level = <RPMH_REGULATOR_LEVEL_NOM>; + opp-peak-kBps = <10687500>; + qcom,opp-acd-level = <0x882d5ffd>; + }; + + opp-900000000 { + opp-hz = /bits/ 64 <900000000>; + opp-level = <RPMH_REGULATOR_LEVEL_NOM_L1>; + opp-peak-kBps = <10687500>; + qcom,opp-acd-level = <0x882d5ffd>; + }; + + opp-975000000 { + opp-hz = /bits/ 64 <975000000>; + opp-level = <RPMH_REGULATOR_LEVEL_TURBO>; + opp-peak-kBps = <12449218>; + qcom,opp-acd-level = <0x882c5ffd>; + }; + + opp-1075000000 { + opp-hz = /bits/ 64 <1075000000>; + opp-level = <RPMH_REGULATOR_LEVEL_TURBO_L1>; + opp-peak-kBps = <16500000>; + qcom,opp-acd-level = <0xa82a5ffd>; + }; + + opp-1150000000 { + opp-hz = /bits/ 64 <1150000000>; + opp-level = <RPMH_REGULATOR_LEVEL_TURBO_L2>; + opp-peak-kBps = <16500000>; + qcom,opp-acd-level = <0xa8295ffd>; + }; + }; + }; + + gmu: gmu@3d6a000 { + compatible = "qcom,adreno-gmu-722.0", "qcom,adreno-gmu"; + reg = <0x0 0x03d6a000 0x0 0x35000>, + <0x0 0x03d50000 0x0 0x10000>, + <0x0 0x0b290000 0x0 0x10000>; + reg-names = "gmu", "rscc", "gmu_pdc"; + + interrupts = <GIC_SPI 304 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "hfi", "gmu"; + + clocks = <&gpucc GPU_CC_AHB_CLK>, + <&gpucc GPU_CC_CX_GMU_CLK>, + <&gpucc GPU_CC_CXO_CLK>, + <&gcc GCC_DDRSS_GPU_AXI_CLK>, + <&gcc GCC_GPU_GEMNOC_GFX_CLK>, + <&gpucc GPU_CC_HUB_CX_INT_CLK>, + <&gpucc GPU_CC_DEMET_CLK>; + clock-names = "ahb", + "gmu", + "cxo", + "axi", + "memnoc", + "hub", + "demet"; + + power-domains = <&gpucc GPU_CC_CX_GDSC>, + <&gpucc GPU_CC_GX_GDSC>; + power-domain-names = "cx", + "gx"; + + iommus = <&adreno_smmu 0x5 0x0>; + qcom,qmp = <&aoss_qmp>; + operating-points-v2 = <&gmu_opp_table>; + + gmu_opp_table: opp-table { + compatible = "operating-points-v2"; + + opp-220000000 { + opp-hz = /bits/ 64 <220000000>; + opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>; + }; + + opp-550000000 { + opp-hz = /bits/ 64 <550000000>; + opp-level = <RPMH_REGULATOR_LEVEL_SVS>; + }; + }; + }; }; thermal-zones {
Signature · 1 line
2.54.0
Re: [PATCH v2 7/9] arm64: dts: qcom: eliza: Add GPU nodes
Quoted 9 lines · Akhil P Oommen
From: Puranam V G Tejaswi <[email protected]>
Adreno 722 found in Eliza chipset belongs to the A7x GEN1 family. It is derived from A730 and shares the same IP-level configurations: HWCG registers, protected registers, GBIF CX registers and
gmu_cgc_mode. Major differences include lower cache/core counts, 1MB GMEM, no Concurrent Binning & LPAC support. Some of the peripheral blocks like RSCC are from A740 that resulted in updates to RSC layout.
Quoted 5 lines
Add the necessary devicetree nodes to describe this GPU.
Signed-off-by Puranam V G Tejaswi <[email protected]>Reviewed-by Konrad Dybcio <[email protected]>Signed-off-by Akhil P Oommen <[email protected]>
Akhil P Oommen
reviewerPATCH v2 8/9 arm64: dts: qcom: eliza: Add GPU cooling
In reply to Akhil P OommenFrom: Gaurav Kohli <[email protected]>
Unlike the CPU, the GPU does not throttle its speed automatically when it reaches high temperatures. Set up GPU cooling by throttling the GPU speed when it reaches 95°C.
--- arch/arm64/boot/dts/qcom/eliza.dtsi | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/eliza.dtsi +17 -2
@@ -22,6 +22,7 @@ #include <dt-bindings/phy/phy-qcom-qmp.h> #include <dt-bindings/power/qcom,rpmhpd.h> #include <dt-bindings/soc/qcom,rpmh-rsc.h> +#include <dt-bindings/thermal/thermal.h> / { interrupt-parent = <&intc>;
@@ -4203,7 +4204,7 @@ gpuss0-thermal { thermal-sensors = <&tsens1 8>; trips { - gpu-alert { + gpuss0_alert0: gpu-alert { temperature = <95000>; hysteresis = <1000>; type = "passive";
@@ -4221,6 +4222,13 @@ gpu-critical { type = "critical"; }; }; + + cooling-maps { + map0 { + trip = <&gpuss0_alert0>; + cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; }; gpuss1-thermal {
@@ -4229,7 +4237,7 @@ gpuss1-thermal { thermal-sensors = <&tsens1 9>; trips { - gpu-alert { + gpuss1_alert0: gpu-alert { temperature = <95000>; hysteresis = <1000>; type = "passive";
@@ -4247,6 +4255,13 @@ gpu-critical { type = "critical"; }; }; + + cooling-maps { + map0 { + trip = <&gpuss1_alert0>; + cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; }; modem0-thermal {
Signature · 1 line
2.54.0
Re: [PATCH v2 8/9] arm64: dts: qcom: eliza: Add GPU cooling
Quoted 9 lines · Akhil P Oommen
From: Gaurav Kohli <[email protected]>
Unlike the CPU, the GPU does not throttle its speed automatically when it reaches high temperatures. Set up GPU cooling by throttling the GPU speed when it reaches 95°C.
Signed-off-by Gaurav Kohli <[email protected]>Signed-off-by Akhil P Oommen <[email protected]>---
Konrad
Akhil P Oommen
reviewerPATCH v2 9/9 arm64: dts: qcom: eliza-mtp: Enable Adreno A722 GPU
In reply to Akhil P OommenFrom: Puranam V G Tejaswi <[email protected]>
Enable the Adreno A722 GPU on the Eliza MTP board and provide the zap shader firmware path.
--- arch/arm64/boot/dts/qcom/eliza-mtp.dts | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/qcom/eliza-mtp.dts +8 -0
@@ -417,6 +417,14 @@ vreg_l7k: ldo7 { }; }; +&gpu { + status = "okay"; +}; + +&gpu_zap_shader { + firmware-name = "qcom/eliza/gen71700_zap.mbn"; +}; + &mdss { status = "okay"; };
Signature · 1 line
2.54.0
Re: [PATCH v2 9/9] arm64: dts: qcom: eliza-mtp: Enable Adreno A722 GPU
Quoted 8 lines · Akhil P Oommen
From: Puranam V G Tejaswi <[email protected]>
Enable the Adreno A722 GPU on the Eliza MTP board and provide the zap shader firmware path.
Signed-off-by Puranam V G Tejaswi <[email protected]>Reviewed-by Konrad Dybcio <[email protected]>Signed-off-by Akhil P Oommen <[email protected]>
Will Deacon
maintainerQuoted 8 lines · Akhil P Oommen
Adreno 722 found in Eliza chipset belongs to the A7x Gen1 family. It is derived from A730 and shares the same IP-level configurations: HWCG registers, protected registers, GBIF CX registers and
gmu_cgc_mode. Major differences include smaller cache/core counts, 1MB GMEM, no Concurrent Binning & LPAC support. Some of the peripheral blocks like RSCC are from A740 that resulted in updates to RSC layout.[...]
Applied bindings update to iommu (arm/smmu/bindings), thanks!
[4/9] dt-bindings: arm-smmu: Document GPU SMMU for Eliza SoC
https://git.kernel.org/iommu/c/925f98235a72
Cheers,
Signature · 5 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev
Re: (subset) [PATCH v2 0/9] drm/msm: Support for Eliza GPU
In reply to Akhil P OommenQuoted 8 lines · Akhil P Oommen
Adreno 722 found in Eliza chipset belongs to the A7x Gen1 family. It is derived from A730 and shares the same IP-level configurations: HWCG registers, protected registers, GBIF CX registers and
gmu_cgc_mode. Major differences include smaller cache/core counts, 1MB GMEM, no Concurrent Binning & LPAC support. Some of the peripheral blocks like RSCC are from A740 that resulted in updates to RSC layout.[...]
Applied, thanks!
[6/9] arm64: dts: qcom: eliza: Add GPU SMMU node
commit: 0cb81794dea5b236122578bd49e3e6bfdc6adf87
[7/9] arm64: dts: qcom: eliza: Add GPU nodes
commit: 5cc169156d877a4aa947092dd3c9dbd784d62f93
[8/9] arm64: dts: qcom: eliza: Add GPU cooling
commit: c53d30b2814e0f0215cdafe9ccf691eace2949ff
[9/9] arm64: dts: qcom: eliza-mtp: Enable Adreno A722 GPU
commit: 864e8d024df64433f9916c72411c92157dd4ca53Best regards,
Signature · 1 line
Bjorn Andersson <[email protected]>