]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: cond_exec only for schedule with a job
authorMonk Liu <Monk.Liu@amd.com>
Fri, 19 Jan 2018 11:06:31 +0000 (19:06 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 28 Feb 2018 19:18:04 +0000 (14:18 -0500)
issue:
under SR-IOV sometimes the iB test will fail on
gfx ring

fix:
with cond_exec inserted in RB the gfx engine would
skip part packets if RLCV issue PREEMPT on gfx engine
if gfx engine is prior to COND_EXEC packet, this is
okay for regular command from UMD, but for the ib test
since the whole dma format doesn't support PREEMPT
so must remove the COND_EXEC from it.

Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

index 8ea342dc6376039e70bb031844357b65d5c5ac65..7f2c314581d47714f4b1936298de19b9f4da18a5 100644 (file)
@@ -181,7 +181,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
                }
        }
 
-       if (ring->funcs->init_cond_exec)
+       if (job && ring->funcs->init_cond_exec)
                patch_offset = amdgpu_ring_init_cond_exec(ring);
 
 #ifdef CONFIG_X86_64