Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amdgpu: Ignore the not supported error from psp
As the VCN firmware will not use
vf vmr now. And new psp policy won't support set tmr
now.
For driver compatible issue, ignore the not support error.
Signed-off-by: Emily Deng <Emily.Deng@amd.com>
Reviewed-by: Monk Liu <monk.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
authored by
Emily Deng
and committed by
Alex Deucher
d73cd701
6bc8cdde
+5
-1
+5
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+5
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
···
201
201
int index;
202
202
int timeout = 2000;
203
203
bool ras_intr = false;
204
+
bool skip_unsupport = false;
204
205
205
206
mutex_lock(&psp->mutex);
206
207
···
233
232
amdgpu_asic_invalidate_hdp(psp->adev, NULL);
234
233
}
235
234
235
+
/* We allow TEE_ERROR_NOT_SUPPORTED for VMR command in SRIOV */
236
+
skip_unsupport = (psp->cmd_buf_mem->resp.status == 0xffff000a) && amdgpu_sriov_vf(psp->adev);
237
+
236
238
/* In some cases, psp response status is not 0 even there is no
237
239
* problem while the command is submitted. Some version of PSP FW
238
240
* doesn't write 0 to that field.
···
243
239
* during psp initialization to avoid breaking hw_init and it doesn't
244
240
* return -EINVAL.
245
241
*/
246
-
if ((psp->cmd_buf_mem->resp.status || !timeout) && !ras_intr) {
242
+
if (!skip_unsupport && (psp->cmd_buf_mem->resp.status || !timeout) && !ras_intr) {
247
243
if (ucode)
248
244
DRM_WARN("failed to load ucode id (%d) ",
249
245
ucode->ucode_id);