drm/amdgpu: Add H/W agnostic amdgpu <--> amdkfd interface

[karo-tx-linux.git] / drivers / gpu / drm / amd / amdgpu / cik.c

diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 341c566818419317a0c3d16a3d5b738840e30b46..b3b66a0d5ff7ce2d6f3fa36ae7b2cdb25cb468b8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -64,6 +64,8 @@
 #include "oss/oss_2_0_d.h"
 #include "oss/oss_2_0_sh_mask.h"
 
+#include "amdgpu_amdkfd.h"
+
 /*
  * Indirect registers accessor
  */
@@ -2448,14 +2450,21 @@ static int cik_common_suspend(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+       amdgpu_amdkfd_suspend(adev);
+
        return cik_common_hw_fini(adev);
 }
 
 static int cik_common_resume(void *handle)
 {
+       int r;
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-       return cik_common_hw_init(adev);
+       r = cik_common_hw_init(adev);
+       if (r)
+               return r;
+
+       return amdgpu_amdkfd_resume(adev);
 }
 
 static bool cik_common_is_idle(void *handle)