--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -8596,6 +8596,11 @@
 	if (r)
 		return r;
 
+#ifndef CONFIG_X86
+	DRM_INFO("Resetting CP block to clear GPU load fault\n");
+	cik_gpu_soft_reset(rdev, RADEON_RESET_CP);
+#endif
+
 	rdev->accel_working = true;
 	r = cik_startup(rdev);
 	if (r) {