diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cik_sdma.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c index 814598e76c98..5f712ceddf08 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |||
@@ -1290,24 +1290,6 @@ const struct amd_ip_funcs cik_sdma_ip_funcs = { | |||
1290 | .set_powergating_state = cik_sdma_set_powergating_state, | 1290 | .set_powergating_state = cik_sdma_set_powergating_state, |
1291 | }; | 1291 | }; |
1292 | 1292 | ||
1293 | /** | ||
1294 | * cik_sdma_ring_is_lockup - Check if the DMA engine is locked up | ||
1295 | * | ||
1296 | * @ring: amdgpu_ring structure holding ring information | ||
1297 | * | ||
1298 | * Check if the async DMA engine is locked up (CIK). | ||
1299 | * Returns true if the engine appears to be locked up, false if not. | ||
1300 | */ | ||
1301 | static bool cik_sdma_ring_is_lockup(struct amdgpu_ring *ring) | ||
1302 | { | ||
1303 | |||
1304 | if (cik_sdma_is_idle(ring->adev)) { | ||
1305 | amdgpu_ring_lockup_update(ring); | ||
1306 | return false; | ||
1307 | } | ||
1308 | return amdgpu_ring_test_lockup(ring); | ||
1309 | } | ||
1310 | |||
1311 | static const struct amdgpu_ring_funcs cik_sdma_ring_funcs = { | 1293 | static const struct amdgpu_ring_funcs cik_sdma_ring_funcs = { |
1312 | .get_rptr = cik_sdma_ring_get_rptr, | 1294 | .get_rptr = cik_sdma_ring_get_rptr, |
1313 | .get_wptr = cik_sdma_ring_get_wptr, | 1295 | .get_wptr = cik_sdma_ring_get_wptr, |
@@ -1320,7 +1302,6 @@ static const struct amdgpu_ring_funcs cik_sdma_ring_funcs = { | |||
1320 | .emit_hdp_flush = cik_sdma_ring_emit_hdp_flush, | 1302 | .emit_hdp_flush = cik_sdma_ring_emit_hdp_flush, |
1321 | .test_ring = cik_sdma_ring_test_ring, | 1303 | .test_ring = cik_sdma_ring_test_ring, |
1322 | .test_ib = cik_sdma_ring_test_ib, | 1304 | .test_ib = cik_sdma_ring_test_ib, |
1323 | .is_lockup = cik_sdma_ring_is_lockup, | ||
1324 | .insert_nop = cik_sdma_ring_insert_nop, | 1305 | .insert_nop = cik_sdma_ring_insert_nop, |
1325 | }; | 1306 | }; |
1326 | 1307 | ||