Commit 50811c71 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amdgpu: enable raven to load firmwares by psp at default (v2) 



- v2: share code with CHIP_VEGA10 case

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bcd6eab8

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

+0 −2
Original line number Diff line number Diff line
@@ -64,9 +64,7 @@ static int psp_sw_init(void *handle) 
		psp->smu_reload_quirk = psp_v3_1_smu_reload_quirk;

		break;

	case CHIP_RAVEN:

#if 0

		psp->init_microcode = psp_v10_0_init_microcode;

#endif

		psp->prep_cmd_buf = psp_v10_0_prep_cmd_buf;

		psp->ring_init = psp_v10_0_ring_init;

		psp->ring_create = psp_v10_0_ring_create;

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

+1 −5
Original line number Diff line number Diff line
@@ -270,12 +270,8 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type) 
		else

			return AMDGPU_FW_LOAD_SMU;

	case CHIP_VEGA10:

		if (!load_type)

			return AMDGPU_FW_LOAD_DIRECT;

		else

			return AMDGPU_FW_LOAD_PSP;

	case CHIP_RAVEN:

		if (load_type != 2)

		if (!load_type)

			return AMDGPU_FW_LOAD_DIRECT;

		else

			return AMDGPU_FW_LOAD_PSP;

CRA Git | Maintained and supported by SUSTech CRA and CCSE