diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3514-drm-amdgpu-powerplay-add-Renoir-VCN-power-management.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3514-drm-amdgpu-powerplay-add-Renoir-VCN-power-management.patch | 99 |
1 files changed, 99 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3514-drm-amdgpu-powerplay-add-Renoir-VCN-power-management.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3514-drm-amdgpu-powerplay-add-Renoir-VCN-power-management.patch new file mode 100644 index 00000000..fa41c341 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3514-drm-amdgpu-powerplay-add-Renoir-VCN-power-management.patch @@ -0,0 +1,99 @@ +From 9495a1532b66ff7e9415501d5208fed83e679a71 Mon Sep 17 00:00:00 2001 +From: Leo Liu <leo.liu@amd.com> +Date: Thu, 8 Aug 2019 15:21:44 -0500 +Subject: [PATCH 3514/4256] drm/amdgpu/powerplay: add Renoir VCN power + management + +Thus VCN can be powered up for normal operations + +Signed-off-by: Leo Liu <leo.liu@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Reviewed-by: Evan Quan <evan.quan@amd.com> +Reviewed-by: Aaron Liu <aaron.liu@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 8 ++++++-- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 3 +++ + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 12 ++++++++++++ + 3 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +index 5ab3e7b8c68a..022507eacf1a 100644 +--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c ++++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +@@ -1268,8 +1268,10 @@ static int smu_hw_init(void *handle) + return ret; + } + +- if (adev->asic_type == CHIP_RENOIR) ++ if (adev->asic_type == CHIP_RENOIR) { + smu_powergate_sdma(&adev->smu, false); ++ smu_powergate_vcn(&adev->smu, false); ++ } + + if (!smu->pm_enabled) + return 0; +@@ -1322,8 +1324,10 @@ static int smu_hw_fini(void *handle) + struct smu_table_context *table_context = &smu->smu_table; + int ret = 0; + +- if (adev->asic_type == CHIP_RENOIR) ++ if (adev->asic_type == CHIP_RENOIR) { + smu_powergate_sdma(&adev->smu, true); ++ smu_powergate_vcn(&adev->smu, true); ++ } + + kfree(table_context->driver_pptable); + table_context->driver_pptable = NULL; +diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +index 536f547f01c5..605767e79996 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +@@ -474,6 +474,7 @@ struct smu_funcs + int (*populate_smc_pptable)(struct smu_context *smu); + int (*check_fw_version)(struct smu_context *smu); + int (*powergate_sdma)(struct smu_context *smu, bool gate); ++ int (*powergate_vcn)(struct smu_context *smu, bool gate); + int (*write_pptable)(struct smu_context *smu); + int (*set_min_dcef_deep_sleep)(struct smu_context *smu); + int (*set_tool_table_location)(struct smu_context *smu); +@@ -552,6 +553,8 @@ struct smu_funcs + ((smu)->funcs->setup_pptable ? (smu)->funcs->setup_pptable((smu)) : 0) + #define smu_powergate_sdma(smu, gate) \ + ((smu)->funcs->powergate_sdma ? (smu)->funcs->powergate_sdma((smu), (gate)) : 0) ++#define smu_powergate_vcn(smu, gate) \ ++ ((smu)->funcs->powergate_vcn ? (smu)->funcs->powergate_vcn((smu), (gate)) : 0) + #define smu_get_vbios_bootup_values(smu) \ + ((smu)->funcs->get_vbios_bootup_values ? (smu)->funcs->get_vbios_bootup_values((smu)) : 0) + #define smu_get_clk_info_from_vbios(smu) \ +diff --git a/drivers/gpu/drm/amd/powerplay/smu_v12_0.c b/drivers/gpu/drm/amd/powerplay/smu_v12_0.c +index cba8507a02af..583fe7da4a4b 100644 +--- a/drivers/gpu/drm/amd/powerplay/smu_v12_0.c ++++ b/drivers/gpu/drm/amd/powerplay/smu_v12_0.c +@@ -172,10 +172,22 @@ static int smu_v12_0_powergate_sdma(struct smu_context *smu, bool gate) + return smu_send_smc_msg(smu, SMU_MSG_PowerUpSdma); + } + ++static int smu_v12_0_powergate_vcn(struct smu_context *smu, bool gate) ++{ ++ if (!(smu->adev->flags & AMD_IS_APU)) ++ return 0; ++ ++ if (gate) ++ return smu_send_smc_msg(smu, SMU_MSG_PowerDownVcn); ++ else ++ return smu_send_smc_msg(smu, SMU_MSG_PowerUpVcn); ++} ++ + static const struct smu_funcs smu_v12_0_funcs = { + .check_fw_status = smu_v12_0_check_fw_status, + .check_fw_version = smu_v12_0_check_fw_version, + .powergate_sdma = smu_v12_0_powergate_sdma, ++ .powergate_vcn = smu_v12_0_powergate_vcn, + .send_smc_msg = smu_v12_0_send_msg, + .send_smc_msg_with_param = smu_v12_0_send_msg_with_param, + .read_smc_arg = smu_v12_0_read_arg, +-- +2.17.1 + |