aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
diff options
context:
space:
mode:
authorHuang Rui <ray.huang@amd.com>2017-07-04 04:14:06 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-07-14 11:06:13 -0400
commit342169c42214bd7682f550eccae119e85f09006c (patch)
tree92e6a9e60fd8e040689e4cccc064d1477ebba14a /drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
parenta1952da73f8951eeb6e99e2b4fd1b8680ed9d801 (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index 17a935df8e1d..fcfb9d4f7477 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -275,14 +275,10 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
275 else 275 else
276 return AMDGPU_FW_LOAD_PSP; 276 return AMDGPU_FW_LOAD_PSP;
277 case CHIP_RAVEN: 277 case CHIP_RAVEN:
278#if 0 278 if (load_type != 2)
279 if (!load_type)
280 return AMDGPU_FW_LOAD_DIRECT; 279 return AMDGPU_FW_LOAD_DIRECT;
281 else 280 else
282 return AMDGPU_FW_LOAD_PSP; 281 return AMDGPU_FW_LOAD_PSP;
283#else
284 return AMDGPU_FW_LOAD_DIRECT;
285#endif
286 default: 282 default:
287 DRM_ERROR("Unknow firmware load type\n"); 283 DRM_ERROR("Unknow firmware load type\n");
288 } 284 }