[PATCH 1/3] drm/msm/adreno: Add A619 support
Rob Clark
robdclark at gmail.com
Wed Feb 23 00:42:41 UTC 2022
On Mon, Feb 21, 2022 at 5:23 PM Konrad Dybcio
<konrad.dybcio at somainline.org> wrote:
>
> Add support for the Adreno 619 GPU, as found in Snapdragon 690 (SM6350),
> 480 (SM4350) and 750G (SM7225).
>
> Signed-off-by: Konrad Dybcio <konrad.dybcio at somainline.org>
> ---
> drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 11 ++--
> drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 70 +++++++++++++++++++++-
> drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 66 +++++++++++++++++++-
> drivers/gpu/drm/msm/adreno/adreno_device.c | 14 +++++
> drivers/gpu/drm/msm/adreno/adreno_gpu.h | 13 +++-
> 5 files changed, 166 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
> index 3e325e2a2b1b..e8d4cca6cd46 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
> @@ -527,6 +527,8 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)
> pdc_in_aop = true;
> else if (adreno_is_a618(adreno_gpu) || adreno_is_a640_family(adreno_gpu))
> pdc_address_offset = 0x30090;
> + else if (adreno_is_a619(adreno_gpu))
> + pdc_address_offset = 0x300a0;
> else
> pdc_address_offset = 0x30080;
>
> @@ -601,7 +603,8 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)
>
> pdc_write(pdcptr, REG_A6XX_PDC_GPU_TCS3_CMD0_MSGID + 4, 0x10108);
> pdc_write(pdcptr, REG_A6XX_PDC_GPU_TCS3_CMD0_ADDR + 4, 0x30000);
> - if (adreno_is_a618(adreno_gpu) || adreno_is_a650_family(adreno_gpu))
> + if (adreno_is_a618(adreno_gpu) || adreno_is_a619(adreno_gpu) ||
> + adreno_is_a650_family(adreno_gpu))
> pdc_write(pdcptr, REG_A6XX_PDC_GPU_TCS3_CMD0_DATA + 4, 0x2);
> else
> pdc_write(pdcptr, REG_A6XX_PDC_GPU_TCS3_CMD0_DATA + 4, 0x3);
> @@ -1537,7 +1540,7 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node)
> SZ_16M - SZ_16K, 0x04000, "icache");
> if (ret)
> goto err_memory;
> - } else if (adreno_is_a640_family(adreno_gpu)) {
> + } else {
Was this intended? It would result in extra/unneeded memory
allocations on a615/a618/a630..
>From looking at the patch, I'm under the impression that a619 is kinda
like a618 but with newer gmu? Possibly these cases should be based on
gmu version rather than gpu version?
Maybe Akhil has an opinion?
> ret = a6xx_gmu_memory_alloc(gmu, &gmu->icache,
> SZ_256K - SZ_16K, 0x04000, "icache");
> if (ret)
> @@ -1547,9 +1550,9 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node)
> SZ_256K - SZ_16K, 0x44000, "dcache");
> if (ret)
> goto err_memory;
> - } else {
> - BUG_ON(adreno_is_a660_family(adreno_gpu));
> + }
>
> + if (adreno_is_a630(adreno_gpu) || adreno_is_a615_family(adreno_gpu)) {
> /* HFI v1, has sptprac */
> gmu->legacy = true;
>
> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> index 17cfad6424db..ed9abb2d5e5c 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> @@ -224,6 +224,74 @@ static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
> a6xx_flush(gpu, ring);
> }
>
> +/* For a615 family (a615, a616, a618 and a619) */
Hmm, we aren't actually using for a618.. not sure if that is good or bad..
The values don't appear to match what is captured in devcore dumps
from a618, maybe Akhil could check
BR,
-R
> +const struct adreno_reglist a615_hwcg[] = {
> + {REG_A6XX_RBBM_CLOCK_CNTL_SP0, 0x02222222},
> + {REG_A6XX_RBBM_CLOCK_CNTL2_SP0, 0x02222220},
> + {REG_A6XX_RBBM_CLOCK_DELAY_SP0, 0x00000080},
> + {REG_A6XX_RBBM_CLOCK_HYST_SP0, 0x0000F3CF},
> + {REG_A6XX_RBBM_CLOCK_CNTL_TP0, 0x02222222},
> + {REG_A6XX_RBBM_CLOCK_CNTL_TP1, 0x02222222},
> + {REG_A6XX_RBBM_CLOCK_CNTL2_TP0, 0x22222222},
> + {REG_A6XX_RBBM_CLOCK_CNTL2_TP1, 0x22222222},
> + {REG_A6XX_RBBM_CLOCK_CNTL3_TP0, 0x22222222},
> + {REG_A6XX_RBBM_CLOCK_CNTL3_TP1, 0x22222222},
> + {REG_A6XX_RBBM_CLOCK_CNTL4_TP0, 0x00022222},
> + {REG_A6XX_RBBM_CLOCK_CNTL4_TP1, 0x00022222},
> + {REG_A6XX_RBBM_CLOCK_HYST_TP0, 0x77777777},
> + {REG_A6XX_RBBM_CLOCK_HYST_TP1, 0x77777777},
> + {REG_A6XX_RBBM_CLOCK_HYST2_TP0, 0x77777777},
> + {REG_A6XX_RBBM_CLOCK_HYST2_TP1, 0x77777777},
> + {REG_A6XX_RBBM_CLOCK_HYST3_TP0, 0x77777777},
> + {REG_A6XX_RBBM_CLOCK_HYST3_TP1, 0x77777777},
> + {REG_A6XX_RBBM_CLOCK_HYST4_TP0, 0x00077777},
> + {REG_A6XX_RBBM_CLOCK_HYST4_TP1, 0x00077777},
> + {REG_A6XX_RBBM_CLOCK_DELAY_TP0, 0x11111111},
> + {REG_A6XX_RBBM_CLOCK_DELAY_TP1, 0x11111111},
> + {REG_A6XX_RBBM_CLOCK_DELAY2_TP0, 0x11111111},
> + {REG_A6XX_RBBM_CLOCK_DELAY2_TP1, 0x11111111},
> + {REG_A6XX_RBBM_CLOCK_DELAY3_TP0, 0x11111111},
> + {REG_A6XX_RBBM_CLOCK_DELAY3_TP1, 0x11111111},
> + {REG_A6XX_RBBM_CLOCK_DELAY4_TP0, 0x00011111},
> + {REG_A6XX_RBBM_CLOCK_DELAY4_TP1, 0x00011111},
> + {REG_A6XX_RBBM_CLOCK_CNTL_UCHE, 0x22222222},
> + {REG_A6XX_RBBM_CLOCK_CNTL2_UCHE, 0x22222222},
> + {REG_A6XX_RBBM_CLOCK_CNTL3_UCHE, 0x22222222},
> + {REG_A6XX_RBBM_CLOCK_CNTL4_UCHE, 0x00222222},
> + {REG_A6XX_RBBM_CLOCK_HYST_UCHE, 0x00000004},
> + {REG_A6XX_RBBM_CLOCK_DELAY_UCHE, 0x00000002},
> + {REG_A6XX_RBBM_CLOCK_CNTL_RB0, 0x22222222},
> + {REG_A6XX_RBBM_CLOCK_CNTL2_RB0, 0x00002222},
> + {REG_A6XX_RBBM_CLOCK_CNTL_CCU0, 0x00002020},
> + {REG_A6XX_RBBM_CLOCK_CNTL_CCU1, 0x00002220},
> + {REG_A6XX_RBBM_CLOCK_CNTL_CCU2, 0x00002220},
> + {REG_A6XX_RBBM_CLOCK_CNTL_CCU3, 0x00002220},
> + {REG_A6XX_RBBM_CLOCK_HYST_RB_CCU0, 0x00040F00},
> + {REG_A6XX_RBBM_CLOCK_HYST_RB_CCU1, 0x00040F00},
> + {REG_A6XX_RBBM_CLOCK_HYST_RB_CCU2, 0x00040F00},
> + {REG_A6XX_RBBM_CLOCK_HYST_RB_CCU3, 0x00040F00},
> + {REG_A6XX_RBBM_CLOCK_CNTL_RAC, 0x05022022},
> + {REG_A6XX_RBBM_CLOCK_CNTL2_RAC, 0x00005555},
> + {REG_A6XX_RBBM_CLOCK_DELAY_RAC, 0x00000011},
> + {REG_A6XX_RBBM_CLOCK_HYST_RAC, 0x00445044},
> + {REG_A6XX_RBBM_CLOCK_CNTL_TSE_RAS_RBBM, 0x04222222},
> + {REG_A6XX_RBBM_CLOCK_MODE_GPC, 0x00222222},
> + {REG_A6XX_RBBM_CLOCK_MODE_VFD, 0x00002222},
> + {REG_A6XX_RBBM_CLOCK_HYST_TSE_RAS_RBBM, 0x00000000},
> + {REG_A6XX_RBBM_CLOCK_HYST_GPC, 0x04104004},
> + {REG_A6XX_RBBM_CLOCK_HYST_VFD, 0x00000000},
> + {REG_A6XX_RBBM_CLOCK_DELAY_HLSQ, 0x00000000},
> + {REG_A6XX_RBBM_CLOCK_DELAY_TSE_RAS_RBBM, 0x00004000},
> + {REG_A6XX_RBBM_CLOCK_DELAY_GPC, 0x00000200},
> + {REG_A6XX_RBBM_CLOCK_DELAY_VFD, 0x00002222},
> + {REG_A6XX_RBBM_CLOCK_DELAY_HLSQ_2, 0x00000002},
> + {REG_A6XX_RBBM_CLOCK_MODE_HLSQ, 0x00002222},
> + {REG_A6XX_RBBM_CLOCK_CNTL_GMU_GX, 0x00000222},
> + {REG_A6XX_RBBM_CLOCK_DELAY_GMU_GX, 0x00000111},
> + {REG_A6XX_RBBM_CLOCK_HYST_GMU_GX, 0x00000555},
> + {},
> +};
> +
> const struct adreno_reglist a630_hwcg[] = {
> {REG_A6XX_RBBM_CLOCK_CNTL_SP0, 0x22222222},
> {REG_A6XX_RBBM_CLOCK_CNTL_SP1, 0x22222222},
> @@ -527,7 +595,7 @@ static void a6xx_set_hwcg(struct msm_gpu *gpu, bool state)
> gpu_write(gpu, REG_A6XX_RBBM_CLOCK_CNTL, state ? clock_cntl_on : 0);
> }
>
> -/* For a615, a616, a618, A619, a630, a640 and a680 */
> +/* For a615, a616, a618, a619, a630, a640 and a680 */
> static const u32 a6xx_protect[] = {
> A6XX_PROTECT_RDONLY(0x00000, 0x04ff),
> A6XX_PROTECT_RDONLY(0x00501, 0x0005),
> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_hfi.c b/drivers/gpu/drm/msm/adreno/a6xx_hfi.c
> index d73fce5fdf1f..db88fa6122d2 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_hfi.c
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_hfi.c
> @@ -205,8 +205,8 @@ static int a6xx_hfi_get_fw_version(struct a6xx_gmu *gmu, u32 *version)
> {
> struct a6xx_hfi_msg_fw_version msg = { 0 };
>
> - /* Currently supporting version 1.1 */
> - msg.supported_version = (1 << 28) | (1 << 16);
> + /* Currently supporting version 1.10 */
> + msg.supported_version = (1 << 28) | (1 << 19) | (1 << 17);
>
> return a6xx_hfi_send_msg(gmu, HFI_H2F_MSG_FW_VERSION, &msg, sizeof(msg),
> version, sizeof(*version));
> @@ -285,6 +285,66 @@ static void a618_build_bw_table(struct a6xx_hfi_msg_bw_table *msg)
> msg->cnoc_cmds_data[1][0] = 0x60000001;
> }
>
> +static void a619_build_bw_table(struct a6xx_hfi_msg_bw_table *msg)
> +{
> + msg->bw_level_num = 13;
> +
> + msg->ddr_cmds_num = 1;
> + msg->ddr_wait_bitmask = 0x0;
> +
> + msg->ddr_cmds_addrs[0] = 0x50000;
> + msg->ddr_cmds_addrs[1] = 0x50004;
> + msg->ddr_cmds_addrs[2] = 0x50080;
> +
> + msg->ddr_cmds_data[0][0] = 0x40000000;
> + msg->ddr_cmds_data[0][1] = 0x40000000;
> + msg->ddr_cmds_data[0][2] = 0x40000000;
> + msg->ddr_cmds_data[1][0] = 0x6000030c;
> + msg->ddr_cmds_data[1][1] = 0x600000db;
> + msg->ddr_cmds_data[1][2] = 0x60000008;
> + msg->ddr_cmds_data[2][0] = 0x60000618;
> + msg->ddr_cmds_data[2][1] = 0x600001b6;
> + msg->ddr_cmds_data[2][2] = 0x60000008;
> + msg->ddr_cmds_data[3][0] = 0x60000925;
> + msg->ddr_cmds_data[3][1] = 0x60000291;
> + msg->ddr_cmds_data[3][2] = 0x60000008;
> + msg->ddr_cmds_data[4][0] = 0x60000dc1;
> + msg->ddr_cmds_data[4][1] = 0x600003dc;
> + msg->ddr_cmds_data[4][2] = 0x60000008;
> + msg->ddr_cmds_data[5][0] = 0x600010ad;
> + msg->ddr_cmds_data[5][1] = 0x600004ae;
> + msg->ddr_cmds_data[5][2] = 0x60000008;
> + msg->ddr_cmds_data[6][0] = 0x600014c3;
> + msg->ddr_cmds_data[6][1] = 0x600005d4;
> + msg->ddr_cmds_data[6][2] = 0x60000008;
> + msg->ddr_cmds_data[7][0] = 0x6000176a;
> + msg->ddr_cmds_data[7][1] = 0x60000693;
> + msg->ddr_cmds_data[7][2] = 0x60000008;
> + msg->ddr_cmds_data[8][0] = 0x60001f01;
> + msg->ddr_cmds_data[8][1] = 0x600008b5;
> + msg->ddr_cmds_data[8][2] = 0x60000008;
> + msg->ddr_cmds_data[9][0] = 0x60002940;
> + msg->ddr_cmds_data[9][1] = 0x60000b95;
> + msg->ddr_cmds_data[9][2] = 0x60000008;
> + msg->ddr_cmds_data[10][0] = 0x60002f68;
> + msg->ddr_cmds_data[10][1] = 0x60000d50;
> + msg->ddr_cmds_data[10][2] = 0x60000008;
> + msg->ddr_cmds_data[11][0] = 0x60003700;
> + msg->ddr_cmds_data[11][1] = 0x60000f71;
> + msg->ddr_cmds_data[11][2] = 0x60000008;
> + msg->ddr_cmds_data[12][0] = 0x60003fce;
> + msg->ddr_cmds_data[12][1] = 0x600011ea;
> + msg->ddr_cmds_data[12][2] = 0x60000008;
> +
> + msg->cnoc_cmds_num = 3;
> + msg->cnoc_wait_bitmask = 0x0;
> +
> + msg->cnoc_cmds_addrs[0] = 0x50054;
> +
> + msg->cnoc_cmds_data[0][0] = 0x40000000;
> + msg->cnoc_cmds_data[1][0] = 0x60000001;
> +}
> +
> static void a640_build_bw_table(struct a6xx_hfi_msg_bw_table *msg)
> {
> /*
> @@ -462,6 +522,8 @@ static int a6xx_hfi_send_bw_table(struct a6xx_gmu *gmu)
>
> if (adreno_is_a618(adreno_gpu))
> a618_build_bw_table(&msg);
> + else if (adreno_is_a619(adreno_gpu))
> + a619_build_bw_table(&msg);
> else if (adreno_is_a640_family(adreno_gpu))
> a640_build_bw_table(&msg);
> else if (adreno_is_a650(adreno_gpu))
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
> index fb261930ad1c..4dc6801ad5d9 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_device.c
> +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
> @@ -264,6 +264,19 @@ static const struct adreno_info gpulist[] = {
> .gmem = SZ_512K,
> .inactive_period = DRM_MSM_INACTIVE_PERIOD,
> .init = a6xx_gpu_init,
> + }, {
> + .rev = ADRENO_REV(6, 1, 9, ANY_ID),
> + .revn = 619,
> + .name = "A619",
> + .fw = {
> + [ADRENO_FW_SQE] = "a630_sqe.fw",
> + [ADRENO_FW_GMU] = "a619_gmu.bin",
> + },
> + .gmem = SZ_512K,
> + .inactive_period = DRM_MSM_INACTIVE_PERIOD,
> + .init = a6xx_gpu_init,
> + .zapfw = "a615_zap.mdt",
> + .hwcg = a615_hwcg,
> }, {
> .rev = ADRENO_REV(6, 3, 0, ANY_ID),
> .revn = 630,
> @@ -356,6 +369,7 @@ MODULE_FIRMWARE("qcom/a530_zap.mdt");
> MODULE_FIRMWARE("qcom/a530_zap.b00");
> MODULE_FIRMWARE("qcom/a530_zap.b01");
> MODULE_FIRMWARE("qcom/a530_zap.b02");
> +MODULE_FIRMWARE("qcom/a619_gmu.bin");
> MODULE_FIRMWARE("qcom/a630_sqe.fw");
> MODULE_FIRMWARE("qcom/a630_gmu.bin");
> MODULE_FIRMWARE("qcom/a630_zap.mbn");
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> index cffabe7d33c1..9e3b4ea7f9bc 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> @@ -57,7 +57,7 @@ struct adreno_reglist {
> u32 value;
> };
>
> -extern const struct adreno_reglist a630_hwcg[], a640_hwcg[], a650_hwcg[], a660_hwcg[];
> +extern const struct adreno_reglist a615_hwcg[], a630_hwcg[], a640_hwcg[], a650_hwcg[], a660_hwcg[];
>
> struct adreno_info {
> struct adreno_rev rev;
> @@ -241,6 +241,11 @@ static inline int adreno_is_a618(struct adreno_gpu *gpu)
> return gpu->revn == 618;
> }
>
> +static inline int adreno_is_a619(struct adreno_gpu *gpu)
> +{
> + return gpu->revn == 619;
> +}
> +
> static inline int adreno_is_a630(struct adreno_gpu *gpu)
> {
> return gpu->revn == 630;
> @@ -267,6 +272,12 @@ static inline int adreno_is_a660(struct adreno_gpu *gpu)
> return gpu->revn == 660;
> }
>
> +/* check for a615, a616, a618, a619 or any derivatives */
> +static inline int adreno_is_a615_family(struct adreno_gpu *gpu)
> +{
> + return gpu->revn == 615 || gpu->revn == 616 || gpu->revn == 618 || gpu->revn == 619;
> +}
> +
> static inline int adreno_is_a660_family(struct adreno_gpu *gpu)
> {
> return adreno_is_a660(gpu) || adreno_is_7c3(gpu);
> --
> 2.35.1
>
More information about the dri-devel
mailing list