diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4750-drm-amdgpu-Polish-SQ-IH.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4750-drm-amdgpu-Polish-SQ-IH.patch | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4750-drm-amdgpu-Polish-SQ-IH.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4750-drm-amdgpu-Polish-SQ-IH.patch new file mode 100644 index 00000000..4e3e8af6 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4750-drm-amdgpu-Polish-SQ-IH.patch @@ -0,0 +1,85 @@ +From 8be6402c521105b89cf08c57a0c8e7b0b7e4f146 Mon Sep 17 00:00:00 2001 +From: Andrey Grodzovsky <andrey.grodzovsky@amd.com> +Date: Mon, 18 Jun 2018 11:15:10 -0400 +Subject: [PATCH 4750/5725] drm/amdgpu: Polish SQ IH. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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@amd.com> +Acked-by: Christian König <christian.koenig@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@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 77350cd..ad28dd9 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +@@ -6973,10 +6973,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: +@@ -6986,14 +6987,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: +@@ -7006,12 +7007,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 + |