Commit 8baaadba authored by Le Ma's avatar Le Ma Committed by Alex Deucher

drm/amdgpu: clear UVD VCPU buffer when err_event_athub generated

The err_event_athub error will mess up the buffer and cause UVD resume hang.
Signed-off-by: default avatarLe Ma <le.ma@amd.com>
Reviewed-by: default avatarHawking Zhang <hawking.zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b4def374
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
#include "cikd.h" #include "cikd.h"
#include "uvd/uvd_4_2_d.h" #include "uvd/uvd_4_2_d.h"
#include "amdgpu_ras.h"
/* 1 second timeout */ /* 1 second timeout */
#define UVD_IDLE_TIMEOUT msecs_to_jiffies(1000) #define UVD_IDLE_TIMEOUT msecs_to_jiffies(1000)
...@@ -372,8 +374,14 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev) ...@@ -372,8 +374,14 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev)
if (!adev->uvd.inst[j].saved_bo) if (!adev->uvd.inst[j].saved_bo)
return -ENOMEM; return -ENOMEM;
/* re-write 0 since err_event_athub will corrupt VCPU buffer */
if (amdgpu_ras_intr_triggered()) {
DRM_WARN("UVD VCPU state may lost due to RAS ERREVENT_ATHUB_INTERRUPT\n");
memset(adev->uvd.inst[j].saved_bo, 0, size);
} else {
memcpy_fromio(adev->uvd.inst[j].saved_bo, ptr, size); memcpy_fromio(adev->uvd.inst[j].saved_bo, ptr, size);
} }
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment