diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4454-drm-amd-powerplay-add-JPEG-power-control-for-Navi1x.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4454-drm-amd-powerplay-add-JPEG-power-control-for-Navi1x.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4454-drm-amd-powerplay-add-JPEG-power-control-for-Navi1x.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4454-drm-amd-powerplay-add-JPEG-power-control-for-Navi1x.patch new file mode 100644 index 00000000..5b70052c --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4454-drm-amd-powerplay-add-JPEG-power-control-for-Navi1x.patch @@ -0,0 +1,77 @@ +From 6f400e9b6048209875131ea15013028e5a3babc1 Mon Sep 17 00:00:00 2001 +From: Leo Liu <leo.liu@amd.com> +Date: Fri, 8 Nov 2019 14:11:01 -0500 +Subject: [PATCH 4454/4736] drm/amd/powerplay: add JPEG power control for + Navi1x + +By separating the JPEG power feature, and using its +own PowerUp and PowerDown messages + +v2: remove PowerUpJpeg message argument + +Signed-off-by: Leo Liu <leo.liu@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 32 ++++++++++++++++++++-- + 1 file changed, 30 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +index 6fd808312d4e..1efe243119dd 100644 +--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c ++++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +@@ -383,8 +383,10 @@ navi10_get_allowed_feature_mask(struct smu_context *smu, + *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_ATHUB_PG_BIT); + + if (smu->adev->pg_flags & AMD_PG_SUPPORT_VCN) +- *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_VCN_PG_BIT) +- | FEATURE_MASK(FEATURE_JPEG_PG_BIT); ++ *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_VCN_PG_BIT); ++ ++ if (smu->adev->pg_flags & AMD_PG_SUPPORT_JPEG) ++ *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_JPEG_PG_BIT); + + /* disable DPM UCLK and DS SOCCLK on navi10 A0 secure board */ + if (is_asic_secure(smu)) { +@@ -664,6 +666,31 @@ static int navi10_dpm_set_uvd_enable(struct smu_context *smu, bool enable) + return ret; + } + ++static int navi10_dpm_set_jpeg_enable(struct smu_context *smu, bool enable) ++{ ++ struct smu_power_context *smu_power = &smu->smu_power; ++ struct smu_power_gate *power_gate = &smu_power->power_gate; ++ int ret = 0; ++ ++ if (enable) { ++ if (smu_feature_is_enabled(smu, SMU_FEATURE_JPEG_PG_BIT)) { ++ ret = smu_send_smc_msg(smu, SMU_MSG_PowerUpJpeg); ++ if (ret) ++ return ret; ++ } ++ power_gate->jpeg_gated = false; ++ } else { ++ if (smu_feature_is_enabled(smu, SMU_FEATURE_JPEG_PG_BIT)) { ++ ret = smu_send_smc_msg(smu, SMU_MSG_PowerDownJpeg); ++ if (ret) ++ return ret; ++ } ++ power_gate->jpeg_gated = true; ++ } ++ ++ return ret; ++} ++ + static int navi10_get_current_clk_freq_by_table(struct smu_context *smu, + enum smu_clk_type clk_type, + uint32_t *value) +@@ -1995,6 +2022,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { + .get_allowed_feature_mask = navi10_get_allowed_feature_mask, + .set_default_dpm_table = navi10_set_default_dpm_table, + .dpm_set_uvd_enable = navi10_dpm_set_uvd_enable, ++ .dpm_set_jpeg_enable = navi10_dpm_set_jpeg_enable, + .get_current_clk_freq_by_table = navi10_get_current_clk_freq_by_table, + .print_clk_levels = navi10_print_clk_levels, + .force_clk_levels = navi10_force_clk_levels, +-- +2.17.1 + |