drm/msm/a6xx: add support for Adreno 660 GPU
Subsystems (4)
cover drm/msm/a6xx: add support for Adreno 660 GPU
Add support for Adreno 660 to the drm/msm driver. Very similar to A650 on the kernel side.
Jonathan Marek (5):
drm/msm: remove unused icc_path/ocmem_icc_path drm/msm/a6xx: avoid shadow NULL reference in failure path drm/msm/a6xx: add support for Adreno 660 GPU drm/msm/a6xx: update a6xx_ucode_check_version for a660 drm/msm/a6xx: add a660 hwcg table
drivers/gpu/drm/msm/adreno/a6xx.xml.h | 4 + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 32 ++++-- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 115 ++++++++++++++++----- drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 33 ++++++ drivers/gpu/drm/msm/adreno/adreno_device.c | 13 +++ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 5 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 14 ++- drivers/gpu/drm/msm/msm_gpu.h | 9 -- 8 files changed, 176 insertions(+), 49 deletions(-)
Signature · 1 line
2.26.1
PATCH 1/5 drm/msm: remove unused icc_path/ocmem_icc_path
These aren't used by anything anymore.
--- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 --- drivers/gpu/drm/msm/msm_gpu.h | 9 --------- 2 files changed, 12 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +0 -3
@@ -946,7 +946,4 @@ void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu)pm_runtime_disable (&priv->gpu_pdev->dev);msm_gpu_cleanup (&adreno_gpu->base); - -icc_put (gpu->icc_path); -icc_put (gpu->ocmem_icc_path); }
drivers/gpu/drm/msm/msm_gpu.h +0 -9
@@ -118,15 +118,6 @@ struct msm_gpu {struct clk *ebi1_clk, *core_clk, *rbbmtimer_clk;uint32_t fast_rate; -/* The gfx-mem interconnect path that's used by all GPU types. */ -struct icc_path *icc_path; - -/* -* Second interconnect path for some A3xx and all A4xx GPUs to the -* On Chip MEMory (OCMEM). -*/ -struct icc_path *ocmem_icc_path; -/* Hang and Inactivity Detection: */ #define DRM_MSM_INACTIVE_PERIOD 66/* in ms (roughly four frames) */
Signature · 1 line
2.26.1
PATCH 2/5 drm/msm/a6xx: avoid shadow NULL reference in failure path
In reply to Jonathan MarekIf a6xx_hw_init() fails before creating the shadow_bo, the a6xx_pm_suspend code referencing it will crash. Change the condition to one that avoids this problem (note: creation of shadow_bo is behind this same condition)
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1 -1
@@ -1211,7 +1211,7 @@ static int a6xx_pm_suspend(struct msm_gpu *gpu)if (ret)return ret; -if (adreno_gpu->base.hw_apriv || a6xx_gpu->has_whereami) +if (a6xx_gpu->shadow_bo)for (i =0 ; i < gpu->nr_rings; i++) a6xx_gpu->shadow[i] =0 ;
Signature · 1 line
2.26.1
PATCH 3/5 drm/msm/a6xx: add support for Adreno 660 GPU
In reply to Jonathan MarekAdd adreno_is_{a660,a650_family} helpers and convert update existing adreno_is_a650 usage based on downstream driver's logic (changing into adreno_is_a650_family or adding adreno_is_a660).
And add the remaining changes required for A660, again based on the downstream driver: missing GMU allocations, additional register init, dummy hfi BW table, entry in gpulist table.
--- drivers/gpu/drm/msm/adreno/a6xx.xml.h | 4 +++ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 32 +++++++++++++++------ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 24 +++++++++++----- drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 33 ++++++++++++++++++++++ drivers/gpu/drm/msm/adreno/adreno_device.c | 12 ++++++++ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 12 ++++++++ 7 files changed, 103 insertions(+), 16 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx.xml.h +4 -0
@@ -2240,6 +2240,8 @@ static inline uint32_t A6XX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL15(uint32_t val)#define REG_A6XX_DBGC_CFG_DBGBUS_TRACE_BUF2 0x00000630 +#define REG_A6XX_CP_LPAC_PROG_FIFO_SIZE 0x00000b34 +#define REG_A6XX_VSC_PERFCTR_VSC_SEL_0 0x00000cd8#define REG_A6XX_VSC_PERFCTR_VSC_SEL_1 0x00000cd9
@@ -2340,6 +2342,8 @@ static inline uint32_t A6XX_UCHE_CLIENT_PF_PERFSEL(uint32_t val)#define REG_A6XX_UCHE_PERFCTR_UCHE_SEL_11 0x00000e27 +#define REG_A6XX_UCHE_CMDQ_CONFIG 0x00000e3c +#define REG_A6XX_SP_ADDR_MODE_CNTL 0x0000ae01#define REG_A6XX_SP_NC_MODE_CNTL 0x0000ae02
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +24 -8
@@ -520,7 +520,7 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)if (adreno_is_a618 (adreno_gpu) ||adreno_is_a640 (adreno_gpu)) pdc_address_offset =0x30090 ; -else if (adreno_is_a650 (adreno_gpu)) +else if (adreno_is_a650_family (adreno_gpu)) pdc_address_offset =0x300a0 ;else pdc_address_offset =0x30080 ;
@@ -542,7 +542,7 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)gmu_write_rscc (gmu,REG_A6XX_RSCC_PDC_MATCH_VALUE_HI ,0x4514 );/* Load RSC sequencer uCode for sleep and wakeup */ -if (adreno_is_a650 (adreno_gpu)) { +if (adreno_is_a650_family (adreno_gpu)) {gmu_write_rscc (gmu,REG_A6XX_RSCC_SEQ_MEM_0_DRV0 ,0xeaaae5a0 );gmu_write_rscc (gmu,REG_A6XX_RSCC_SEQ_MEM_0_DRV0 +1 ,0xe1a1ebab );gmu_write_rscc (gmu,REG_A6XX_RSCC_SEQ_MEM_0_DRV0 +2 ,0xa2e0a581 );
@@ -587,7 +587,7 @@ 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 (adreno_gpu)) +if (adreno_is_a618 (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 );
@@ -687,7 +687,7 @@ static int a6xx_gmu_fw_load(struct a6xx_gmu *gmu)u32 itcm_base =0x00000000 ;u32 dtcm_base =0x00040000 ; -if (adreno_is_a650 (adreno_gpu)) +if (adreno_is_a650_family (adreno_gpu)) dtcm_base =0x10004000 ;if (gmu->legacy) {
@@ -740,7 +740,7 @@ static int a6xx_gmu_fw_start(struct a6xx_gmu *gmu, unsigned int state)int ret;u32 chipid; -if (adreno_is_a650 (adreno_gpu)) +if (adreno_is_a650 (adreno_gpu) ||adreno_is_a660 (adreno_gpu))gmu_write (gmu,REG_A6XX_GPU_GMU_CX_GMU_CX_FAL_INTF ,1 );if (state ==GMU_WARM_BOOT ) {
@@ -1483,12 +1483,28 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node)if (ret) goto err_put_device; + +/* A660 now requires handling "prealloc requests" in GMU firmware +* For now just hardcode allocations based on the known firmware. +* note: there is no indication that these correspond to "dummy" or +* "debug" regions, but this "guess" allows reusing these BOs which +* are otherwise unused by a660. +*/ + gmu->dummy.size =SZ_4K ; +if (adreno_is_a660 (adreno_gpu)) { + ret =a6xx_gmu_memory_alloc (gmu, &gmu->debug,SZ_4K *7 ,0x60400000 ); +if (ret) + goto err_memory; + + gmu->dummy.size =SZ_8K ; + } +/* Allocate memory for the GMU dummy page */ - ret =a6xx_gmu_memory_alloc (gmu, &gmu->dummy,SZ_4K ,0x60000000 ); + ret =a6xx_gmu_memory_alloc (gmu, &gmu->dummy, gmu->dummy.size,0x60000000 );if (ret) goto err_memory; -if (adreno_is_a650 (adreno_gpu)) { +if (adreno_is_a650_family (adreno_gpu)) { ret =a6xx_gmu_memory_alloc (gmu, &gmu->icache,SZ_16M -SZ_16K ,0x04000 );if (ret)
@@ -1530,7 +1546,7 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node) goto err_memory; } -if (adreno_is_a650 (adreno_gpu)) { +if (adreno_is_a650_family (adreno_gpu)) { gmu->rscc =a6xx_gmu_get_mmio (pdev,"rscc" );if (IS_ERR (gmu->rscc)) goto err_mmio;
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +17 -7
@@ -477,7 +477,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu)if (adreno_is_a640 (adreno_gpu)) amsbc =1 ; -if (adreno_is_a650 (adreno_gpu)) { +if (adreno_is_a650 (adreno_gpu) ||adreno_is_a660 (adreno_gpu)) {/* TODO: get ddr type from bootloader and use 2 for LPDDR4 */ lower_bit =3 ; amsbc =1 ;
@@ -690,7 +690,7 @@ static int a6xx_hw_init(struct msm_gpu *gpu)a6xx_set_hwcg (gpu, true);/* VBIF/GBIF start*/ -if (adreno_is_a640 (adreno_gpu) ||adreno_is_a650 (adreno_gpu)) { +if (adreno_is_a640 (adreno_gpu) ||adreno_is_a650_family (adreno_gpu)) {gpu_write (gpu,REG_A6XX_GBIF_QSB_SIDE0 ,0x00071620 );gpu_write (gpu,REG_A6XX_GBIF_QSB_SIDE1 ,0x00071620 );gpu_write (gpu,REG_A6XX_GBIF_QSB_SIDE2 ,0x00071620 );
@@ -715,7 +715,7 @@ static int a6xx_hw_init(struct msm_gpu *gpu)gpu_write (gpu,REG_A6XX_UCHE_WRITE_THRU_BASE_LO ,0xfffff000 );gpu_write (gpu,REG_A6XX_UCHE_WRITE_THRU_BASE_HI ,0x0001ffff ); -if (!adreno_is_a650 (adreno_gpu)) { +if (!adreno_is_a650_family (adreno_gpu)) {/* Set the GMEM VA range [0x100000:0x100000 + gpu->gmem - 1] */ gpu_write64 (gpu,REG_A6XX_UCHE_GMEM_RANGE_MIN_LO ,REG_A6XX_UCHE_GMEM_RANGE_MIN_HI ,0x00100000 );
@@ -728,17 +728,20 @@ static int a6xx_hw_init(struct msm_gpu *gpu)gpu_write (gpu,REG_A6XX_UCHE_FILTER_CNTL ,0x804 );gpu_write (gpu,REG_A6XX_UCHE_CACHE_WAYS ,0x4 ); -if (adreno_is_a640 (adreno_gpu) ||adreno_is_a650 (adreno_gpu)) +if (adreno_is_a640 (adreno_gpu) ||adreno_is_a650_family (adreno_gpu))gpu_write (gpu,REG_A6XX_CP_ROQ_THRESHOLDS_2 ,0x02000140 );else gpu_write (gpu,REG_A6XX_CP_ROQ_THRESHOLDS_2 ,0x010000c0 );gpu_write (gpu,REG_A6XX_CP_ROQ_THRESHOLDS_1 ,0x8040362c ); +if (adreno_is_a660 (adreno_gpu)) +gpu_write (gpu,REG_A6XX_CP_LPAC_PROG_FIFO_SIZE ,0x00000020 ); +/* Setting the mem pool size */ gpu_write (gpu,REG_A6XX_CP_MEM_POOL_SIZE ,128 );/* Setting the primFifo thresholds default values */ -if (adreno_is_a650 (adreno_gpu)) +if (adreno_is_a650 (adreno_gpu) ||adreno_is_a660 (adreno_gpu))gpu_write (gpu,REG_A6XX_PC_DBG_ECO_CNTL ,0x00300000 );else if (adreno_is_a640 (adreno_gpu))gpu_write (gpu,REG_A6XX_PC_DBG_ECO_CNTL ,0x00200000 );
@@ -763,7 +766,7 @@ static int a6xx_hw_init(struct msm_gpu *gpu)gpu_write (gpu,REG_A6XX_UCHE_CLIENT_PF ,1 );/* Set weights for bicubic filtering */ -if (adreno_is_a650 (adreno_gpu)) { +if (adreno_is_a650_family (adreno_gpu)) {gpu_write (gpu,REG_A6XX_TPL1_BICUBIC_WEIGHTS_TABLE_0 ,0 );gpu_write (gpu,REG_A6XX_TPL1_BICUBIC_WEIGHTS_TABLE_1 ,0x3fe05ff4 );
@@ -812,6 +815,13 @@ static int a6xx_hw_init(struct msm_gpu *gpu) A6XX_PROTECT_RDONLY(0x980, 0x4));gpu_write (gpu,REG_A6XX_CP_PROTECT (25 ),A6XX_PROTECT_RW (0xa630 ,0x0 )); +if (adreno_is_a660 (adreno_gpu)) { +gpu_write (gpu,REG_A6XX_CP_CHICKEN_DBG ,0x1 ); +gpu_write (gpu,REG_A6XX_RBBM_GBIF_CLIENT_QOS_CNTL ,0x0 ); +/* Set dualQ + disable afull for A660 GPU but not for A635 */ +gpu_write (gpu,REG_A6XX_UCHE_CMDQ_CONFIG ,0x66906 ); + } +/* Enable expanded apriv for targets that support it */ if (gpu->hw_apriv) { gpu_write(gpu, REG_A6XX_CP_APRIV_CNTL,
@@ -1488,7 +1498,7 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev)*/ info =adreno_info (config->rev); -if (info && info->revn ==650 ) +if (info && (info->revn ==650 || info->revn ==660 )) adreno_gpu->base.hw_apriv = true;a6xx_llc_slices_init (pdev, a6xx_gpu);
drivers/gpu/drm/msm/adreno/a6xx_hfi.c +33 -0
@@ -351,6 +351,37 @@ static void a650_build_bw_table(struct a6xx_hfi_msg_bw_table *msg) msg->cnoc_cmds_data[1 ][0 ] =0x60000001 ; } +static void a660_build_bw_table (struct a6xx_hfi_msg_bw_table *msg) +{ +/* +* Send a single "off" entry just to get things running +* TODO: bus scaling +*/ + msg->bw_level_num =1 ; + + msg->ddr_cmds_num =3 ; + msg->ddr_wait_bitmask =0x01 ; + + msg->ddr_cmds_addrs[0 ] =0x50004 ; + msg->ddr_cmds_addrs[1 ] =0x500a0 ; + msg->ddr_cmds_addrs[2 ] =0x50000 ; + + msg->ddr_cmds_data[0 ][0 ] =0x40000000 ; + msg->ddr_cmds_data[0 ][1 ] =0x40000000 ; + msg->ddr_cmds_data[0 ][2 ] =0x40000000 ; + +/* +* These are the CX (CNOC) votes - these are used by the GMU but the +* votes are known and fixed for the target +*/ + msg->cnoc_cmds_num =1 ; + msg->cnoc_wait_bitmask =0x01 ; + + msg->cnoc_cmds_addrs[0 ] =0x50070 ; + msg->cnoc_cmds_data[0 ][0 ] =0x40000000 ; + msg->cnoc_cmds_data[1 ][0 ] =0x60000001 ; +} +static void a6xx_build_bw_table (struct a6xx_hfi_msg_bw_table *msg) {/* Send a single "off" entry since the 630 GMU doesn't do bus scaling */
@@ -401,6 +432,8 @@ static int a6xx_hfi_send_bw_table(struct a6xx_gmu *gmu)a640_build_bw_table (&msg); else if (adreno_is_a650(adreno_gpu)) a650_build_bw_table(&msg); + else if (adreno_is_a660(adreno_gpu)) + a660_build_bw_table(&msg); else a6xx_build_bw_table(&msg);
drivers/gpu/drm/msm/adreno/adreno_device.c +12 -0
@@ -287,6 +287,18 @@ static const struct adreno_info gpulist[] = { .init = a6xx_gpu_init, .zapfw = "a650_zap.mdt", .hwcg = a650_hwcg, + }, { + .rev = ADRENO_REV(6, 6, 0, ANY_ID), + .revn = 660, + .name = "A660", + .fw = { + [ADRENO_FW_SQE] = "a660_sqe.fw", + [ADRENO_FW_GMU] = "a660_gmu.bin", + }, + .gmem = SZ_1M + SZ_512K, + .inactive_period = DRM_MSM_INACTIVE_PERIOD, + .init = a6xx_gpu_init, + .zapfw = "a660_zap.mdt", }, };
drivers/gpu/drm/msm/adreno/adreno_gpu.c +1 -1
@@ -239,7 +239,7 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value) *value = adreno_gpu->gmem;return 0 ;case MSM_PARAM_GMEM_BASE : - *value = !adreno_is_a650 (adreno_gpu) ?0x100000 :0 ; + *value = !adreno_is_a650_family (adreno_gpu) ?0x100000 :0 ;return 0 ;case MSM_PARAM_CHIP_ID : *value = adreno_gpu->rev.patchid |
drivers/gpu/drm/msm/adreno/adreno_gpu.h +12 -0
@@ -247,6 +247,18 @@ static inline int adreno_is_a650(struct adreno_gpu *gpu)return gpu->revn ==650 ; } +static inline int adreno_is_a660 (struct adreno_gpu *gpu) +{ +return gpu->revn ==660 ; +} + +/* check for a650, a660, or any derivatives */ +static inline int adreno_is_a650_family (struct adreno_gpu *gpu) +{ +return gpu->revn ==650 || gpu->revn ==620 || + gpu->revn ==660 || gpu->revn ==635 ; +} +int adreno_get_param (struct msm_gpu *gpu,uint32_t param,uint64_t *value);const struct firmware *adreno_request_fw (struct adreno_gpu *adreno_gpu,const char *fwname);
Signature · 1 line
2.26.1
PATCH 4/5 drm/msm/a6xx: update a6xx_ucode_check_version for a660
In reply to Jonathan MarekAccept all SQE firmware versions for A660.
Re-organize the function a bit and print an error message for unexpected GPU IDs instead of failing silently.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 36 +++++++++++++-------------- 1 file changed, 17 insertions(+), 19 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +17 -19
@@ -541,6 +541,11 @@ static bool a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu,* Targets up to a640 (a618, a630 and a640) need to check for a * microcode version that is patched to support the whereami opcode or * one that is new enough to include it by default. +* +* a650 tier targets don't need whereami but still need to be +* equal to or newer than 0.95 for other security fixes +* +* a660 targets have all the critical security fixes from the start */ if (adreno_is_a618 (adreno_gpu) ||adreno_is_a630 (adreno_gpu) ||adreno_is_a640 (adreno_gpu)) {
@@ -564,27 +569,20 @@ static bool a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu,DRM_DEV_ERROR (&gpu->pdev->dev,"a630 SQE ucode is too old. Have version %x need at least %x\n" , buf[0 ] &0xfff ,0x190 ); - }else { -/* -* a650 tier targets don't need whereami but still need to be -* equal to or newer than 0.95 for other security fixes -*/ -if (adreno_is_a650 (adreno_gpu)) { -if ((buf[0 ] &0xfff ) >=0x095 ) { - ret = true; - goto out; - } - -DRM_DEV_ERROR (&gpu->pdev->dev, -"a650 SQE ucode is too old. Have version %x need at least %x\n" , - buf[0 ] &0xfff ,0x095 ); + }else if (adreno_is_a650 (adreno_gpu)) { +if ((buf[0 ] &0xfff ) >=0x095 ) { + ret = true; + goto out; } -/* -* When a660 is added those targets should return true here -* since those have all the critical security fixes built in -* from the start -*/ +DRM_DEV_ERROR (&gpu->pdev->dev, +"a650 SQE ucode is too old. Have version %x need at least %x\n" , + buf[0 ] &0xfff ,0x095 ); + }else if (adreno_is_a660 (adreno_gpu)) { + ret = true; + }else { +DRM_DEV_ERROR (&gpu->pdev->dev, +"unknown GPU, add it to a6xx_ucode_check_version()!!\n" ); } out:msm_gem_put_vaddr (obj);
Signature · 1 line
2.26.1
PATCH 5/5 drm/msm/a6xx: add a660 hwcg table
In reply to Jonathan MarekAdd a660 hwcg table, ported over from downstream.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 53 ++++++++++++++++++++++ drivers/gpu/drm/msm/adreno/adreno_device.c | 1 + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 +- 3 files changed, 55 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +53 -0
@@ -427,6 +427,59 @@ const struct adreno_reglist a650_hwcg[] = { {}, }; +const struct adreno_reglist a660_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 ,0x22222222 }, + {REG_A6XX_RBBM_CLOCK_CNTL2_TP0 ,0x22222222 }, + {REG_A6XX_RBBM_CLOCK_CNTL3_TP0 ,0x22222222 }, + {REG_A6XX_RBBM_CLOCK_CNTL4_TP0 ,0x00022222 }, + {REG_A6XX_RBBM_CLOCK_DELAY_TP0 ,0x11111111 }, + {REG_A6XX_RBBM_CLOCK_DELAY2_TP0 ,0x11111111 }, + {REG_A6XX_RBBM_CLOCK_DELAY3_TP0 ,0x11111111 }, + {REG_A6XX_RBBM_CLOCK_DELAY4_TP0 ,0x00011111 }, + {REG_A6XX_RBBM_CLOCK_HYST_TP0 ,0x77777777 }, + {REG_A6XX_RBBM_CLOCK_HYST2_TP0 ,0x77777777 }, + {REG_A6XX_RBBM_CLOCK_HYST3_TP0 ,0x77777777 }, + {REG_A6XX_RBBM_CLOCK_HYST4_TP0 ,0x00077777 }, + {REG_A6XX_RBBM_CLOCK_CNTL_RB0 ,0x22222222 }, + {REG_A6XX_RBBM_CLOCK_CNTL2_RB0 ,0x01002222 }, + {REG_A6XX_RBBM_CLOCK_CNTL_CCU0 ,0x00002220 }, + {REG_A6XX_RBBM_CLOCK_HYST_RB_CCU0 ,0x00040F00 }, + {REG_A6XX_RBBM_CLOCK_CNTL_RAC ,0x25222022 }, + {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_VFD ,0x00002222 }, + {REG_A6XX_RBBM_CLOCK_MODE_GPC ,0x00222222 }, + {REG_A6XX_RBBM_CLOCK_DELAY_HLSQ_2 ,0x00000002 }, + {REG_A6XX_RBBM_CLOCK_MODE_HLSQ ,0x00002222 }, + {REG_A6XX_RBBM_CLOCK_DELAY_TSE_RAS_RBBM ,0x00004000 }, + {REG_A6XX_RBBM_CLOCK_DELAY_VFD ,0x00002222 }, + {REG_A6XX_RBBM_CLOCK_DELAY_GPC ,0x00000200 }, + {REG_A6XX_RBBM_CLOCK_DELAY_HLSQ ,0x00000000 }, + {REG_A6XX_RBBM_CLOCK_HYST_TSE_RAS_RBBM ,0x00000000 }, + {REG_A6XX_RBBM_CLOCK_HYST_VFD ,0x00000000 }, + {REG_A6XX_RBBM_CLOCK_HYST_GPC ,0x04104004 }, + {REG_A6XX_RBBM_CLOCK_HYST_HLSQ ,0x00000000 }, + {REG_A6XX_RBBM_CLOCK_CNTL_TEX_FCHE ,0x00000222 }, + {REG_A6XX_RBBM_CLOCK_DELAY_TEX_FCHE ,0x00000111 }, + {REG_A6XX_RBBM_CLOCK_HYST_TEX_FCHE ,0x00000000 }, + {REG_A6XX_RBBM_CLOCK_CNTL_UCHE ,0x22222222 }, + {REG_A6XX_RBBM_CLOCK_HYST_UCHE ,0x00000004 }, + {REG_A6XX_RBBM_CLOCK_DELAY_UCHE ,0x00000002 }, + {REG_A6XX_RBBM_ISDB_CNT ,0x00000182 }, + {REG_A6XX_RBBM_RAC_THRESHOLD_CNT ,0x00000000 }, + {REG_A6XX_RBBM_SP_HYST_CNT ,0x00000000 }, + {REG_A6XX_RBBM_CLOCK_CNTL_GMU_GX ,0x00000222 }, + {REG_A6XX_RBBM_CLOCK_DELAY_GMU_GX ,0x00000111 }, + {REG_A6XX_RBBM_CLOCK_HYST_GMU_GX ,0x00000555 }, + {}, +}; +static void a6xx_set_hwcg (struct msm_gpu *gpu,bool state) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);
drivers/gpu/drm/msm/adreno/adreno_device.c +1 -0
@@ -299,6 +299,7 @@ static const struct adreno_info gpulist[] = { .inactive_period = DRM_MSM_INACTIVE_PERIOD, .init = a6xx_gpu_init, .zapfw = "a660_zap.mdt", + .hwcg = a660_hwcg, }, };
drivers/gpu/drm/msm/adreno/adreno_gpu.h +1 -1
@@ -55,7 +55,7 @@ struct adreno_reglist {u32 value; }; -extern const struct adreno_reglist a630_hwcg[], a640_hwcg[], a650_hwcg[]; +extern const struct adreno_reglist a630_hwcg[], a640_hwcg[], a650_hwcg[], a660_hwcg[];struct adreno_info {struct adreno_rev rev;
Signature · 1 line
2.26.1