[PATCH] drm/amd/amdgpu: fix Tonga S3 resume hang on rhel6.8

Huang Rui ray.huang at amd.com
Tue Mar 28 10:27:53 UTC 2017


On Tue, Mar 28, 2017 at 05:27:54PM +0800, Jim Qu wrote:
> 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.
> 
> Change-Id: I13977c60314ffe976924b1fdad1ab10df5d93c82
> Signed-off-by: Jim Qu <Jim.Qu at amd.com>

Yes, since smu_init is moved to sw_init, we won't meet to request firmware
two times yet.

Acked-by: Huang Rui <ray.huang at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
> index d6cbdbe..a1a2d44 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:
> -- 
> 1.9.1
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx


More information about the amd-gfx mailing list