From: Evan Quan <evan.quan@amd.com>
To: <amd-gfx@lists.freedesktop.org>
Cc: Alexander.Deucher@amd.com, Lijo.Lazar@amd.com,
Evan Quan <evan.quan@amd.com>,
rui.huang@amd.com
Subject: [PATCH 06/12] drm/amd/pm: correct the checks for sriov(pp_one_vf)
Date: Fri, 11 Feb 2022 15:52:03 +0800 [thread overview]
Message-ID: <20220211075209.894833-6-evan.quan@amd.com> (raw)
In-Reply-To: <20220211075209.894833-1-evan.quan@amd.com>
By setting pm_enabled as false for non pp_one_vf sriov case,
we can avoid the check for (amdgpu_sriov_vf(adev) &&
!amdgpu_sriov_is_pp_one_vf(adev)) in every routine.
Signed-off-by: Evan Quan <evan.quan@amd.com>
Change-Id: I3859529183cd26dce98c57dc87eab5273ecc949b
---
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 97c57a6cf314..8b8feaf7aa0e 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -543,7 +543,8 @@ static int smu_early_init(void *handle)
return -ENOMEM;
smu->adev = adev;
- smu->pm_enabled = !!amdgpu_dpm;
+ smu->pm_enabled = amdgpu_dpm &&
+ (!amdgpu_sriov_vf(adev) || amdgpu_sriov_is_pp_one_vf(adev));
smu->is_apu = false;
smu->smu_baco.state = SMU_BACO_STATE_EXIT;
smu->smu_baco.platform_support = false;
@@ -1257,10 +1258,8 @@ static int smu_hw_init(void *handle)
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
struct smu_context *smu = adev->powerplay.pp_handle;
- if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev)) {
- smu->pm_enabled = false;
+ if (!smu->pm_enabled)
return 0;
- }
ret = smu_start_smc_engine(smu);
if (ret) {
@@ -1274,9 +1273,6 @@ static int smu_hw_init(void *handle)
smu_set_gfx_cgpg(smu, true);
}
- if (!smu->pm_enabled)
- return 0;
-
/* get boot_values from vbios to set revision, gfxclk, and etc. */
ret = smu_get_vbios_bootup_values(smu);
if (ret) {
@@ -1428,7 +1424,7 @@ static int smu_hw_fini(void *handle)
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
struct smu_context *smu = adev->powerplay.pp_handle;
- if (amdgpu_sriov_vf(adev)&& !amdgpu_sriov_is_pp_one_vf(adev))
+ if (!smu->pm_enabled)
return 0;
smu_dpm_set_vcn_enable(smu, false);
@@ -1437,9 +1433,6 @@ static int smu_hw_fini(void *handle)
adev->vcn.cur_state = AMD_PG_STATE_GATE;
adev->jpeg.cur_state = AMD_PG_STATE_GATE;
- if (!smu->pm_enabled)
- return 0;
-
adev->pm.dpm_enabled = false;
return smu_smc_hw_cleanup(smu);
@@ -1479,9 +1472,6 @@ static int smu_suspend(void *handle)
struct smu_context *smu = adev->powerplay.pp_handle;
int ret;
- if (amdgpu_sriov_vf(adev)&& !amdgpu_sriov_is_pp_one_vf(adev))
- return 0;
-
if (!smu->pm_enabled)
return 0;
@@ -1504,9 +1494,6 @@ static int smu_resume(void *handle)
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
struct smu_context *smu = adev->powerplay.pp_handle;
- if (amdgpu_sriov_vf(adev)&& !amdgpu_sriov_is_pp_one_vf(adev))
- return 0;
-
if (!smu->pm_enabled)
return 0;
--
2.29.0
next prev parent reply other threads:[~2022-02-11 7:52 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-11 7:51 [PATCH 01/12] drm/amd/pm: drop unused structure members Evan Quan
2022-02-11 7:51 ` [PATCH 02/12] drm/amd/pm: drop unused interfaces Evan Quan
2022-02-11 7:52 ` [PATCH 03/12] drm/amd/pm: drop unneeded !smu->pm_enabled check Evan Quan
2022-02-11 7:52 ` [PATCH 04/12] drm/amd/pm: use adev->pm.dpm_enabled for dpm enablement check Evan Quan
2022-02-11 7:52 ` [PATCH 05/12] drm/amd/pm: move the check for dpm enablement to amdgpu_dpm.c Evan Quan
2022-02-11 8:06 ` Chen, Guchun
2022-02-17 1:53 ` Quan, Evan
2022-02-11 13:39 ` Lazar, Lijo
2022-02-17 2:35 ` Quan, Evan
2022-02-17 4:55 ` Lazar, Lijo
2022-02-11 7:52 ` Evan Quan [this message]
2022-02-11 7:52 ` [PATCH 07/12] drm/amd/pm: correct the checks for granting gpu reset APIs Evan Quan
2022-02-14 4:04 ` Lazar, Lijo
2022-02-17 2:48 ` Quan, Evan
2022-02-17 5:00 ` Lazar, Lijo
2022-02-11 7:52 ` [PATCH 08/12] drm/amd/pm: add proper check for amdgpu_dpm before granting pp_dpm_load_fw Evan Quan
2022-02-11 7:52 ` [PATCH 09/12] drm/amd/pm: drop redundant !pp_funcs check Evan Quan
2022-02-11 7:52 ` [PATCH 10/12] drm/amd/pm: drop nonsense !smu->ppt_funcs check Evan Quan
2022-02-11 7:52 ` [PATCH 11/12] drm/amd/pm: drop extra non-necessary null pointers checks Evan Quan
2022-02-11 7:52 ` [PATCH 12/12] drm/amd/pm: revise the implementations for asic reset Evan Quan
2022-02-11 13:21 ` Lazar, Lijo
2022-02-17 2:53 ` Quan, Evan
2022-02-11 7:55 ` [PATCH 01/12] drm/amd/pm: drop unused structure members Christian König
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=20220211075209.894833-6-evan.quan@amd.com \
--to=evan.quan@amd.com \
--cc=Alexander.Deucher@amd.com \
--cc=Lijo.Lazar@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=rui.huang@amd.com \
/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: link
Be 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