summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
diff options
context:
space:
mode:
authorJim Qu <Jim.Qu@amd.com>2017-03-28 17:18:15 +0800
committerAlex Deucher <alexander.deucher@amd.com>2017-03-29 23:55:49 -0400
commitbd7d7acf55c6e89f4653e1bfd8be6578d4f6a46b (patch)
tree0729e48f1b4db560dde0cd0d486d2f3e6548b73e /drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
parent7286366c30432f3476569b4e294029efb8ceec82 (diff)
downloadlinux-bd7d7acf55c6e89f4653e1bfd8be6578d4f6a46b.tar.gz
linux-bd7d7acf55c6e89f4653e1bfd8be6578d4f6a46b.tar.bz2
linux-bd7d7acf55c6e89f4653e1bfd8be6578d4f6a46b.zip
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 <Jim.Qu@amd.com> Acked-by: Huang Rui <ray.huang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c3
1 files changed, 0 insertions, 3 deletions
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: