Add support for Adreno 508/509/512
Subsystems (4)
cover Add support for Adreno 508/509/512
From: AngeloGioacchino Del Regno <[email protected]>
In this patch series, we are adding support for lower end Adreno 5 series GPUs, such as A508, A509 and A512 that we have found in the Qualcomm SDM630, SDM636 and SDM660 SoCs.
On a note, adding support for these three units, also adds 99% of the required "things" for another two GPUs, A505 and A506 but, even if adding them requires literally two lines of code, noone of us has got any SoC equipped with these ones hence we wouldn't be able to test. Even though there is basically no reason for them to not work correctly, kernel side, I chose to avoid adding the two "magic" lines.
Anyway, this patchset also addresses some issues that we've found in the A5XX part of the Adreno driver, regarding a logic mistake in one of the VPC protect values and a forced overwrite of the register named A5XX_PC_DBG_ECO_CNTL, forcing the setting of vtxFifo and primFifo thresholds that was valid only for higher end GPUs.
This patch series has been tested on the following devices:
- Sony Xperia XA2 Ultra (SDM630 Nile Discovery)
- Sony Xperia 10 (SDM630 Ganges Kirin)
- Sony Xperia 10 Plus (SDM636 Ganges Mermaid)
AngeloGioacchino Del Regno (4):
drm/msm/a5xx: Remove overwriting A5XX_PC_DBG_ECO_CNTL register drm/msm/a5xx: Separate A5XX_PC_DBG_ECO_CNTL write from main branch drm/msm/a5xx: Add support for Adreno 508, 509, 512 GPUs drm/msm/a5xx: Reset VBIF before PC only on A510 and A530
Konrad Dybcio (3):
drm/msm/a5xx: Fix VPC protect value in gpu_write() drm/msm/a5xx: Disable flat shading optimization drm/msm/a5xx: Disable UCHE global filter
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 195 ++++++++++++++++++--- drivers/gpu/drm/msm/adreno/a5xx_power.c | 4 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 60 +++++++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 15 ++ 4 files changed, 247 insertions(+), 27 deletions(-)
Signature · 1 line
2.28.0
PATCH 1/7 drm/msm/a5xx: Remove overwriting A5XX_PC_DBG_ECO_CNTL register
From: AngeloGioacchino Del Regno <[email protected]>
The PC_DBG_ECO_CNTL register on the Adreno A5xx family gets programmed to some different values on a per-model basis. At least, this is what we intend to do here;
Unfortunately, though, this register is being overwritten with a static magic number, right after applying the GPU-specific configuration (including the GPU-specific quirks) and that is effectively nullifying the efforts.
Let's remove the redundant and wrong write to the PC_DBG_ECO_CNTL register in order to retain the wanted configuration for the target GPU.
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +0 -2
@@ -594,8 +594,6 @@ static int a5xx_hw_init(struct msm_gpu *gpu)if (adreno_gpu->info->quirks &ADRENO_QUIRK_TWO_PASS_USE_WFI )gpu_rmw (gpu,REG_A5XX_PC_DBG_ECO_CNTL ,0 , (1 <<8 )); -gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL ,0xc0200100 ); -/* Enable USE_RETENTION_FLOPS */ gpu_write (gpu,REG_A5XX_CP_CHICKEN_DBG ,0x02000000 );
Signature · 1 line
2.28.0
Re: [PATCH 1/7] drm/msm/a5xx: Remove overwriting A5XX_PC_DBG_ECO_CNTL register
Quoted 6 lines · On Sat, Sep 26, 2020 at 02:51:40PM +0200, [email protected] wrote:
From: AngeloGioacchino Del Regno <[email protected]>
The
PC_DBG_ECO_CNTLregister on the Adreno A5xx family gets programmed to some different values on a per-model basis. At least, this is what we intend to do here;
Quoted 8 lines
Unfortunately, though, this register is being overwritten with a static magic number, right after applying the GPU-specific configuration (including the GPU-specific quirks) and that is effectively nullifying the efforts.
Let's remove the redundant and wrong write to the
PC_DBG_ECO_CNTLregister in order to retain the wanted configuration for the target GPU.
This was probably inherited from downstream which doesn't mind RMWing the same register multiple times.
Quoted 21 lines
Signed-off-by AngeloGioacchino Del Regno <[email protected]>--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/msm/adreno/a5xx_gpu.c +0
-2@@ -594,8 +594,6 @@ static int a5xx_hw_init(struct msm_gpu *gpu)if (adreno_gpu->info->quirks &ADRENO_QUIRK_TWO_PASS_USE_WFI )gpu_rmw (gpu,REG_A5XX_PC_DBG_ECO_CNTL ,0 , (1 <<8 )); -gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL ,0xc0200100 ); -/* Enable USE_RETENTION_FLOPS */ gpu_write (gpu,REG_A5XX_CP_CHICKEN_DBG ,0x02000000 );Signature · 1 line
2.28.0
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 2/7 drm/msm/a5xx: Separate A5XX_PC_DBG_ECO_CNTL write from main branch
In reply to [email protected]From: AngeloGioacchino Del Regno <[email protected]>
The "main" if branch where we program the other regsiters for the Adreno 5xx family of GPUs should not contain the PC_DBG_ECO_CNTL register programming because this has logical similarity differences from all the others.
A later commit will show the entire sense of this.
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +6 -3
@@ -577,8 +577,6 @@ static int a5xx_hw_init(struct msm_gpu *gpu)gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x20 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_2 ,0x40000030 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_1 ,0x20100D0A ); -gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL , - (0x200 <<11 |0x200 <<22 )); }else {gpu_write (gpu,REG_A5XX_CP_MEQ_THRESHOLDS ,0x40 );if (adreno_is_a530 (adreno_gpu))
@@ -587,9 +585,14 @@ static int a5xx_hw_init(struct msm_gpu *gpu)gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x400 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_2 ,0x80000060 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_1 ,0x40201B16 ); + } + +if (adreno_is_a510 (adreno_gpu)) +gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL , + (0x200 <<11 |0x200 <<22 )); +else gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL , (0x400 <<11 |0x300 <<22 )); - }if (adreno_gpu->info->quirks &ADRENO_QUIRK_TWO_PASS_USE_WFI )gpu_rmw (gpu,REG_A5XX_PC_DBG_ECO_CNTL ,0 , (1 <<8 ));
Signature · 1 line
2.28.0
Re: [PATCH 2/7] drm/msm/a5xx: Separate A5XX_PC_DBG_ECO_CNTL write from main branch
Quoted 3 lines · On Sat, Sep 26, 2020 at 02:51:41PM +0200, [email protected] wrote:
From: AngeloGioacchino Del Regno <[email protected]>
The "main" if branch where we program the other regsiters for the
Nit - regsiters -> registers
Quoted 5 lines
Adreno 5xx family of GPUs should not contain the
PC_DBG_ECO_CNTLregister programming because this has logical similarity differences from all the others.A later commit will show the entire sense of this.
With that
Quoted 37 lines
Signed-off-by AngeloGioacchino Del Regno <[email protected]>--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/msm/adreno/a5xx_gpu.c +6
-3@@ -577,8 +577,6 @@ static int a5xx_hw_init(struct msm_gpu *gpu)gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x20 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_2 ,0x40000030 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_1 ,0x20100D0A ); -gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL , - (0x200 <<11 |0x200 <<22 )); }else {gpu_write (gpu,REG_A5XX_CP_MEQ_THRESHOLDS ,0x40 );if (adreno_is_a530 (adreno_gpu))@@ -587,9 +585,14 @@ static int a5xx_hw_init(struct msm_gpu *gpu)gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x400 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_2 ,0x80000060 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_1 ,0x40201B16 ); + } + +if (adreno_is_a510 (adreno_gpu)) +gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL , + (0x200 <<11 |0x200 <<22 )); +else gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL , (0x400 <<11 |0x300 <<22 )); - }if (adreno_gpu->info->quirks &ADRENO_QUIRK_TWO_PASS_USE_WFI )gpu_rmw (gpu,REG_A5XX_PC_DBG_ECO_CNTL ,0 , (1 <<8 ));Signature · 1 line
2.28.0
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 3/7 drm/msm/a5xx: Add support for Adreno 508, 509, 512 GPUs
In reply to [email protected]From: AngeloGioacchino Del Regno <[email protected]>
The Adreno 508/509/512 GPUs are stripped versions of the Adreno 5xx found in the mid-end SoCs such as SDM630, SDM636, SDM660 and SDA variants; these SoCs are usually provided with ZAP firmwares, but they have no available GPMU.
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 172 ++++++++++++++++++--- drivers/gpu/drm/msm/adreno/a5xx_power.c | 4 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 60 +++++++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 15 ++ 4 files changed, 231 insertions(+), 20 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +154 -18
@@ -212,7 +212,7 @@ static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,a5xx_preempt_trigger (gpu); } -static const struct { +static const struct adreno_five_hwcg_regs {u32 offset;u32 value; } a5xx_hwcg[] = {
@@ -308,16 +308,124 @@ static const struct { {REG_A5XX_RBBM_CLOCK_DELAY_TSE_RAS_RBBM, 0x00004000}, {REG_A5XX_RBBM_CLOCK_DELAY_GPC, 0x00000200}, {REG_A5XX_RBBM_CLOCK_DELAY_VFD, 0x00002222} +}, a50x_hwcg[] = { + {REG_A5XX_RBBM_CLOCK_CNTL_SP0, 0x02222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_SP0, 0x02222220}, + {REG_A5XX_RBBM_CLOCK_HYST_SP0, 0x0000F3CF}, + {REG_A5XX_RBBM_CLOCK_DELAY_SP0, 0x00000080}, + {REG_A5XX_RBBM_CLOCK_CNTL_TP0, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_TP0, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL3_TP0, 0x00002222}, + {REG_A5XX_RBBM_CLOCK_HYST_TP0, 0x77777777}, + {REG_A5XX_RBBM_CLOCK_HYST2_TP0, 0x77777777}, + {REG_A5XX_RBBM_CLOCK_HYST3_TP0, 0x00007777}, + {REG_A5XX_RBBM_CLOCK_DELAY_TP0, 0x11111111}, + {REG_A5XX_RBBM_CLOCK_DELAY2_TP0, 0x11111111}, + {REG_A5XX_RBBM_CLOCK_DELAY3_TP0, 0x00001111}, + {REG_A5XX_RBBM_CLOCK_CNTL2_UCHE, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL3_UCHE, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL4_UCHE, 0x00222222}, + {REG_A5XX_RBBM_CLOCK_CNTL_UCHE, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_HYST_UCHE, 0x00FFFFF4}, + {REG_A5XX_RBBM_CLOCK_DELAY_UCHE, 0x00000002}, + {REG_A5XX_RBBM_CLOCK_CNTL_RB0, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_RB0, 0x00222222}, + {REG_A5XX_RBBM_CLOCK_CNTL_CCU0, 0x00022220}, + {REG_A5XX_RBBM_CLOCK_CNTL_RAC, 0x05522222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_RAC, 0x00505555}, + {REG_A5XX_RBBM_CLOCK_HYST_RB_CCU0, 0x04040404}, + {REG_A5XX_RBBM_CLOCK_HYST_RAC, 0x07444044}, + {REG_A5XX_RBBM_CLOCK_DELAY_RB_CCU_L1_0, 0x00000002}, + {REG_A5XX_RBBM_CLOCK_DELAY_RAC, 0x00010011}, + {REG_A5XX_RBBM_CLOCK_CNTL_TSE_RAS_RBBM, 0x04222222}, + {REG_A5XX_RBBM_CLOCK_MODE_GPC, 0x02222222}, + {REG_A5XX_RBBM_CLOCK_MODE_VFD, 0x00002222}, + {REG_A5XX_RBBM_CLOCK_HYST_TSE_RAS_RBBM, 0x00000000}, + {REG_A5XX_RBBM_CLOCK_HYST_GPC, 0x04104004}, + {REG_A5XX_RBBM_CLOCK_HYST_VFD, 0x00000000}, + {REG_A5XX_RBBM_CLOCK_DELAY_HLSQ, 0x00000000}, + {REG_A5XX_RBBM_CLOCK_DELAY_TSE_RAS_RBBM, 0x00004000}, + {REG_A5XX_RBBM_CLOCK_DELAY_GPC, 0x00000200}, + {REG_A5XX_RBBM_CLOCK_DELAY_VFD, 0x00002222}, +}, a512_hwcg[] = { + {REG_A5XX_RBBM_CLOCK_CNTL_SP0, 0x02222222}, + {REG_A5XX_RBBM_CLOCK_CNTL_SP1, 0x02222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_SP0, 0x02222220}, + {REG_A5XX_RBBM_CLOCK_CNTL2_SP1, 0x02222220}, + {REG_A5XX_RBBM_CLOCK_HYST_SP0, 0x0000F3CF}, + {REG_A5XX_RBBM_CLOCK_HYST_SP1, 0x0000F3CF}, + {REG_A5XX_RBBM_CLOCK_DELAY_SP0, 0x00000080}, + {REG_A5XX_RBBM_CLOCK_DELAY_SP1, 0x00000080}, + {REG_A5XX_RBBM_CLOCK_CNTL_TP0, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL_TP1, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_TP0, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_TP1, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL3_TP0, 0x00002222}, + {REG_A5XX_RBBM_CLOCK_CNTL3_TP1, 0x00002222}, + {REG_A5XX_RBBM_CLOCK_HYST_TP0, 0x77777777}, + {REG_A5XX_RBBM_CLOCK_HYST_TP1, 0x77777777}, + {REG_A5XX_RBBM_CLOCK_HYST2_TP0, 0x77777777}, + {REG_A5XX_RBBM_CLOCK_HYST2_TP1, 0x77777777}, + {REG_A5XX_RBBM_CLOCK_HYST3_TP0, 0x00007777}, + {REG_A5XX_RBBM_CLOCK_HYST3_TP1, 0x00007777}, + {REG_A5XX_RBBM_CLOCK_DELAY_TP0, 0x11111111}, + {REG_A5XX_RBBM_CLOCK_DELAY_TP1, 0x11111111}, + {REG_A5XX_RBBM_CLOCK_DELAY2_TP0, 0x11111111}, + {REG_A5XX_RBBM_CLOCK_DELAY2_TP1, 0x11111111}, + {REG_A5XX_RBBM_CLOCK_DELAY3_TP0, 0x00001111}, + {REG_A5XX_RBBM_CLOCK_DELAY3_TP1, 0x00001111}, + {REG_A5XX_RBBM_CLOCK_CNTL_UCHE, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_UCHE, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL3_UCHE, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL4_UCHE, 0x00222222}, + {REG_A5XX_RBBM_CLOCK_HYST_UCHE, 0x00444444}, + {REG_A5XX_RBBM_CLOCK_DELAY_UCHE, 0x00000002}, + {REG_A5XX_RBBM_CLOCK_CNTL_RB0, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL_RB1, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_RB0, 0x00222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_RB1, 0x00222222}, + {REG_A5XX_RBBM_CLOCK_CNTL_CCU0, 0x00022220}, + {REG_A5XX_RBBM_CLOCK_CNTL_CCU1, 0x00022220}, + {REG_A5XX_RBBM_CLOCK_CNTL_RAC, 0x05522222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_RAC, 0x00505555}, + {REG_A5XX_RBBM_CLOCK_HYST_RB_CCU0, 0x04040404}, + {REG_A5XX_RBBM_CLOCK_HYST_RB_CCU1, 0x04040404}, + {REG_A5XX_RBBM_CLOCK_HYST_RAC, 0x07444044}, + {REG_A5XX_RBBM_CLOCK_DELAY_RB_CCU_L1_0, 0x00000002}, + {REG_A5XX_RBBM_CLOCK_DELAY_RB_CCU_L1_1, 0x00000002}, + {REG_A5XX_RBBM_CLOCK_DELAY_RAC, 0x00010011}, + {REG_A5XX_RBBM_CLOCK_CNTL_TSE_RAS_RBBM, 0x04222222}, + {REG_A5XX_RBBM_CLOCK_MODE_GPC, 0x02222222}, + {REG_A5XX_RBBM_CLOCK_MODE_VFD, 0x00002222}, + {REG_A5XX_RBBM_CLOCK_HYST_TSE_RAS_RBBM, 0x00000000}, + {REG_A5XX_RBBM_CLOCK_HYST_GPC, 0x04104004}, + {REG_A5XX_RBBM_CLOCK_HYST_VFD, 0x00000000}, + {REG_A5XX_RBBM_CLOCK_DELAY_HLSQ, 0x00000000}, + {REG_A5XX_RBBM_CLOCK_DELAY_TSE_RAS_RBBM, 0x00004000}, + {REG_A5XX_RBBM_CLOCK_DELAY_GPC, 0x00000200}, + {REG_A5XX_RBBM_CLOCK_DELAY_VFD, 0x00002222}, };void a5xx_set_hwcg (struct msm_gpu *gpu,bool state) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); -unsigned int i; +const struct adreno_five_hwcg_regs *regs; +unsigned int i, sz; + +if (adreno_is_a508 (adreno_gpu)) { + regs = a50x_hwcg; + sz =ARRAY_SIZE (a50x_hwcg); + }else if (adreno_is_a509 (adreno_gpu) ||adreno_is_a512 (adreno_gpu)) { + regs = a512_hwcg; + sz =ARRAY_SIZE (a512_hwcg); + }else { + regs = a5xx_hwcg; + sz =ARRAY_SIZE (a5xx_hwcg); + } -for (i =0 ; i <ARRAY_SIZE (a5xx_hwcg); i++) -gpu_write (gpu, a5xx_hwcg[i].offset, - state ? a5xx_hwcg[i].value :0 ); +for (i =0 ; i < sz; i++) +gpu_write (gpu, regs[i].offset, + state ? regs[i].value :0 );if (adreno_is_a540 (adreno_gpu)) {gpu_write (gpu,REG_A5XX_RBBM_CLOCK_DELAY_GPMU , state ?0x00000770 :0 );
@@ -506,11 +614,13 @@ static int a5xx_zap_shader_init(struct msm_gpu *gpu)static int a5xx_hw_init (struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); +u32 bit;int ret;gpu_write (gpu,REG_A5XX_VBIF_ROUND_ROBIN_QOS_ARB ,0x00000003 ); -if (adreno_is_a540 (adreno_gpu)) +if (adreno_is_a509 (adreno_gpu) ||adreno_is_a512 (adreno_gpu) || +adreno_is_a540 (adreno_gpu))gpu_write (gpu,REG_A5XX_VBIF_GATE_OFF_WRREQ_EN ,0x00000009 );/* Make all blocks contribute to the GPU BUSY perf counter */
@@ -572,22 +682,29 @@ static int a5xx_hw_init(struct msm_gpu *gpu) 0x00100000 + adreno_gpu->gmem - 1);gpu_write (gpu,REG_A5XX_UCHE_GMEM_RANGE_MAX_HI ,0x00000000 ); -if (adreno_is_a510 (adreno_gpu)) { +if (adreno_is_a508 (adreno_gpu) ||adreno_is_a510 (adreno_gpu)) {gpu_write (gpu,REG_A5XX_CP_MEQ_THRESHOLDS ,0x20 ); -gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x20 ); +if (adreno_is_a508 (adreno_gpu)) +gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x400 ); +else +gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x20 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_2 ,0x40000030 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_1 ,0x20100D0A ); }else {gpu_write (gpu,REG_A5XX_CP_MEQ_THRESHOLDS ,0x40 );if (adreno_is_a530 (adreno_gpu))gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x40 ); -if (adreno_is_a540 (adreno_gpu)) +else gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x400 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_2 ,0x80000060 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_1 ,0x40201B16 ); } -if (adreno_is_a510 (adreno_gpu)) +if (adreno_is_a508 (adreno_gpu)) +gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL , + (0x100 <<11 |0x100 <<22 )); +else if (adreno_is_a509 (adreno_gpu) ||adreno_is_a510 (adreno_gpu) || +adreno_is_a512 (adreno_gpu))gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL , (0x200 <<11 |0x200 <<22 ));else
@@ -597,6 +714,14 @@ static int a5xx_hw_init(struct msm_gpu *gpu)if (adreno_gpu->info->quirks &ADRENO_QUIRK_TWO_PASS_USE_WFI )gpu_rmw (gpu,REG_A5XX_PC_DBG_ECO_CNTL ,0 , (1 <<8 )); +/* +* Disable the RB sampler datapath DP2 clock gating optimization +* for 1-SP GPUs, as it is enabled by default. +*/ +if (adreno_is_a508 (adreno_gpu) ||adreno_is_a509 (adreno_gpu) || +adreno_is_a512 (adreno_gpu)) +gpu_rmw (gpu,REG_A5XX_RB_DBG_ECO_CNTL ,0 , (1 <<9 )); +/* Enable USE_RETENTION_FLOPS */ gpu_write (gpu,REG_A5XX_CP_CHICKEN_DBG ,0x02000000 );
@@ -622,10 +747,17 @@ static int a5xx_hw_init(struct msm_gpu *gpu)gpu_write (gpu,REG_A5XX_RBBM_AHB_CNTL2 ,0x0000003F );/* Set the highest bank bit */ -gpu_write (gpu,REG_A5XX_TPL1_MODE_CNTL ,2 <<7 ); -gpu_write (gpu,REG_A5XX_RB_MODE_CNTL ,2 <<1 );if (adreno_is_a540 (adreno_gpu)) -gpu_write (gpu,REG_A5XX_UCHE_DBG_ECO_CNTL_2 ,2 ); + bit =2 ; +else + bit =1 ; + +gpu_write (gpu,REG_A5XX_TPL1_MODE_CNTL , bit <<7 ); +gpu_write (gpu,REG_A5XX_RB_MODE_CNTL , bit <<1 ); + +if (adreno_is_a509 (adreno_gpu) ||adreno_is_a512 (adreno_gpu) || +adreno_is_a540 (adreno_gpu)) +gpu_write (gpu,REG_A5XX_UCHE_DBG_ECO_CNTL_2 , bit);/* Protect registers from the CP */ gpu_write (gpu,REG_A5XX_CP_PROTECT_CNTL ,0x00000007 );
@@ -662,7 +794,9 @@ static int a5xx_hw_init(struct msm_gpu *gpu)/* UCHE */ gpu_write (gpu,REG_A5XX_CP_PROTECT (16 ),ADRENO_PROTECT_RW (0xE80 ,16 )); -if (adreno_is_a530 (adreno_gpu) ||adreno_is_a510 (adreno_gpu)) +if (adreno_is_a508 (adreno_gpu) ||adreno_is_a509 (adreno_gpu) || +adreno_is_a510 (adreno_gpu) ||adreno_is_a512 (adreno_gpu) || +adreno_is_a530 (adreno_gpu))gpu_write (gpu,REG_A5XX_CP_PROTECT (17 ),ADRENO_PROTECT_RW (0x10000 ,0x8000 ));
@@ -704,7 +838,8 @@ static int a5xx_hw_init(struct msm_gpu *gpu)if (ret)return ret; -if (!adreno_is_a510 (adreno_gpu)) +if (!(adreno_is_a508 (adreno_gpu) ||adreno_is_a509 (adreno_gpu) || +adreno_is_a510 (adreno_gpu) ||adreno_is_a512 (adreno_gpu)))a5xx_gpmu_ucode_init (gpu); ret =a5xx_ucode_init (gpu);
@@ -1117,7 +1252,8 @@ static int a5xx_pm_resume(struct msm_gpu *gpu)if (ret)return ret; -if (adreno_is_a510 (adreno_gpu)) { +/* Adreno 508, 509, 510, 512 needs manual RBBM sus/res control */ +if (!(adreno_is_a530 (adreno_gpu) ||adreno_is_a540 (adreno_gpu))) {/* Halt the sp_input_clk at HM level */ gpu_write (gpu,REG_A5XX_RBBM_CLOCK_CNTL ,0x00000055 );a5xx_set_hwcg (gpu, true);
@@ -1157,8 +1293,8 @@ static int a5xx_pm_suspend(struct msm_gpu *gpu)struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);u32 mask =0xf ; -/* A510 has 3 XIN ports in VBIF */ -if (adreno_is_a510 (adreno_gpu)) +/* A508, A510 have 3 XIN ports in VBIF */ +if (adreno_is_a508 (adreno_gpu) ||adreno_is_a510 (adreno_gpu)) mask =0x7 ;/* Clear the VBIF pipe before shutting down */
drivers/gpu/drm/msm/adreno/a5xx_power.c +2 -2
@@ -298,7 +298,7 @@ int a5xx_power_init(struct msm_gpu *gpu)int ret;/* Not all A5xx chips have a GPMU */ -if (adreno_is_a510 (adreno_gpu)) +if (!(adreno_is_a530 (adreno_gpu) ||adreno_is_a540 (adreno_gpu)))return 0 ;/* Set up the limits management */
@@ -330,7 +330,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu)unsigned int *data, *ptr, *cmds;unsigned int cmds_size; -if (adreno_is_a510 (adreno_gpu)) +if (!(adreno_is_a530 (adreno_gpu) ||adreno_is_a540 (adreno_gpu)))return ;if (a5xx_gpu->gpmu_bo)
drivers/gpu/drm/msm/adreno/adreno_device.c +60 -0
78 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/adreno_gpu.h +15 -0
@@ -227,11 +227,26 @@ static inline int adreno_is_a430(struct adreno_gpu *gpu)return gpu->revn ==430 ; } +static inline int adreno_is_a508 (struct adreno_gpu *gpu) +{ +return gpu->revn ==508 ; +} + +static inline int adreno_is_a509 (struct adreno_gpu *gpu) +{ +return gpu->revn ==509 ; +} +static inline int adreno_is_a510 (struct adreno_gpu *gpu) {return gpu->revn ==510 ; } +static inline int adreno_is_a512 (struct adreno_gpu *gpu) +{ +return gpu->revn ==512 ; +} +static inline int adreno_is_a530 (struct adreno_gpu *gpu) {return gpu->revn ==530 ;
Signature · 1 line
2.28.0
Re: [PATCH 3/7] drm/msm/a5xx: Add support for Adreno 508, 509, 512 GPUs
Tested on Xperia 10
Re: [PATCH 3/7] drm/msm/a5xx: Add support for Adreno 508, 509, 512 GPUs
In reply to [email protected]Quoted 6 lines · On Sat, Sep 26, 2020 at 02:51:42PM +0200, [email protected] wrote:
From: AngeloGioacchino Del Regno <[email protected]>
The Adreno 508/509/512 GPUs are stripped versions of the Adreno 5xx found in the mid-end SoCs such as SDM630, SDM636, SDM660 and SDA variants; these SoCs are usually provided with ZAP firmwares, but they have no available GPMU.
Quoted 418 lines
Signed-off-by AngeloGioacchino Del Regno <[email protected]>--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 172 ++++++++++++++++++--- drivers/gpu/drm/msm/adreno/a5xx_power.c | 4 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 60 +++++++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 15 ++ 4 files changed, 231 insertions(+), 20 deletions(-)drivers/gpu/drm/msm/adreno/a5xx_gpu.c +154
-18@@ -212,7 +212,7 @@ static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,a5xx_preempt_trigger (gpu); } -static const struct { +static const struct adreno_five_hwcg_regs {u32 offset;u32 value; } a5xx_hwcg[] = {@@ -308,16 +308,124 @@ static const struct { {REG_A5XX_RBBM_CLOCK_DELAY_TSE_RAS_RBBM, 0x00004000}, {REG_A5XX_RBBM_CLOCK_DELAY_GPC, 0x00000200}, {REG_A5XX_RBBM_CLOCK_DELAY_VFD, 0x00002222} +}, a50x_hwcg[] = { + {REG_A5XX_RBBM_CLOCK_CNTL_SP0, 0x02222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_SP0, 0x02222220}, + {REG_A5XX_RBBM_CLOCK_HYST_SP0, 0x0000F3CF}, + {REG_A5XX_RBBM_CLOCK_DELAY_SP0, 0x00000080}, + {REG_A5XX_RBBM_CLOCK_CNTL_TP0, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_TP0, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL3_TP0, 0x00002222}, + {REG_A5XX_RBBM_CLOCK_HYST_TP0, 0x77777777}, + {REG_A5XX_RBBM_CLOCK_HYST2_TP0, 0x77777777}, + {REG_A5XX_RBBM_CLOCK_HYST3_TP0, 0x00007777}, + {REG_A5XX_RBBM_CLOCK_DELAY_TP0, 0x11111111}, + {REG_A5XX_RBBM_CLOCK_DELAY2_TP0, 0x11111111}, + {REG_A5XX_RBBM_CLOCK_DELAY3_TP0, 0x00001111}, + {REG_A5XX_RBBM_CLOCK_CNTL2_UCHE, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL3_UCHE, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL4_UCHE, 0x00222222}, + {REG_A5XX_RBBM_CLOCK_CNTL_UCHE, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_HYST_UCHE, 0x00FFFFF4}, + {REG_A5XX_RBBM_CLOCK_DELAY_UCHE, 0x00000002}, + {REG_A5XX_RBBM_CLOCK_CNTL_RB0, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_RB0, 0x00222222}, + {REG_A5XX_RBBM_CLOCK_CNTL_CCU0, 0x00022220}, + {REG_A5XX_RBBM_CLOCK_CNTL_RAC, 0x05522222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_RAC, 0x00505555}, + {REG_A5XX_RBBM_CLOCK_HYST_RB_CCU0, 0x04040404}, + {REG_A5XX_RBBM_CLOCK_HYST_RAC, 0x07444044}, + {REG_A5XX_RBBM_CLOCK_DELAY_RB_CCU_L1_0, 0x00000002}, + {REG_A5XX_RBBM_CLOCK_DELAY_RAC, 0x00010011}, + {REG_A5XX_RBBM_CLOCK_CNTL_TSE_RAS_RBBM, 0x04222222}, + {REG_A5XX_RBBM_CLOCK_MODE_GPC, 0x02222222}, + {REG_A5XX_RBBM_CLOCK_MODE_VFD, 0x00002222}, + {REG_A5XX_RBBM_CLOCK_HYST_TSE_RAS_RBBM, 0x00000000}, + {REG_A5XX_RBBM_CLOCK_HYST_GPC, 0x04104004}, + {REG_A5XX_RBBM_CLOCK_HYST_VFD, 0x00000000}, + {REG_A5XX_RBBM_CLOCK_DELAY_HLSQ, 0x00000000}, + {REG_A5XX_RBBM_CLOCK_DELAY_TSE_RAS_RBBM, 0x00004000}, + {REG_A5XX_RBBM_CLOCK_DELAY_GPC, 0x00000200}, + {REG_A5XX_RBBM_CLOCK_DELAY_VFD, 0x00002222}, +}, a512_hwcg[] = { + {REG_A5XX_RBBM_CLOCK_CNTL_SP0, 0x02222222}, + {REG_A5XX_RBBM_CLOCK_CNTL_SP1, 0x02222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_SP0, 0x02222220}, + {REG_A5XX_RBBM_CLOCK_CNTL2_SP1, 0x02222220}, + {REG_A5XX_RBBM_CLOCK_HYST_SP0, 0x0000F3CF}, + {REG_A5XX_RBBM_CLOCK_HYST_SP1, 0x0000F3CF}, + {REG_A5XX_RBBM_CLOCK_DELAY_SP0, 0x00000080}, + {REG_A5XX_RBBM_CLOCK_DELAY_SP1, 0x00000080}, + {REG_A5XX_RBBM_CLOCK_CNTL_TP0, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL_TP1, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_TP0, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_TP1, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL3_TP0, 0x00002222}, + {REG_A5XX_RBBM_CLOCK_CNTL3_TP1, 0x00002222}, + {REG_A5XX_RBBM_CLOCK_HYST_TP0, 0x77777777}, + {REG_A5XX_RBBM_CLOCK_HYST_TP1, 0x77777777}, + {REG_A5XX_RBBM_CLOCK_HYST2_TP0, 0x77777777}, + {REG_A5XX_RBBM_CLOCK_HYST2_TP1, 0x77777777}, + {REG_A5XX_RBBM_CLOCK_HYST3_TP0, 0x00007777}, + {REG_A5XX_RBBM_CLOCK_HYST3_TP1, 0x00007777}, + {REG_A5XX_RBBM_CLOCK_DELAY_TP0, 0x11111111}, + {REG_A5XX_RBBM_CLOCK_DELAY_TP1, 0x11111111}, + {REG_A5XX_RBBM_CLOCK_DELAY2_TP0, 0x11111111}, + {REG_A5XX_RBBM_CLOCK_DELAY2_TP1, 0x11111111}, + {REG_A5XX_RBBM_CLOCK_DELAY3_TP0, 0x00001111}, + {REG_A5XX_RBBM_CLOCK_DELAY3_TP1, 0x00001111}, + {REG_A5XX_RBBM_CLOCK_CNTL_UCHE, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_UCHE, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL3_UCHE, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL4_UCHE, 0x00222222}, + {REG_A5XX_RBBM_CLOCK_HYST_UCHE, 0x00444444}, + {REG_A5XX_RBBM_CLOCK_DELAY_UCHE, 0x00000002}, + {REG_A5XX_RBBM_CLOCK_CNTL_RB0, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL_RB1, 0x22222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_RB0, 0x00222222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_RB1, 0x00222222}, + {REG_A5XX_RBBM_CLOCK_CNTL_CCU0, 0x00022220}, + {REG_A5XX_RBBM_CLOCK_CNTL_CCU1, 0x00022220}, + {REG_A5XX_RBBM_CLOCK_CNTL_RAC, 0x05522222}, + {REG_A5XX_RBBM_CLOCK_CNTL2_RAC, 0x00505555}, + {REG_A5XX_RBBM_CLOCK_HYST_RB_CCU0, 0x04040404}, + {REG_A5XX_RBBM_CLOCK_HYST_RB_CCU1, 0x04040404}, + {REG_A5XX_RBBM_CLOCK_HYST_RAC, 0x07444044}, + {REG_A5XX_RBBM_CLOCK_DELAY_RB_CCU_L1_0, 0x00000002}, + {REG_A5XX_RBBM_CLOCK_DELAY_RB_CCU_L1_1, 0x00000002}, + {REG_A5XX_RBBM_CLOCK_DELAY_RAC, 0x00010011}, + {REG_A5XX_RBBM_CLOCK_CNTL_TSE_RAS_RBBM, 0x04222222}, + {REG_A5XX_RBBM_CLOCK_MODE_GPC, 0x02222222}, + {REG_A5XX_RBBM_CLOCK_MODE_VFD, 0x00002222}, + {REG_A5XX_RBBM_CLOCK_HYST_TSE_RAS_RBBM, 0x00000000}, + {REG_A5XX_RBBM_CLOCK_HYST_GPC, 0x04104004}, + {REG_A5XX_RBBM_CLOCK_HYST_VFD, 0x00000000}, + {REG_A5XX_RBBM_CLOCK_DELAY_HLSQ, 0x00000000}, + {REG_A5XX_RBBM_CLOCK_DELAY_TSE_RAS_RBBM, 0x00004000}, + {REG_A5XX_RBBM_CLOCK_DELAY_GPC, 0x00000200}, + {REG_A5XX_RBBM_CLOCK_DELAY_VFD, 0x00002222}, };void a5xx_set_hwcg (struct msm_gpu *gpu,bool state) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); -unsigned int i; +const struct adreno_five_hwcg_regs *regs; +unsigned int i, sz; + +if (adreno_is_a508 (adreno_gpu)) { + regs = a50x_hwcg; + sz =ARRAY_SIZE (a50x_hwcg); + }else if (adreno_is_a509 (adreno_gpu) ||adreno_is_a512 (adreno_gpu)) { + regs = a512_hwcg; + sz =ARRAY_SIZE (a512_hwcg); + }else { + regs = a5xx_hwcg; + sz =ARRAY_SIZE (a5xx_hwcg); + } -for (i =0 ; i <ARRAY_SIZE (a5xx_hwcg); i++) -gpu_write (gpu, a5xx_hwcg[i].offset, - state ? a5xx_hwcg[i].value :0 ); +for (i =0 ; i < sz; i++) +gpu_write (gpu, regs[i].offset, + state ? regs[i].value :0 );if (adreno_is_a540 (adreno_gpu)) {gpu_write (gpu,REG_A5XX_RBBM_CLOCK_DELAY_GPMU , state ?0x00000770 :0 );@@ -506,11 +614,13 @@ static int a5xx_zap_shader_init(struct msm_gpu *gpu)static int a5xx_hw_init (struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); +u32 bit;int ret;gpu_write (gpu,REG_A5XX_VBIF_ROUND_ROBIN_QOS_ARB ,0x00000003 ); -if (adreno_is_a540 (adreno_gpu)) +if (adreno_is_a509 (adreno_gpu) ||adreno_is_a512 (adreno_gpu) || +adreno_is_a540 (adreno_gpu))gpu_write (gpu,REG_A5XX_VBIF_GATE_OFF_WRREQ_EN ,0x00000009 );/* Make all blocks contribute to the GPU BUSY perf counter */ @@ -572,22 +682,29 @@ static int a5xx_hw_init(struct msm_gpu *gpu) 0x00100000 + adreno_gpu->gmem - 1);gpu_write (gpu,REG_A5XX_UCHE_GMEM_RANGE_MAX_HI ,0x00000000 ); -if (adreno_is_a510 (adreno_gpu)) { +if (adreno_is_a508 (adreno_gpu) ||adreno_is_a510 (adreno_gpu)) {gpu_write (gpu,REG_A5XX_CP_MEQ_THRESHOLDS ,0x20 ); -gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x20 ); +if (adreno_is_a508 (adreno_gpu)) +gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x400 ); +else +gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x20 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_2 ,0x40000030 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_1 ,0x20100D0A ); }else {gpu_write (gpu,REG_A5XX_CP_MEQ_THRESHOLDS ,0x40 );if (adreno_is_a530 (adreno_gpu))gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x40 ); -if (adreno_is_a540 (adreno_gpu)) +else gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x400 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_2 ,0x80000060 );gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_1 ,0x40201B16 ); } -if (adreno_is_a510 (adreno_gpu)) +if (adreno_is_a508 (adreno_gpu)) +gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL , + (0x100 <<11 |0x100 <<22 )); +else if (adreno_is_a509 (adreno_gpu) ||adreno_is_a510 (adreno_gpu) || +adreno_is_a512 (adreno_gpu))gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL , (0x200 <<11 |0x200 <<22 ));else @@ -597,6 +714,14 @@ static int a5xx_hw_init(struct msm_gpu *gpu)if (adreno_gpu->info->quirks &ADRENO_QUIRK_TWO_PASS_USE_WFI )gpu_rmw (gpu,REG_A5XX_PC_DBG_ECO_CNTL ,0 , (1 <<8 )); +/* +* Disable the RB sampler datapath DP2 clock gating optimization +* for 1-SP GPUs, as it is enabled by default. +*/ +if (adreno_is_a508 (adreno_gpu) ||adreno_is_a509 (adreno_gpu) || +adreno_is_a512 (adreno_gpu)) +gpu_rmw (gpu,REG_A5XX_RB_DBG_ECO_CNTL ,0 , (1 <<9 )); +/* Enable USE_RETENTION_FLOPS */ gpu_write (gpu,REG_A5XX_CP_CHICKEN_DBG ,0x02000000 );@@ -622,10 +747,17 @@ static int a5xx_hw_init(struct msm_gpu *gpu)gpu_write (gpu,REG_A5XX_RBBM_AHB_CNTL2 ,0x0000003F );/* Set the highest bank bit */ -gpu_write (gpu,REG_A5XX_TPL1_MODE_CNTL ,2 <<7 ); -gpu_write (gpu,REG_A5XX_RB_MODE_CNTL ,2 <<1 );if (adreno_is_a540 (adreno_gpu)) -gpu_write (gpu,REG_A5XX_UCHE_DBG_ECO_CNTL_2 ,2 ); + bit =2 ; +else + bit =1 ; + +gpu_write (gpu,REG_A5XX_TPL1_MODE_CNTL , bit <<7 ); +gpu_write (gpu,REG_A5XX_RB_MODE_CNTL , bit <<1 ); + +if (adreno_is_a509 (adreno_gpu) ||adreno_is_a512 (adreno_gpu) || +adreno_is_a540 (adreno_gpu)) +gpu_write (gpu,REG_A5XX_UCHE_DBG_ECO_CNTL_2 , bit);/* Protect registers from the CP */ gpu_write (gpu,REG_A5XX_CP_PROTECT_CNTL ,0x00000007 );@@ -662,7 +794,9 @@ static int a5xx_hw_init(struct msm_gpu *gpu)/* UCHE */ gpu_write (gpu,REG_A5XX_CP_PROTECT (16 ),ADRENO_PROTECT_RW (0xE80 ,16 )); -if (adreno_is_a530 (adreno_gpu) ||adreno_is_a510 (adreno_gpu)) +if (adreno_is_a508 (adreno_gpu) ||adreno_is_a509 (adreno_gpu) || +adreno_is_a510 (adreno_gpu) ||adreno_is_a512 (adreno_gpu) || +adreno_is_a530 (adreno_gpu))gpu_write (gpu,REG_A5XX_CP_PROTECT (17 ),ADRENO_PROTECT_RW (0x10000 ,0x8000 ));@@ -704,7 +838,8 @@ static int a5xx_hw_init(struct msm_gpu *gpu)if (ret)return ret; -if (!adreno_is_a510 (adreno_gpu)) +if (!(adreno_is_a508 (adreno_gpu) ||adreno_is_a509 (adreno_gpu) || +adreno_is_a510 (adreno_gpu) ||adreno_is_a512 (adreno_gpu)))a5xx_gpmu_ucode_init (gpu); ret =a5xx_ucode_init (gpu);@@ -1117,7 +1252,8 @@ static int a5xx_pm_resume(struct msm_gpu *gpu)if (ret)return ret; -if (adreno_is_a510 (adreno_gpu)) { +/* Adreno 508, 509, 510, 512 needs manual RBBM sus/res control */ +if (!(adreno_is_a530 (adreno_gpu) ||adreno_is_a540 (adreno_gpu))) {/* Halt the sp_input_clk at HM level */ gpu_write (gpu,REG_A5XX_RBBM_CLOCK_CNTL ,0x00000055 );a5xx_set_hwcg (gpu, true);@@ -1157,8 +1293,8 @@ static int a5xx_pm_suspend(struct msm_gpu *gpu)struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);u32 mask =0xf ; -/* A510 has 3 XIN ports in VBIF */ -if (adreno_is_a510 (adreno_gpu)) +/* A508, A510 have 3 XIN ports in VBIF */ +if (adreno_is_a508 (adreno_gpu) ||adreno_is_a510 (adreno_gpu)) mask =0x7 ;/* Clear the VBIF pipe before shutting down */ drivers/gpu/drm/msm/adreno/a5xx_power.c +2
-2@@ -298,7 +298,7 @@ int a5xx_power_init(struct msm_gpu *gpu)int ret;/* Not all A5xx chips have a GPMU */ -if (adreno_is_a510 (adreno_gpu)) +if (!(adreno_is_a530 (adreno_gpu) ||adreno_is_a540 (adreno_gpu)))return 0 ;/* Set up the limits management */ @@ -330,7 +330,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu)unsigned int *data, *ptr, *cmds;unsigned int cmds_size; -if (adreno_is_a510 (adreno_gpu)) +if (!(adreno_is_a530 (adreno_gpu) ||adreno_is_a540 (adreno_gpu)))return ;if (a5xx_gpu->gpmu_bo)drivers/gpu/drm/msm/adreno/adreno_device.c +60
-0@@ -129,6 +129,41 @@ static const struct adreno_info gpulist[] = { .gmem = (SZ_1M + SZ_512K), .inactive_period = DRM_MSM_INACTIVE_PERIOD, .init = a4xx_gpu_init, + }, { + .rev = ADRENO_REV(5, 0, 8, ANY_ID), + .revn = 508, + .name = "A508", + .fw = { + [ADRENO_FW_PM4] = "a530_pm4.fw", + [ADRENO_FW_PFP] = "a530_pfp.fw", + }, + .gmem = (SZ_128K + SZ_8K), +/* +* Increase inactive period to 250 to avoid bouncing +* the GDSC which appears to make it grumpy +*/ + .inactive_period = 250, + .quirks = ADRENO_QUIRK_LMLOADKILL_DISABLE, + .init = a5xx_gpu_init, + .zapfw = "a508_zap.mdt", + }, { + .rev = ADRENO_REV(5, 0, 9, ANY_ID), + .revn = 509, + .name = "A509", + .fw = { + [ADRENO_FW_PM4] = "a530_pm4.fw", + [ADRENO_FW_PFP] = "a530_pfp.fw", + }, + .gmem = (SZ_256K + SZ_16K), +/* +* Increase inactive period to 250 to avoid bouncing +* the GDSC which appears to make it grumpy +*/ + .inactive_period = 250, + .quirks = ADRENO_QUIRK_LMLOADKILL_DISABLE, + .init = a5xx_gpu_init, +/* Adreno 509 uses the same ZAP as 512 */ + .zapfw = "a512_zap.mdt", }, { .rev = ADRENO_REV(5, 1, 0, ANY_ID), .revn = 510,@@ -144,6 +179,23 @@ static const struct adreno_info gpulist[] = {*/ .inactive_period = 250, .init = a5xx_gpu_init, + }, { + .rev = ADRENO_REV(5, 1, 2, ANY_ID), + .revn = 512, + .name = "A512", + .fw = { + [ADRENO_FW_PM4] = "a530_pm4.fw", + [ADRENO_FW_PFP] = "a530_pfp.fw", + }, + .gmem = (SZ_256K + SZ_16K), +/* +* Increase inactive period to 250 to avoid bouncing +* the GDSC which appears to make it grumpy +*/ + .inactive_period = 250, + .quirks = ADRENO_QUIRK_LMLOADKILL_DISABLE, + .init = a5xx_gpu_init, + .zapfw = "a512_zap.mdt", }, { .rev = ADRENO_REV(5, 3, 0, 2), .revn = 530,@@ -240,6 +292,14 @@ MODULE_FIRMWARE("qcom/a330_pm4.fw");MODULE_FIRMWARE ("qcom/a330_pfp.fw" );MODULE_FIRMWARE ("qcom/a420_pm4.fw" );MODULE_FIRMWARE ("qcom/a420_pfp.fw" ); +MODULE_FIRMWARE ("qcom/a508_zap.mdt" ); +MODULE_FIRMWARE ("qcom/a508_zap.b00" ); +MODULE_FIRMWARE ("qcom/a508_zap.b01" ); +MODULE_FIRMWARE ("qcom/a508_zap.b02" ); +MODULE_FIRMWARE ("qcom/a512_zap.mdt" ); +MODULE_FIRMWARE ("qcom/a512_zap.b00" ); +MODULE_FIRMWARE ("qcom/a512_zap.b01" ); +MODULE_FIRMWARE ("qcom/a512_zap.b02" );MODULE_FIRMWARE ("qcom/a530_pm4.fw" );MODULE_FIRMWARE ("qcom/a530_pfp.fw" );MODULE_FIRMWARE ("qcom/a530v3_gpmu.fw2" );drivers/gpu/drm/msm/adreno/adreno_gpu.h +15
-0@@ -227,11 +227,26 @@ static inline int adreno_is_a430(struct adreno_gpu *gpu)return gpu->revn ==430 ; } +static inline int adreno_is_a508 (struct adreno_gpu *gpu) +{ +return gpu->revn ==508 ; +} + +static inline int adreno_is_a509 (struct adreno_gpu *gpu) +{ +return gpu->revn ==509 ; +} +static inline int adreno_is_a510 (struct adreno_gpu *gpu) {return gpu->revn ==510 ; } +static inline int adreno_is_a512 (struct adreno_gpu *gpu) +{ +return gpu->revn ==512 ; +} +static inline int adreno_is_a530 (struct adreno_gpu *gpu) {return gpu->revn ==530 ;Signature · 1 line
2.28.0
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 4/7 drm/msm/a5xx: Reset VBIF before PC only on A510 and A530
In reply to [email protected]From: AngeloGioacchino Del Regno <[email protected]>
Resetting the VBIF before power collapse is done to avoid getting bogus FIFO entries during the suspend sequence or subsequent resume, but this is doable only on Adreno 510 and Adreno 530, as the other units will tendentially lock up.
Especially on Adreno 508, the GPU will show lockups and very bad slownesses after processing the first frame.
Avoiding to execute the RBBM SW Reset before suspend will stop the lockup issue from happening on at least Adreno 508/509/512.
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +5 -3
@@ -1306,10 +1306,12 @@ static int a5xx_pm_suspend(struct msm_gpu *gpu)/* * Reset the VBIF before power collapse to avoid issue with FIFO -* entries +* entries on Adreno A510 and A530 (the others will tend to lock up) */ -gpu_write (gpu,REG_A5XX_RBBM_BLOCK_SW_RESET_CMD ,0x003C0000 ); -gpu_write (gpu,REG_A5XX_RBBM_BLOCK_SW_RESET_CMD ,0x00000000 ); +if (adreno_is_a510 (adreno_gpu) ||adreno_is_a530 (adreno_gpu)) { +gpu_write (gpu,REG_A5XX_RBBM_BLOCK_SW_RESET_CMD ,0x003C0000 ); +gpu_write (gpu,REG_A5XX_RBBM_BLOCK_SW_RESET_CMD ,0x00000000 ); + }return msm_gpu_pm_suspend (gpu); }
Signature · 1 line
2.28.0
Re: [PATCH 4/7] drm/msm/a5xx: Reset VBIF before PC only on A510 and A530
Quoted 11 lines · On Sat, Sep 26, 2020 at 02:51:43PM +0200, [email protected] wrote:
From: AngeloGioacchino Del Regno <[email protected]>
Resetting the VBIF before power collapse is done to avoid getting bogus FIFO entries during the suspend sequence or subsequent resume, but this is doable only on Adreno 510 and Adreno 530, as the other units will tendentially lock up.
Especially on Adreno 508, the GPU will show lockups and very bad slownesses after processing the first frame.Avoiding to execute the RBBM SW Reset before suspend will stop the lockup issue from happening on at least Adreno 508/509/512.
Quoted 28 lines
Signed-off-by AngeloGioacchino Del Regno <[email protected]>--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/gpu/drm/msm/adreno/a5xx_gpu.c +5
-3@@ -1306,10 +1306,12 @@ static int a5xx_pm_suspend(struct msm_gpu *gpu)/* * Reset the VBIF before power collapse to avoid issue with FIFO -* entries +* entries on Adreno A510 and A530 (the others will tend to lock up) */ -gpu_write (gpu,REG_A5XX_RBBM_BLOCK_SW_RESET_CMD ,0x003C0000 ); -gpu_write (gpu,REG_A5XX_RBBM_BLOCK_SW_RESET_CMD ,0x00000000 ); +if (adreno_is_a510 (adreno_gpu) ||adreno_is_a530 (adreno_gpu)) { +gpu_write (gpu,REG_A5XX_RBBM_BLOCK_SW_RESET_CMD ,0x003C0000 ); +gpu_write (gpu,REG_A5XX_RBBM_BLOCK_SW_RESET_CMD ,0x00000000 ); + }return msm_gpu_pm_suspend (gpu); }Signature · 1 line
2.28.0
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 5/7 drm/msm/a5xx: Fix VPC protect value in gpu_write()
In reply to [email protected]From: Konrad Dybcio <[email protected]>
The upstream API for some reason uses logbase2 instead of just passing the argument as-is, whereas downstream CAF kernel does the latter.
Hence, a mistake has been made when porting:
4 is the value that's supposed to be passed, but log2(4) = 2. Changing the value to 16 (= 2^4) fixes the issue.
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +1 -1
@@ -789,7 +789,7 @@ static int a5xx_hw_init(struct msm_gpu *gpu)/* VPC */ gpu_write (gpu,REG_A5XX_CP_PROTECT (14 ),ADRENO_PROTECT_RW (0xE68 ,8 )); -gpu_write (gpu,REG_A5XX_CP_PROTECT (15 ),ADRENO_PROTECT_RW (0xE70 ,4 )); +gpu_write (gpu,REG_A5XX_CP_PROTECT (15 ),ADRENO_PROTECT_RW (0xE70 ,16 ));/* UCHE */ gpu_write (gpu,REG_A5XX_CP_PROTECT (16 ),ADRENO_PROTECT_RW (0xE80 ,16 ));
Signature · 1 line
2.28.0
Re: [PATCH 5/7] drm/msm/a5xx: Fix VPC protect value in gpu_write()
Quoted 10 lines · On Sat, Sep 26, 2020 at 02:51:44PM +0200, [email protected] wrote:
From: Konrad Dybcio <[email protected]>
The upstream API for some reason uses logbase2 instead of just passing the argument as-is, whereas downstream CAF kernel does the latter.
Hence, a mistake has been made when porting:
4 is the value that's supposed to be passed, but log2(4) = 2. Changing the value to 16 (= 2^4) fixes the issue.
FWIW I think downstream is wrong. Its a lot more intuitive to pass the number of registers that should be protected than to force a human to do math.
Jordan
Quoted 22 lines
Signed-off-by Konrad Dybcio <[email protected]>Signed-off-by AngeloGioacchino Del Regno <[email protected]>--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/msm/adreno/a5xx_gpu.c +1
-1@@ -789,7 +789,7 @@ static int a5xx_hw_init(struct msm_gpu *gpu)/* VPC */ gpu_write (gpu,REG_A5XX_CP_PROTECT (14 ),ADRENO_PROTECT_RW (0xE68 ,8 )); -gpu_write (gpu,REG_A5XX_CP_PROTECT (15 ),ADRENO_PROTECT_RW (0xE70 ,4 )); +gpu_write (gpu,REG_A5XX_CP_PROTECT (15 ),ADRENO_PROTECT_RW (0xE70 ,16 ));/* UCHE */ gpu_write (gpu,REG_A5XX_CP_PROTECT (16 ),ADRENO_PROTECT_RW (0xE80 ,16 ));Signature · 1 line
2.28.0
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 5/7] drm/msm/a5xx: Fix VPC protect value in gpu_write()
Il giorno lun 28 set 2020 alle ore 18:16 Jordan Crouse <[email protected]> ha scritto:
Quoted 13 lines · On Sat, Sep 26, 2020 at 02:51:44PM +0200, [email protected] wrote:
Quoted 10 lines
From: Konrad Dybcio <[email protected]>
The upstream API for some reason uses logbase2 instead of just passing the argument as-is, whereas downstream CAF kernel does the latter.
Hence, a mistake has been made when porting:
4 is the value that's supposed to be passed, but log2(4) = 2. Changing the value to 16 (= 2^4) fixes the issue.
Quoted 5 lines
FWIW I think downstream is wrong. Its a lot more intuitive to pass the number of registers that should be protected than to force a human to do math.
Jordan
Uhm, actually, it's upstream the one forcing to do math... :P In any case, downstream you have some calls with an explicit log2 and some others with the "real" number of registers.
Hardware magic register layouts, maybe.... :)))
-- Angelo
Quoted 26 lines
Quoted 20 lines
Signed-off-by Konrad Dybcio <[email protected]>Signed-off-by AngeloGioacchino Del Regno <[email protected]>--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/msm/adreno/a5xx_gpu.c +1
-2@@ -789,7 +789,7 @@ static int a5xx_hw_init(struct msm_gpu *gpu)/* VPC */ gpu_write (gpu,REG_A5XX_CP_PROTECT (14 ),ADRENO_PROTECT_RW (0xE68 ,8 )); -gpu_write (gpu,REG_A5XX_CP_PROTECT (15 ),ADRENO_PROTECT_RW (0xE70 ,4 )); +gpu_write (gpu,REG_A5XX_CP_PROTECT (15 ),ADRENO_PROTECT_RW (0xE70 ,16 ));/* UCHE */ gpu_write (gpu,REG_A5XX_CP_PROTECT (16 ),ADRENO_PROTECT_RW (0xE80 ,16 )); --Quoted 2 lines
2.28.0
--
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 6/7 drm/msm/a5xx: Disable flat shading optimization
In reply to [email protected]From: Konrad Dybcio <[email protected]>
Port over the command from downstream to prevent undefined behaviour.
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +3 -0
@@ -759,6 +759,9 @@ static int a5xx_hw_init(struct msm_gpu *gpu) adreno_is_a540(adreno_gpu))gpu_write (gpu,REG_A5XX_UCHE_DBG_ECO_CNTL_2 , bit); +/* Disable All flat shading optimization */ +gpu_rmw (gpu,0x00000E60 ,0 ,0x1 <<10 ); +/* Protect registers from the CP */ gpu_write (gpu,REG_A5XX_CP_PROTECT_CNTL ,0x00000007 );
Signature · 1 line
2.28.0
Re: [PATCH 6/7] drm/msm/a5xx: Disable flat shading optimization
Quoted 17 lines · On Sat, Sep 26, 2020 at 5:52 AM <[email protected]> wrote:
From: Konrad Dybcio <[email protected]>
Port over the command from downstream to prevent undefined behaviour.
Signed-off-by Konrad Dybcio <[email protected]>Signed-off-by AngeloGioacchino Del Regno <[email protected]>--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/msm/adreno/a5xx_gpu.c +0
-0
drivers/gpu/drm/msm/adreno/a5xx_gpu.c static int a5xx_hw_init(struct msm_gpu *gpu) · line 763
Quoted 5 lines
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +2
-0@@ -759,6 +759,9 @@ static int a5xx_hw_init(struct msm_gpu *gpu) adreno_is_a540(adreno_gpu))gpu_write (gpu,REG_A5XX_UCHE_DBG_ECO_CNTL_2 , bit); +/* Disable All flat shading optimization */ +gpu_rmw (gpu,0x00000E60 ,0 ,0x1 <<10 );
Looks like VPC_DBG_ECO_CNTL.ALLFLATOPTDIS (based on downstream 41582a1f24d2961094c556db788028b433d8476a)
BR,
-R
Quoted 7 lines
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +1
-1+/* Protect registers from the CP */ gpu_write (gpu,REG_A5XX_CP_PROTECT_CNTL ,0x00000007 ); --2.28.0
PATCH 7/7 drm/msm/a5xx: Disable UCHE global filter
In reply to [email protected]From: Konrad Dybcio <[email protected]>
Port over the command from downstream to prevent undefined behaviour.
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +3 -0
@@ -722,6 +722,9 @@ static int a5xx_hw_init(struct msm_gpu *gpu) adreno_is_a512(adreno_gpu))gpu_rmw (gpu,REG_A5XX_RB_DBG_ECO_CNTL ,0 , (1 <<9 )); +/* Disable UCHE global filter as SP can invalidate/flush independently */ +gpu_write (gpu,0x00000E81 ,BIT (29 )); +/* Enable USE_RETENTION_FLOPS */ gpu_write (gpu,REG_A5XX_CP_CHICKEN_DBG ,0x02000000 );
Signature · 1 line
2.28.0
Re: [PATCH 7/7] drm/msm/a5xx: Disable UCHE global filter
Quoted 17 lines · On Sat, Sep 26, 2020 at 5:52 AM <[email protected]> wrote:
From: Konrad Dybcio <[email protected]>
Port over the command from downstream to prevent undefined behaviour.
Signed-off-by Konrad Dybcio <[email protected]>Signed-off-by AngeloGioacchino Del Regno <[email protected]>--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/msm/adreno/a5xx_gpu.c +0
-0
drivers/gpu/drm/msm/adreno/a5xx_gpu.c static int a5xx_hw_init(struct msm_gpu *gpu) · line 726
Quoted 5 lines
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +2
-0@@ -722,6 +722,9 @@ static int a5xx_hw_init(struct msm_gpu *gpu) adreno_is_a512(adreno_gpu))gpu_rmw (gpu,REG_A5XX_RB_DBG_ECO_CNTL ,0 , (1 <<9 )); +/* Disable UCHE global filter as SP can invalidate/flush independently */ +gpu_write (gpu,0x00000E81 ,BIT (29 ));
Looks like this is REG_A5XX_UCHE_MODE_CNTL? We should define a name for this, rather than open coding.
(It's ok if you just add it to a5xx.xml.h, I can push a MR to add this to mesa a5xx.xml)
BR,
-R
Quoted 7 lines
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +1
-1+/* Enable USE_RETENTION_FLOPS */ gpu_write (gpu,REG_A5XX_CP_CHICKEN_DBG ,0x02000000 ); --2.28.0