[AMD Official Use Only - AMD Internal Distribution Only]
LGTM, thank you.
-----Original Message-----
From: Limonciello, Mario <Mario.Limonciello@xxxxxxx>
Sent: Tuesday, June 18, 2024 12:43 PM
To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx
Cc: Nirujogi, Pratap <Pratap.Nirujogi@xxxxxxx>; Limonciello, Mario <Mario.Limonciello@xxxxxxx>
Subject: [PATCH] drm/amd: Don't initialize ISP hardware without FW
Although designs may contain an ISP IP block, the camera might be a USB camera. Because of this the ISP firmware is considered optional from amdgpu. However if the firmware doesn't get loaded the hardware should not be initialized.
Adjust the return code for early init to ensure the IP block doesn't go through the other init and fini sequences. Also decrease the message about firmware load failure to debug so it's not as alarming to users.
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
Reviewed-by: Pratap Nirujogi <pratap.nirujogi@xxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c
index 215bae809153..4766e99dd98f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c
@@ -142,8 +142,8 @@ static int isp_early_init(void *handle)
isp->parent = adev->dev;
if (isp_load_fw_by_psp(adev)) {
- DRM_WARN("%s: isp fw load failed\n", __func__);
- return 0;
+ DRM_DEBUG_DRIVER("%s: isp fw load failed\n", __func__);
+ return -ENOENT;
}
return 0;
--
2.34.1
