Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 454bbbf9 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: use adev->firmware to determine whether to load the PSP module 



The per device firmware load method is limited to what makes sense for
that asic rather than whatever arbitrary value may have been set by the
user.

Reviewed-by: default avatarRex Zhu <rezhu@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 19aede77

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

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) 
		amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);

		amdgpu_device_ip_block_add(adev, &gmc_v9_0_ip_block);

		amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);

		if (amdgpu_fw_load_type == 2 || amdgpu_fw_load_type == -1)

		if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)

			amdgpu_device_ip_block_add(adev, &psp_v3_1_ip_block);

		if (!amdgpu_sriov_vf(adev))

			amdgpu_device_ip_block_add(adev, &amdgpu_pp_ip_block);