[PATCH v3 1/2] drm/amdgpu: Polish SQ IH.

[Deucher, Alexander]

Series is:

Acked-by: Alex Deucher <alexander.deucher at amd.com>

________________________________
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> on behalf of Andrey Grodzovsky <andrey.grodzovsky at amd.com>
Sent: Wednesday, June 20, 2018 2:17:22 PM
To: amd-gfx at lists.freedesktop.org; ckoenig.leichtzumerken at gmail.com
Cc: Panariti, David; Haehnle, Nicolai; Grodzovsky, Andrey
Subject: [PATCH v3 1/2] drm/amdgpu: Polish SQ IH.

Switch to using reg fields defines istead of magic values.
Add SH_ID and PRIV fields reading for instr. and err cases.

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>
Acked-by: Christian König <christian.koenig at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 36 +++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 15e61e1..93904a7 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -6958,10 +6958,11 @@ static int gfx_v8_0_sq_irq(struct amdgpu_device *adev,
 {
         u8 enc, se_id;
         char type[20];
+       unsigned ih_data = entry->src_data[0];

-       /* Parse all fields according to SQ_INTERRUPT* registers */
-       enc = (entry->src_data[0] >> 26) & 0x3;
-       se_id = (entry->src_data[0] >> 24) & 0x3;
+
+       enc = REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_CMN, ENCODING);
+       se_id = REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_CMN, SE_ID);

         switch (enc) {
                 case 0:
@@ -6971,14 +6972,14 @@ static int gfx_v8_0_sq_irq(struct amdgpu_device *adev,
                                         "reg_timestamp %d, thread_trace_buff_full %d,"
                                         "wlt %d, thread_trace %d.\n",
                                         se_id,
-                                       (entry->src_data[0] >> 7) & 0x1,
-                                       (entry->src_data[0] >> 6) & 0x1,
-                                       (entry->src_data[0] >> 5) & 0x1,
-                                       (entry->src_data[0] >> 4) & 0x1,
-                                       (entry->src_data[0] >> 3) & 0x1,
-                                       (entry->src_data[0] >> 2) & 0x1,
-                                       (entry->src_data[0] >> 1) & 0x1,
-                                       entry->src_data[0] & 0x1
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_AUTO, IMMED_OVERFLOW),
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_AUTO, HOST_REG_OVERFLOW),
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_AUTO, HOST_CMD_OVERFLOW),
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_AUTO, CMD_TIMESTAMP),
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_AUTO, REG_TIMESTAMP),
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_AUTO, THREAD_TRACE_BUF_FULL),
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_AUTO, WLT),
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_AUTO, THREAD_TRACE)
                                         );
                         break;
                 case 1:
@@ -6991,12 +6992,15 @@ static int gfx_v8_0_sq_irq(struct amdgpu_device *adev,

                         DRM_INFO(
                                 "SQ %s detected: "
-                                       "se_id %d, cu_id %d, simd_id %d, wave_id %d, vm_id %d\n",
+                                       "se_id %d, cu_id %d, simd_id %d, wave_id %d, vm_id %d\n"
+                                       "trap %s, sh_id %d. ",
                                         type, se_id,
-                                       (entry->src_data[0] >> 20) & 0xf,
-                                       (entry->src_data[0] >> 18) & 0x3,
-                                       (entry->src_data[0] >> 14) & 0xf,
-                                       (entry->src_data[0] >> 10) & 0xf
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_WAVE, CU_ID),
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_WAVE, SIMD_ID),
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_WAVE, WAVE_ID),
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_WAVE, VM_ID),
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_WAVE, PRIV) ? "true" : "false",
+                                       REG_GET_FIELD(ih_data, SQ_INTERRUPT_WORD_WAVE, SH_ID)
                                         );
                         break;
                 default:
--
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx at lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20180620/a37c4ea1/attachment.html>