Skip to content

Commit

Permalink
drm/amd/amdgpu: compute ring test fail during S4 on CI
Browse files Browse the repository at this point in the history
unhalt Instrction Fetch Unit after all rings are inited.

Signed-off-by: JimQu <Jim.Qu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
  • Loading branch information
jimqu authored and Alex Deucher committed Aug 31, 2016
1 parent 10ea943 commit 53960b4
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
Original file line number Diff line number Diff line change
Expand Up @@ -2755,8 +2755,7 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev)
u64 wb_gpu_addr;
u32 *buf;
struct bonaire_mqd *mqd;

gfx_v7_0_cp_compute_enable(adev, true);
struct amdgpu_ring *ring;

/* fix up chicken bits */
tmp = RREG32(mmCP_CPF_DEBUG);
Expand Down Expand Up @@ -2791,7 +2790,7 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev)

/* init the queues. Just two for now. */
for (i = 0; i < adev->gfx.num_compute_rings; i++) {
struct amdgpu_ring *ring = &adev->gfx.compute_ring[i];
ring = &adev->gfx.compute_ring[i];

if (ring->mqd_obj == NULL) {
r = amdgpu_bo_create(adev,
Expand Down Expand Up @@ -2970,6 +2969,13 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev)
amdgpu_bo_unreserve(ring->mqd_obj);

ring->ready = true;
}

gfx_v7_0_cp_compute_enable(adev, true);

for (i = 0; i < adev->gfx.num_compute_rings; i++) {
ring = &adev->gfx.compute_ring[i];

r = amdgpu_ring_test_ring(ring);
if (r)
ring->ready = false;
Expand Down

0 comments on commit 53960b4

Please sign in to comment.