Commit 2a4021cc authored by Peng Ju Zhou's avatar Peng Ju Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: Change IP init sequence to support PSP program IH_RB_CNTL on NV12 SRIOV 



To enable PSP program IH_RB_CNTL,
the PSP IP should be initialized before IH IP, otherwise,
it will hit psp NULL pointer.

Signed-off-by: default avatarPeng Ju Zhou <PengJu.Zhou@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 71330557

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

+7 −2
Original line number Diff line number Diff line
@@ -849,8 +849,13 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) 
	case CHIP_NAVI12:

		amdgpu_device_ip_block_add(adev, &nv_common_ip_block);

		amdgpu_device_ip_block_add(adev, &gmc_v10_0_ip_block);

		if (!amdgpu_sriov_vf(adev)) {

			amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);

			amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);

		} else {

			amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);

			amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);

		}

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

			amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);

		if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))