drm/radeon: improve GPU lockup debugging info on r6xx/r7xx/r8xx/r9xx

Print various CP register that have valuable informations regarding
GPU lockup.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index c5b2e9069362..e2dee80e27dc 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -1289,6 +1289,14 @@ int r600_gpu_soft_reset(struct radeon_device *rdev)
                 RREG32(R_008014_GRBM_STATUS2));
         dev_info(rdev->dev, "  R_000E50_SRBM_STATUS=0x%08X\n",
                 RREG32(R_000E50_SRBM_STATUS));
+        dev_info(rdev->dev, "  R_008674_CP_STALLED_STAT1 = 0x%08X\n",
+                RREG32(CP_STALLED_STAT1));
+        dev_info(rdev->dev, "  R_008678_CP_STALLED_STAT2 = 0x%08X\n",
+                RREG32(CP_STALLED_STAT2));
+        dev_info(rdev->dev, "  R_00867C_CP_BUSY_STAT     = 0x%08X\n",
+                RREG32(CP_BUSY_STAT));
+        dev_info(rdev->dev, "  R_008680_CP_STAT          = 0x%08X\n",
+                RREG32(CP_STAT));
         rv515_mc_stop(rdev, &save);
         if (r600_mc_wait_for_idle(rdev)) {
                 dev_warn(rdev->dev, "Wait for MC idle timedout !\n");
@@ -1332,6 +1340,14 @@ int r600_gpu_soft_reset(struct radeon_device *rdev)
                 RREG32(R_008014_GRBM_STATUS2));
         dev_info(rdev->dev, "  R_000E50_SRBM_STATUS=0x%08X\n",
                 RREG32(R_000E50_SRBM_STATUS));
+        dev_info(rdev->dev, "  R_008674_CP_STALLED_STAT1 = 0x%08X\n",
+                RREG32(CP_STALLED_STAT1));
+        dev_info(rdev->dev, "  R_008678_CP_STALLED_STAT2 = 0x%08X\n",
+                RREG32(CP_STALLED_STAT2));
+        dev_info(rdev->dev, "  R_00867C_CP_BUSY_STAT     = 0x%08X\n",
+                RREG32(CP_BUSY_STAT));
+        dev_info(rdev->dev, "  R_008680_CP_STAT          = 0x%08X\n",
+                RREG32(CP_STAT));
         rv515_mc_resume(rdev, &save);
         return 0;
 }