From: Jim Qu Date: Tue, 28 Mar 2017 09:18:15 +0000 (+0800) Subject: drm/amd/amdgpu: fix Tonga S3 resume hang on rhel6.8 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bd7d7acf55c6e89f4653e1bfd8be6578d4f6a46b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drm/amd/amdgpu: fix Tonga S3 resume hang on rhel6.8 1. security firmware loading has moved to sw init, so this code is useless. 2. it seems that driver could not call request_firmware on kernel 2.6, when S3 resume. for request firmware depends on userspace, at this time, userspace is freeze. Signed-off-by: Jim Qu Acked-by: Huang Rui Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c index 5e090904adde..1c7e6c28f93a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c @@ -840,9 +840,6 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, const struct common_firmware_header *header; struct amdgpu_firmware_info *ucode = NULL; - if (CGS_UCODE_ID_SMU_SK == type) - amdgpu_cgs_rel_firmware(cgs_device, CGS_UCODE_ID_SMU); - if (!adev->pm.fw) { switch (adev->asic_type) { case CHIP_TOPAZ: