From: Sunil Khatri <sunil.khatri@amd.com>
To: "Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>
Cc: amd-gfx@lists.freedesktop.org, Sunil Khatri <sunil.khatri@amd.com>
Subject: [PATCH v3 06/16] drm/amdgpu: validate suspend before function call
Date: Wed, 16 Oct 2024 12:52:48 +0530 [thread overview]
Message-ID: <20241016072258.1399698-7-sunil.khatri@amd.com> (raw)
In-Reply-To: <20241016072258.1399698-1-sunil.khatri@amd.com>
Before making a function call to suspend, validate
the function pointer like we do in sw_init.
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 340141a74c12..51607ac8adb9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3471,12 +3471,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;
@@ -3553,11 +3555,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;
}
--
2.34.1
next prev parent reply other threads:[~2024-10-16 7:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-16 7:22 [PATCH v3 00/16] clean unused functions of amd_ip_funcs Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 01/16] drm/amdgpu: validate sw_init before function call Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 02/16] drm/amdgpu: clean the dummy sw_init functions Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 03/16] drm/amdgpu: validate sw_fini before function call Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 04/16] drm/amdgpu: clean the dummy sw_fini functions Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 05/16] drm/amdgpu: validate hw_fini before function call Sunil Khatri
2024-10-16 7:22 ` Sunil Khatri [this message]
2024-10-16 7:22 ` [PATCH v3 07/16] drm/amdgpu: validate resume " Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 08/16] drm/amdgpu: validate wait_for_idle " Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 09/16] drm/amdgpu: clean the dummy resume functions Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 10/16] drm/amdgpu: clean the dummy suspend functions Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 11/16] drm/amdgpu: clean the dummy hw_fini functions Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 12/16] drm/amdgpu: clean the dummy wait_for_idle functions Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 13/16] drm/amdgpu: clean the dummy soft_reset functions Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 14/16] drm/amdgpu: clean unused functions of amd_ip_funcs Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 15/16] drm/amdgpu: validate get_clockgating_state before use Sunil Khatri
2024-10-16 7:22 ` [PATCH v3 16/16] drm/amdgpu: validate hw_init function pointers Sunil Khatri
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=20241016072258.1399698-7-sunil.khatri@amd.com \
--to=sunil.khatri@amd.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@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