diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c index e992bf2ff66c..72793f93e2fc 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | |||
@@ -5542,24 +5542,6 @@ const struct amd_ip_funcs gfx_v7_0_ip_funcs = { | |||
5542 | .set_powergating_state = gfx_v7_0_set_powergating_state, | 5542 | .set_powergating_state = gfx_v7_0_set_powergating_state, |
5543 | }; | 5543 | }; |
5544 | 5544 | ||
5545 | /** | ||
5546 | * gfx_v7_0_ring_is_lockup - check if the 3D engine is locked up | ||
5547 | * | ||
5548 | * @adev: amdgpu_device pointer | ||
5549 | * @ring: amdgpu_ring structure holding ring information | ||
5550 | * | ||
5551 | * Check if the 3D engine is locked up (CIK). | ||
5552 | * Returns true if the engine is locked, false if not. | ||
5553 | */ | ||
5554 | static bool gfx_v7_0_ring_is_lockup(struct amdgpu_ring *ring) | ||
5555 | { | ||
5556 | if (gfx_v7_0_is_idle(ring->adev)) { | ||
5557 | amdgpu_ring_lockup_update(ring); | ||
5558 | return false; | ||
5559 | } | ||
5560 | return amdgpu_ring_test_lockup(ring); | ||
5561 | } | ||
5562 | |||
5563 | static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_gfx = { | 5545 | static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_gfx = { |
5564 | .get_rptr = gfx_v7_0_ring_get_rptr_gfx, | 5546 | .get_rptr = gfx_v7_0_ring_get_rptr_gfx, |
5565 | .get_wptr = gfx_v7_0_ring_get_wptr_gfx, | 5547 | .get_wptr = gfx_v7_0_ring_get_wptr_gfx, |
@@ -5573,7 +5555,6 @@ static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_gfx = { | |||
5573 | .emit_hdp_flush = gfx_v7_0_ring_emit_hdp_flush, | 5555 | .emit_hdp_flush = gfx_v7_0_ring_emit_hdp_flush, |
5574 | .test_ring = gfx_v7_0_ring_test_ring, | 5556 | .test_ring = gfx_v7_0_ring_test_ring, |
5575 | .test_ib = gfx_v7_0_ring_test_ib, | 5557 | .test_ib = gfx_v7_0_ring_test_ib, |
5576 | .is_lockup = gfx_v7_0_ring_is_lockup, | ||
5577 | .insert_nop = amdgpu_ring_insert_nop, | 5558 | .insert_nop = amdgpu_ring_insert_nop, |
5578 | }; | 5559 | }; |
5579 | 5560 | ||
@@ -5590,7 +5571,6 @@ static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_compute = { | |||
5590 | .emit_hdp_flush = gfx_v7_0_ring_emit_hdp_flush, | 5571 | .emit_hdp_flush = gfx_v7_0_ring_emit_hdp_flush, |
5591 | .test_ring = gfx_v7_0_ring_test_ring, | 5572 | .test_ring = gfx_v7_0_ring_test_ring, |
5592 | .test_ib = gfx_v7_0_ring_test_ib, | 5573 | .test_ib = gfx_v7_0_ring_test_ib, |
5593 | .is_lockup = gfx_v7_0_ring_is_lockup, | ||
5594 | .insert_nop = amdgpu_ring_insert_nop, | 5574 | .insert_nop = amdgpu_ring_insert_nop, |
5595 | }; | 5575 | }; |
5596 | 5576 | ||