From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: "Sunil Khatri" <sunil.khatri@amd.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>
Cc: amd-gfx@lists.freedesktop.org
Subject: Re: [PATCH v4 06/15] drm/amdgpu: validate suspend before function call
Date: Thu, 17 Oct 2024 13:54:36 +0200 [thread overview]
Message-ID: <a63b46ad-3c81-425b-a24f-6da7ded8bf45@gmail.com> (raw)
In-Reply-To: <20241017100615.1492144-7-sunil.khatri@amd.com>
Am 17.10.24 um 12:06 schrieb Sunil Khatri:
> Before making a function call to suspend, validate
> the function pointer like we do in sw_init.
Same comment as on patch #5, please add an amdgpu_ip_block_suspend()
function and just call it multiple times.
Regards,
Christian.
>
> Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/aldebaran.c | 15 ++++++------
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 ++++++++++++---------
> drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 12 ++++++----
> drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 15 ++++++------
> drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c | 15 ++++++------
> 5 files changed, 46 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/aldebaran.c b/drivers/gpu/drm/amd/amdgpu/aldebaran.c
> index c1ff24335a0c..e55d680d95ce 100644
> --- a/drivers/gpu/drm/amd/amdgpu/aldebaran.c
> +++ b/drivers/gpu/drm/amd/amdgpu/aldebaran.c
> @@ -85,13 +85,14 @@ static int aldebaran_mode2_suspend_ip(struct amdgpu_device *adev)
> AMD_IP_BLOCK_TYPE_SDMA))
> continue;
>
> - r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> -
> - if (r) {
> - dev_err(adev->dev,
> - "suspend of IP block <%s> failed %d\n",
> - adev->ip_blocks[i].version->funcs->name, r);
> - return r;
> + if (adev->ip_blocks[i].version->funcs->suspend) {
> + r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> + if (r) {
> + dev_err(adev->dev,
> + "suspend of IP block <%s> failed %d\n",
> + adev->ip_blocks[i].version->funcs->name, r);
> + return r;
> + }
> }
>
> adev->ip_blocks[i].status.hw = false;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 96cecd4a636b..fda89aeb4d1b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -3478,12 +3478,14 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev)
> continue;
>
> /* XXX handle errors */
> - r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> - /* XXX handle errors */
> - if (r) {
> - DRM_ERROR("suspend of IP block <%s> failed %d\n",
> - adev->ip_blocks[i].version->funcs->name, r);
> - return r;
> + if (adev->ip_blocks[i].version->funcs->suspend) {
> + r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> + /* XXX handle errors */
> + if (r) {
> + DRM_ERROR("suspend of IP block <%s> failed %d\n",
> + adev->ip_blocks[i].version->funcs->name, r);
> + return r;
> + }
> }
>
> adev->ip_blocks[i].status.hw = false;
> @@ -3560,11 +3562,13 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev)
> continue;
>
> /* XXX handle errors */
> - r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> - /* XXX handle errors */
> - if (r) {
> - DRM_ERROR("suspend of IP block <%s> failed %d\n",
> - adev->ip_blocks[i].version->funcs->name, r);
> + if (adev->ip_blocks[i].version->funcs->suspend) {
> + r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> + /* XXX handle errors */
> + if (r) {
> + DRM_ERROR("suspend of IP block <%s> failed %d\n",
> + adev->ip_blocks[i].version->funcs->name, r);
> + }
> }
> adev->ip_blocks[i].status.hw = false;
> /* handle putting the SMC in the appropriate state */
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
> index 3e2724590dbf..6bc75aa1c3b1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
> @@ -40,11 +40,13 @@ static int amdgpu_reset_xgmi_reset_on_init_suspend(struct amdgpu_device *adev)
> continue;
>
> /* XXX handle errors */
> - r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> - /* XXX handle errors */
> - if (r) {
> - dev_err(adev->dev, "suspend of IP block <%s> failed %d",
> - adev->ip_blocks[i].version->funcs->name, r);
> + if (adev->ip_blocks[i].version->funcs->suspend) {
> + r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> + /* XXX handle errors */
> + if (r) {
> + dev_err(adev->dev, "suspend of IP block <%s> failed %d",
> + adev->ip_blocks[i].version->funcs->name, r);
> + }
> }
> adev->ip_blocks[i].status.hw = false;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
> index 475b7df3a908..10dece12509f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
> @@ -81,13 +81,14 @@ static int sienna_cichlid_mode2_suspend_ip(struct amdgpu_device *adev)
> AMD_IP_BLOCK_TYPE_SDMA))
> continue;
>
> - r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> -
> - if (r) {
> - dev_err(adev->dev,
> - "suspend of IP block <%s> failed %d\n",
> - adev->ip_blocks[i].version->funcs->name, r);
> - return r;
> + if (adev->ip_blocks[i].version->funcs->suspend) {
> + r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> + if (r) {
> + dev_err(adev->dev,
> + "suspend of IP block <%s> failed %d\n",
> + adev->ip_blocks[i].version->funcs->name, r);
> + return r;
> + }
> }
> adev->ip_blocks[i].status.hw = false;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c b/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
> index 5ea9090b5040..ab049f0b4d39 100644
> --- a/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
> +++ b/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
> @@ -80,13 +80,14 @@ static int smu_v13_0_10_mode2_suspend_ip(struct amdgpu_device *adev)
> AMD_IP_BLOCK_TYPE_MES))
> continue;
>
> - r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> -
> - if (r) {
> - dev_err(adev->dev,
> - "suspend of IP block <%s> failed %d\n",
> - adev->ip_blocks[i].version->funcs->name, r);
> - return r;
> + if (adev->ip_blocks[i].version->funcs->suspend) {
> + r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> + if (r) {
> + dev_err(adev->dev,
> + "suspend of IP block <%s> failed %d\n",
> + adev->ip_blocks[i].version->funcs->name, r);
> + return r;
> + }
> }
> adev->ip_blocks[i].status.hw = false;
> }
next prev parent reply other threads:[~2024-10-17 11:54 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-17 10:06 [PATCH v4 00/15] validate/clean the functions of ip funcs Sunil Khatri
2024-10-17 10:06 ` [PATCH v4 01/15] drm/amdgpu: validate sw_init before function call Sunil Khatri
2024-10-17 10:06 ` [PATCH v4 02/15] drm/amdgpu: clean the dummy sw_init functions Sunil Khatri
2024-10-17 10:06 ` [PATCH v4 03/15] drm/amdgpu: validate sw_fini before function call Sunil Khatri
2024-10-17 10:06 ` [PATCH v4 04/15] drm/amdgpu: clean the dummy sw_fini functions Sunil Khatri
2024-10-17 10:06 ` [PATCH v4 05/15] drm/amdgpu: validate hw_fini before function call Sunil Khatri
2024-10-17 11:52 ` Christian König
2024-10-17 12:44 ` Khatri, Sunil
2024-10-17 10:06 ` [PATCH v4 06/15] drm/amdgpu: validate suspend " Sunil Khatri
2024-10-17 11:54 ` Christian König [this message]
2024-10-17 12:45 ` Khatri, Sunil
2024-10-17 10:06 ` [PATCH v4 07/15] drm/amdgpu: validate resume " Sunil Khatri
2024-10-17 11:55 ` Christian König
2024-10-17 12:46 ` Khatri, Sunil
2024-10-17 10:06 ` [PATCH v4 08/15] drm/amdgpu: validate wait_for_idle " Sunil Khatri
2024-10-17 10:06 ` [PATCH v4 09/15] drm/amdgpu: clean the dummy resume functions Sunil Khatri
2024-10-17 10:06 ` [PATCH v4 10/15] drm/amdgpu: clean the dummy suspend functions Sunil Khatri
2024-10-17 10:06 ` [PATCH v4 11/15] drm/amdgpu: clean the dummy hw_fini functions Sunil Khatri
2024-10-17 11:58 ` Christian König
2024-10-17 12:47 ` Khatri, Sunil
2024-10-17 10:06 ` [PATCH v4 12/15] drm/amdgpu: clean the dummy wait_for_idle functions Sunil Khatri
2024-10-17 10:06 ` [PATCH v4 13/15] drm/amdgpu: clean the dummy soft_reset functions Sunil Khatri
2024-10-17 10:06 ` [PATCH v4 14/15] drm/amdgpu: clean unused functions of amd_ip_funcs Sunil Khatri
2024-10-17 12:18 ` Christian König
2024-10-17 12:49 ` Khatri, Sunil
2024-10-17 10:06 ` [PATCH v4 15/15] drm/amdgpu: validate get_clockgating_state before use Sunil Khatri
2024-10-17 12:20 ` Christian König
2024-10-17 12:55 ` Khatri, Sunil
2024-10-17 13:15 ` Christian König
2024-10-17 12:23 ` [PATCH v4 00/15] validate/clean the functions of ip funcs Christian König
2024-10-17 12:57 ` Khatri, Sunil
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=a63b46ad-3c81-425b-a24f-6da7ded8bf45@gmail.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=sunil.khatri@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