1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 51b5e977ca88..b8963b725dfa 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -32,6 +32,7 @@
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 #include "atom.h"
+#include "amdgpu_trace.h"
 
 #define AMDGPU_IB_TEST_TIMEOUT  msecs_to_jiffies(1000)
 
@@ -170,6 +171,10 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
              (amdgpu_sriov_vf(adev) && need_ctx_switch) ||
              amdgpu_vm_need_pipeline_sync(ring, job))) {
                 need_pipe_sync = true;
+
+                if (tmp)
+                        trace_amdgpu_ib_pipe_sync(job, tmp);
+
                 dma_fence_put(tmp);
         }
 
@@ -349,6 +354,14 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
                 if (!ring || !ring->ready)
                         continue;
 
+                /* skip IB tests for KIQ in general for the below reasons:
+                 * 1. We never submit IBs to the KIQ
+                 * 2. KIQ doesn't use the EOP interrupts,
+                 *    we use some other CP interrupt.
+                 */
+                if (ring->funcs->type == AMDGPU_RING_TYPE_KIQ)
+                        continue;
+
                 /* MM engine need more time */
                 if (ring->funcs->type == AMDGPU_RING_TYPE_UVD ||
                         ring->funcs->type == AMDGPU_RING_TYPE_VCE ||