From: Mario Limonciello Date: Tue, 18 Jun 2024 16:43:05 +0000 (-0500) Subject: drm/amd: Don't initialize ISP hardware without FW X-Git-Tag: v6.11-rc1~141^2~8^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15eb8573ad72a97b8f70e3c88b9bef6ddc861f77;p=thirdparty%2Fkernel%2Flinux.git 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. Acked-by: Alex Deucher Reviewed-by: Pratap Nirujogi Signed-off-by: Mario Limonciello Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c index 215bae8091535..4766e99dd98fb 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;