瀏覽代碼

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

- v2: share code with CHIP_VEGA10 case

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Evan Quan 8 年之前
父節點
當前提交
50811c71fa
共有 2 個文件被更改,包括 1 次插入7 次删除
  1. 0 2
      drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
  2. 1 5
      drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c

+ 0 - 2
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

@@ -64,9 +64,7 @@ static int psp_sw_init(void *handle)
 		psp->smu_reload_quirk = psp_v3_1_smu_reload_quirk;
 		psp->smu_reload_quirk = psp_v3_1_smu_reload_quirk;
 		break;
 		break;
 	case CHIP_RAVEN:
 	case CHIP_RAVEN:
-#if 0
 		psp->init_microcode = psp_v10_0_init_microcode;
 		psp->init_microcode = psp_v10_0_init_microcode;
-#endif
 		psp->prep_cmd_buf = psp_v10_0_prep_cmd_buf;
 		psp->prep_cmd_buf = psp_v10_0_prep_cmd_buf;
 		psp->ring_init = psp_v10_0_ring_init;
 		psp->ring_init = psp_v10_0_ring_init;
 		psp->ring_create = psp_v10_0_ring_create;
 		psp->ring_create = psp_v10_0_ring_create;

+ 1 - 5
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c

@@ -270,12 +270,8 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
 		else
 		else
 			return AMDGPU_FW_LOAD_SMU;
 			return AMDGPU_FW_LOAD_SMU;
 	case CHIP_VEGA10:
 	case CHIP_VEGA10:
-		if (!load_type)
-			return AMDGPU_FW_LOAD_DIRECT;
-		else
-			return AMDGPU_FW_LOAD_PSP;
 	case CHIP_RAVEN:
 	case CHIP_RAVEN:
-		if (load_type != 2)
+		if (!load_type)
 			return AMDGPU_FW_LOAD_DIRECT;
 			return AMDGPU_FW_LOAD_DIRECT;
 		else
 		else
 			return AMDGPU_FW_LOAD_PSP;
 			return AMDGPU_FW_LOAD_PSP;