Skip to content

Commit 15eb857

Browse files
superm1alexdeucher
authored andcommitted
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 <[email protected]> Reviewed-by: Pratap Nirujogi <[email protected]> Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 71fe449 commit 15eb857

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ static int isp_early_init(void *handle)
142142
isp->parent = adev->dev;
143143

144144
if (isp_load_fw_by_psp(adev)) {
145-
DRM_WARN("%s: isp fw load failed\n", __func__);
146-
return 0;
145+
DRM_DEBUG_DRIVER("%s: isp fw load failed\n", __func__);
146+
return -ENOENT;
147147
}
148148

149149
return 0;

0 commit comments

Comments
 (0)