diff options
author | Huang Rui <ray.huang@amd.com> | 2017-06-05 10:11:59 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-06-15 11:50:25 -0400 |
commit | ab4fe3e1f910a71aabf0b1c919c482d7ce9fc5c7 (patch) | |
tree | 0f4e31ed627a7bd53cae964fe79952b7989f3520 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 4f0955fcc052b556446f6f041ad8c83d70c3b253 (diff) |
drm/amdgpu: fix missed gpu info firmware when cache firmware during S3
gpu_info firmware is released after data is used. But when system enters into
suspend, upper class driver will cache all firmware names. At that time,
gpu_info will be failing to load. It seems an upper class issue, that we should
not release gpu_info firmware until device finished.
[ 903.236589] cache_firmware: amdgpu/vega10_sdma1.bin
[ 903.236590] fw_set_page_data: fw-amdgpu/vega10_sdma1.bin buf=ffff88041eee10c0 data=ffffc90002561000 size=17408
[ 903.236591] cache_firmware: amdgpu/vega10_sdma1.bin ret=0
[ 903.464160] __allocate_fw_buf: fw-amdgpu/vega10_gpu_info.bin buf=ffff88041eee2c00
[ 903.471815] (NULL device *): loading /lib/firmware/updates/4.11.0-custom/amdgpu/vega10_gpu_info.bin failed with error -2
[ 903.482870] (NULL device *): loading /lib/firmware/updates/amdgpu/vega10_gpu_info.bin failed with error -2
[ 903.492716] (NULL device *): loading /lib/firmware/4.11.0-custom/amdgpu/vega10_gpu_info.bin failed with error -2
[ 903.503156] (NULL device *): direct-loading amdgpu/vega10_gpu_info.bin
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index c26761f0e05e..fc7e8a36df04 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -1271,6 +1271,9 @@ struct amdgpu_firmware { | |||
1271 | const struct amdgpu_psp_funcs *funcs; | 1271 | const struct amdgpu_psp_funcs *funcs; |
1272 | struct amdgpu_bo *rbuf; | 1272 | struct amdgpu_bo *rbuf; |
1273 | struct mutex mutex; | 1273 | struct mutex mutex; |
1274 | |||
1275 | /* gpu info firmware data pointer */ | ||
1276 | const struct firmware *gpu_info_fw; | ||
1274 | }; | 1277 | }; |
1275 | 1278 | ||
1276 | /* | 1279 | /* |