drm/amdgpu: move preamble IB handling into common code
This fixes the handling which was completely broken when you
ad more than one preamble IB.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index f670519..d6f8592 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -125,6 +125,7 @@
struct fence *hwf;
struct amdgpu_vm *vm = NULL;
unsigned i, patch_offset = ~0;
+ bool skip_preamble;
int r = 0;
@@ -172,9 +173,14 @@
/* always set cond_exec_polling to CONTINUE */
*ring->cond_exe_cpu_addr = 1;
+ skip_preamble = ring->current_ctx == ctx;
old_ctx = ring->current_ctx;
for (i = 0; i < num_ibs; ++i) {
- ib = &ibs[i];
+
+ /* drop preamble IBs if we don't have a context switch */
+ if ((ib->flags & AMDGPU_IB_FLAG_PREAMBLE) && skip_preamble)
+ continue;
+
amdgpu_ring_emit_ib(ring, ib);
ring->current_ctx = ctx;
}