From: Leo Liu <leo.liu-5C7GfCeVMHo@public.gmane.org> To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Leo Liu <leo.liu-5C7GfCeVMHo@public.gmane.org> Subject: [PATCH 12/21] drm/amd/powerplay: add JPEG power control for Navi1x Date: Wed, 13 Nov 2019 09:11:52 -0500 [thread overview] Message-ID: <20191113141152.15393-1-leo.liu@amd.com> (raw) In-Reply-To: <20191112180329.3927-13-leo.liu-5C7GfCeVMHo@public.gmane.org> 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> --- 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 aeb9c1e341c7..dce6f76ecbe5 100644 --- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c @@ -384,8 +384,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)) { @@ -665,6 +667,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) @@ -1996,6 +2023,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 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Leo Liu <leo.liu@amd.com> To: amd-gfx@lists.freedesktop.org Cc: Leo Liu <leo.liu@amd.com> Subject: [PATCH 12/21] drm/amd/powerplay: add JPEG power control for Navi1x Date: Wed, 13 Nov 2019 09:11:52 -0500 [thread overview] Message-ID: <20191113141152.15393-1-leo.liu@amd.com> (raw) Message-ID: <20191113141152.R0NhZ7-hxRpAbJMSAzTc5I9kQVjinDc_iafTvUoVt8U@z> (raw) In-Reply-To: <20191112180329.3927-13-leo.liu@amd.com> 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> --- 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 aeb9c1e341c7..dce6f76ecbe5 100644 --- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c @@ -384,8 +384,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)) { @@ -665,6 +667,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) @@ -1996,6 +2023,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 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2019-11-13 14:11 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-12 18:03 [PATCH 00/21] Separate JPEG from VCN Leo Liu 2019-11-12 18:03 ` Leo Liu [not found] ` <20191112180329.3927-1-leo.liu-5C7GfCeVMHo@public.gmane.org> 2019-11-12 18:03 ` [PATCH 01/21] drm/amdgpu: add JPEG HW IP and SW structures Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 02/21] drm/amdgpu: add amdgpu_jpeg and JPEG tests Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 03/21] drm/amdgpu: separate JPEG1.0 code out from VCN1.0 Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 04/21] drm/amdgpu: use the JPEG structure for general driver support Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 05/21] drm/amdgpu: add JPEG IP block type Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 06/21] drm/amdgpu: add JPEG common functions to amdgpu_jpeg Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 07/21] drm/amdgpu: add JPEG v2.0 function supports Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 08/21] drm/amdgpu: remove unnecessary JPEG2.0 code from VCN2.0 Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 09/21] drm/amdgpu: add JPEG PG and CG interface Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 10/21] drm/amdgpu: add PG and CG for JPEG2.0 Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 11/21] drm/amd/powerplay: add JPEG Powerplay interface Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 12/21] drm/amd/powerplay: add JPEG power control for Navi1x Leo Liu 2019-11-12 18:03 ` Leo Liu [not found] ` <20191112180329.3927-13-leo.liu-5C7GfCeVMHo@public.gmane.org> 2019-11-13 3:50 ` Quan, Evan 2019-11-13 3:50 ` Quan, Evan [not found] ` <MN2PR12MB334438FF2957ED7C7C8E226FE4760-rweVpJHSKToDMgCC8P//OwdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 2019-11-13 13:50 ` Leo Liu 2019-11-13 13:50 ` Leo Liu 2019-11-13 14:11 ` Leo Liu [this message] 2019-11-13 14:11 ` Leo Liu 2019-11-12 18:03 ` [PATCH 13/21] drm/amd/powerplay: add Powergate JPEG for Renoir Leo Liu 2019-11-12 18:03 ` Leo Liu [not found] ` <20191112180329.3927-14-leo.liu-5C7GfCeVMHo@public.gmane.org> 2019-11-13 3:52 ` Quan, Evan 2019-11-13 3:52 ` Quan, Evan 2019-11-13 14:12 ` Leo Liu 2019-11-13 14:12 ` Leo Liu 2019-11-12 18:03 ` [PATCH 14/21] drm/amd/powerplay: add JPEG power control " Leo Liu 2019-11-12 18:03 ` Leo Liu [not found] ` <20191112180329.3927-15-leo.liu-5C7GfCeVMHo@public.gmane.org> 2019-11-13 3:52 ` Quan, Evan 2019-11-13 3:52 ` Quan, Evan 2019-11-13 14:13 ` Leo Liu 2019-11-13 14:13 ` Leo Liu 2019-11-12 18:03 ` [PATCH 15/21] drm/amd/powerplay: set JPEG to SMU dpm Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 16/21] drm/amdgpu: enable JPEG2.0 dpm Leo Liu 2019-11-12 18:03 ` Leo Liu [not found] ` <20191112180329.3927-17-leo.liu-5C7GfCeVMHo@public.gmane.org> 2019-11-14 16:03 ` Alex Deucher 2019-11-14 16:03 ` Alex Deucher [not found] ` <CADnq5_PTs-1fU3o3rpQ1hhAdbiicwixWMHuOxSbZ7bshMSBVxA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2019-11-14 16:14 ` Leo Liu 2019-11-14 16:14 ` Leo Liu 2019-11-12 18:03 ` [PATCH 17/21] drm/amdgpu: add driver support for JPEG2.0 and above Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 18/21] drm/amdgpu: enable JPEG2.0 for Navi1x and Renoir Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 19/21] drm/amdgpu: move JPEG2.5 out from VCN2.5 Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 20/21] drm/amdgpu: enable Arcturus CG for VCN and JPEG blocks Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:03 ` [PATCH 21/21] drm/amdgpu: enable Arcturus JPEG2.5 block Leo Liu 2019-11-12 18:03 ` Leo Liu 2019-11-12 18:59 ` [PATCH 00/21] Separate JPEG from VCN Leo Liu 2019-11-12 18:59 ` Leo Liu 2019-11-12 19:49 ` Alex Deucher 2019-11-12 19:49 ` Alex Deucher [not found] ` <CADnq5_NVBemrfE5OB=NBeb5XM5HPWdnhjaWM0KjdDyb6+pm9zA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2019-11-12 19:57 ` Leo Liu 2019-11-12 19:57 ` Leo Liu [not found] ` <171a5818-a2b5-6e91-ac35-050b43963988-5C7GfCeVMHo@public.gmane.org> 2019-11-12 20:12 ` Alex Deucher 2019-11-12 20:12 ` Alex Deucher [not found] ` <CADnq5_MRfvfE1D5SPOWTyWZFnLZezZ3N61QXvrwnLFssM++LrA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2019-11-12 20:16 ` Leo Liu 2019-11-12 20:16 ` Leo Liu [not found] ` <bf523547-408a-536d-5f61-226691058a7b-5C7GfCeVMHo@public.gmane.org> 2019-11-12 20:34 ` Alex Deucher 2019-11-12 20:34 ` Alex Deucher [not found] ` <CADnq5_NjNPZC=2xt5Qft6_jiZnbdtR+LqogTWdfty_N_zWR_uA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2019-11-12 20:37 ` Leo Liu 2019-11-12 20:37 ` Leo Liu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191113141152.15393-1-leo.liu@amd.com \ --to=leo.liu-5c7gfcevmho@public.gmane.org \ --cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).