diff options
author | Tom St Denis <tom.stdenis@amd.com> | 2016-03-28 08:21:52 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-05-04 20:30:06 -0400 |
commit | 16a7989ac62a4d491d44a295577a7e75b7e3b0bb (patch) | |
tree | eddfbeec7e6ad3f51b271b4c31340d5286797b93 /drivers/gpu/drm/amd/amdgpu/cik_ih.c | |
parent | a72d5604ead32d282fefbc018ca63a3bf878e2c2 (diff) |
drm/amd/amdgpu: Drop print_status callbacks.
First patch in series to move to user mode
debug tools we're removing the print_status callbacks.
These functions were unused at the moment anyway.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cik_ih.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik_ih.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_ih.c b/drivers/gpu/drm/amd/amdgpu/cik_ih.c index 30c9b3beeef9..f2f14fe26784 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_ih.c | |||
@@ -372,35 +372,6 @@ static int cik_ih_wait_for_idle(void *handle) | |||
372 | return -ETIMEDOUT; | 372 | return -ETIMEDOUT; |
373 | } | 373 | } |
374 | 374 | ||
375 | static void cik_ih_print_status(void *handle) | ||
376 | { | ||
377 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; | ||
378 | |||
379 | dev_info(adev->dev, "CIK IH registers\n"); | ||
380 | dev_info(adev->dev, " SRBM_STATUS=0x%08X\n", | ||
381 | RREG32(mmSRBM_STATUS)); | ||
382 | dev_info(adev->dev, " SRBM_STATUS2=0x%08X\n", | ||
383 | RREG32(mmSRBM_STATUS2)); | ||
384 | dev_info(adev->dev, " INTERRUPT_CNTL=0x%08X\n", | ||
385 | RREG32(mmINTERRUPT_CNTL)); | ||
386 | dev_info(adev->dev, " INTERRUPT_CNTL2=0x%08X\n", | ||
387 | RREG32(mmINTERRUPT_CNTL2)); | ||
388 | dev_info(adev->dev, " IH_CNTL=0x%08X\n", | ||
389 | RREG32(mmIH_CNTL)); | ||
390 | dev_info(adev->dev, " IH_RB_CNTL=0x%08X\n", | ||
391 | RREG32(mmIH_RB_CNTL)); | ||
392 | dev_info(adev->dev, " IH_RB_BASE=0x%08X\n", | ||
393 | RREG32(mmIH_RB_BASE)); | ||
394 | dev_info(adev->dev, " IH_RB_WPTR_ADDR_LO=0x%08X\n", | ||
395 | RREG32(mmIH_RB_WPTR_ADDR_LO)); | ||
396 | dev_info(adev->dev, " IH_RB_WPTR_ADDR_HI=0x%08X\n", | ||
397 | RREG32(mmIH_RB_WPTR_ADDR_HI)); | ||
398 | dev_info(adev->dev, " IH_RB_RPTR=0x%08X\n", | ||
399 | RREG32(mmIH_RB_RPTR)); | ||
400 | dev_info(adev->dev, " IH_RB_WPTR=0x%08X\n", | ||
401 | RREG32(mmIH_RB_WPTR)); | ||
402 | } | ||
403 | |||
404 | static int cik_ih_soft_reset(void *handle) | 375 | static int cik_ih_soft_reset(void *handle) |
405 | { | 376 | { |
406 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; | 377 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; |
@@ -412,8 +383,6 @@ static int cik_ih_soft_reset(void *handle) | |||
412 | srbm_soft_reset |= SRBM_SOFT_RESET__SOFT_RESET_IH_MASK; | 383 | srbm_soft_reset |= SRBM_SOFT_RESET__SOFT_RESET_IH_MASK; |
413 | 384 | ||
414 | if (srbm_soft_reset) { | 385 | if (srbm_soft_reset) { |
415 | cik_ih_print_status((void *)adev); | ||
416 | |||
417 | tmp = RREG32(mmSRBM_SOFT_RESET); | 386 | tmp = RREG32(mmSRBM_SOFT_RESET); |
418 | tmp |= srbm_soft_reset; | 387 | tmp |= srbm_soft_reset; |
419 | dev_info(adev->dev, "SRBM_SOFT_RESET=0x%08X\n", tmp); | 388 | dev_info(adev->dev, "SRBM_SOFT_RESET=0x%08X\n", tmp); |
@@ -428,8 +397,6 @@ static int cik_ih_soft_reset(void *handle) | |||
428 | 397 | ||
429 | /* Wait a little for things to settle down */ | 398 | /* Wait a little for things to settle down */ |
430 | udelay(50); | 399 | udelay(50); |
431 | |||
432 | cik_ih_print_status((void *)adev); | ||
433 | } | 400 | } |
434 | 401 | ||
435 | return 0; | 402 | return 0; |
@@ -459,7 +426,6 @@ const struct amd_ip_funcs cik_ih_ip_funcs = { | |||
459 | .is_idle = cik_ih_is_idle, | 426 | .is_idle = cik_ih_is_idle, |
460 | .wait_for_idle = cik_ih_wait_for_idle, | 427 | .wait_for_idle = cik_ih_wait_for_idle, |
461 | .soft_reset = cik_ih_soft_reset, | 428 | .soft_reset = cik_ih_soft_reset, |
462 | .print_status = cik_ih_print_status, | ||
463 | .set_clockgating_state = cik_ih_set_clockgating_state, | 429 | .set_clockgating_state = cik_ih_set_clockgating_state, |
464 | .set_powergating_state = cik_ih_set_powergating_state, | 430 | .set_powergating_state = cik_ih_set_powergating_state, |
465 | }; | 431 | }; |