[PATCH] drm/amdgpu: Added more hqd debug messages v2

[ozeng]

Dump register COMPUTE_PGM_RSRC1 and COMPUTE_PGM_RSRC2
in function kgd_hqd_dump

v2: Update HQD_N_REGS (the number of registers dumped)
accordingly

Change-Id: I8e007f5bcc095d3283b642791860dd072dd43b1c
Signed-off-by: Oak Zeng <Oak.Zeng at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 4 +++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
index 7732def..ceadfcfa 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
@@ -425,7 +425,7 @@ static int kgd_hqd_dump(struct kgd_dev *kgd,
 {
 	struct amdgpu_device *adev = get_amdgpu_device(kgd);
 	uint32_t i = 0, reg;
-#define HQD_N_REGS (35+4)
+#define HQD_N_REGS (35+6)
 #define DUMP_REG(addr) do {				\
 		if (WARN_ON_ONCE(i >= HQD_N_REGS))	\
 			break;				\
@@ -439,6 +439,8 @@ static int kgd_hqd_dump(struct kgd_dev *kgd,
 
 	acquire_queue(kgd, pipe_id, queue_id);
 
+	DUMP_REG(mmCOMPUTE_PGM_RSRC1);
+	DUMP_REG(mmCOMPUTE_PGM_RSRC2);
 	DUMP_REG(mmCOMPUTE_STATIC_THREAD_MGMT_SE0);
 	DUMP_REG(mmCOMPUTE_STATIC_THREAD_MGMT_SE1);
 	DUMP_REG(mmCOMPUTE_STATIC_THREAD_MGMT_SE2);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
index 289c188..cd4f604 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
@@ -419,7 +419,7 @@ static int kgd_hqd_dump(struct kgd_dev *kgd,
 {
 	struct amdgpu_device *adev = get_amdgpu_device(kgd);
 	uint32_t i = 0, reg;
-#define HQD_N_REGS (54+4)
+#define HQD_N_REGS (54+6)
 #define DUMP_REG(addr) do {				\
 		if (WARN_ON_ONCE(i >= HQD_N_REGS))	\
 			break;				\
@@ -433,6 +433,8 @@ static int kgd_hqd_dump(struct kgd_dev *kgd,
 
 	acquire_queue(kgd, pipe_id, queue_id);
 
+	DUMP_REG(mmCOMPUTE_PGM_RSRC1);
+	DUMP_REG(mmCOMPUTE_PGM_RSRC2);
 	DUMP_REG(mmCOMPUTE_STATIC_THREAD_MGMT_SE0);
 	DUMP_REG(mmCOMPUTE_STATIC_THREAD_MGMT_SE1);
 	DUMP_REG(mmCOMPUTE_STATIC_THREAD_MGMT_SE2);
-- 
2.7.4