Browse Source

drm/amdgpu: set firmware loading type as direct by default for raven

In previous case, driver can't enable psp via the kernel parameter for raven.
We should open this path and set it as direct by default till psp firmware
loading is workable.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Huang Rui 8 years ago
parent
commit
342169c422
1 changed files with 1 additions and 5 deletions
  1. 1 5
      drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c

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

@@ -275,14 +275,10 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
 		else
 		else
 			return AMDGPU_FW_LOAD_PSP;
 			return AMDGPU_FW_LOAD_PSP;
 	case CHIP_RAVEN:
 	case CHIP_RAVEN:
-#if 0
-		if (!load_type)
+		if (load_type != 2)
 			return AMDGPU_FW_LOAD_DIRECT;
 			return AMDGPU_FW_LOAD_DIRECT;
 		else
 		else
 			return AMDGPU_FW_LOAD_PSP;
 			return AMDGPU_FW_LOAD_PSP;
-#else
-		return AMDGPU_FW_LOAD_DIRECT;
-#endif
 	default:
 	default:
 		DRM_ERROR("Unknow firmware load type\n");
 		DRM_ERROR("Unknow firmware load type\n");
 	}
 	}