AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
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 01/16] drm/amdgpu: validate sw_init before function call
Date: Wed, 16 Oct 2024 12:52:43 +0530	[thread overview]
Message-ID: <20241016072258.1399698-2-sunil.khatri@amd.com> (raw)
In-Reply-To: <20241016072258.1399698-1-sunil.khatri@amd.com>

Before making a function call to sw_init, validate
the function pointer like we do in late_init.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 38a7423101f3..782f01ab39e2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2851,11 +2851,13 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
 	for (i = 0; i < adev->num_ip_blocks; i++) {
 		if (!adev->ip_blocks[i].status.valid)
 			continue;
-		r = adev->ip_blocks[i].version->funcs->sw_init(&adev->ip_blocks[i]);
-		if (r) {
-			DRM_ERROR("sw_init of IP block <%s> failed %d\n",
+		if (adev->ip_blocks[i].version->funcs->sw_init) {
+			r = adev->ip_blocks[i].version->funcs->sw_init(&adev->ip_blocks[i]);
+			if (r) {
+				DRM_ERROR("sw_init of IP block <%s> failed %d\n",
 				  adev->ip_blocks[i].version->funcs->name, r);
-			goto init_failed;
+				goto init_failed;
+			}
 		}
 		adev->ip_blocks[i].status.sw = true;
 
-- 
2.34.1


  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 ` Sunil Khatri [this message]
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 ` [PATCH v3 06/16] drm/amdgpu: validate suspend " Sunil Khatri
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-2-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