1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From 6ae52c4889ad74215954cbe50a65b2f45530ec51 Mon Sep 17 00:00:00 2001
From: Besar Wicaksono <besar.wicaksono@amd.com>
Date: Fri, 10 Jun 2016 06:05:52 -0500
Subject: [PATCH 1449/4131] drm/amdkfd: Add SDMA trap src id to the KFD isr
wanted list
This enables SDMA signalling with event interrupt.
Change-Id: If9cc8cea8ac781523e1e24ae54a137416141657d
Signed-off-by: Besar Wicaksono <Besar.Wicaksono@amd.com>
---
drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 3 +++
drivers/gpu/drm/amd/amdkfd/cik_int.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c b/drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c
index 996b49e..3f49f8e 100644
--- a/drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c
+++ b/drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c
@@ -46,6 +46,7 @@ static bool cik_event_interrupt_isr(struct kfd_dev *dev,
/* Do not process in ISR, just request it to be forwarded to WQ. */
return (ihre->pasid != 0) &&
(ihre->source_id == CIK_INTSRC_CP_END_OF_PIPE ||
+ ihre->source_id == CIK_INTSRC_SDMA_TRAP ||
ihre->source_id == CIK_INTSRC_SQ_INTERRUPT_MSG ||
ihre->source_id == CIK_INTSRC_CP_BAD_OPCODE ||
is_cpc_vm_fault(dev, ih_ring_entry));
@@ -62,6 +63,8 @@ static void cik_event_interrupt_wq(struct kfd_dev *dev,
if (ihre->source_id == CIK_INTSRC_CP_END_OF_PIPE)
kfd_signal_event_interrupt(ihre->pasid, 0, 0);
+ else if (ihre->source_id == CIK_INTSRC_SDMA_TRAP)
+ kfd_signal_event_interrupt(ihre->pasid, 0, 0);
else if (ihre->source_id == CIK_INTSRC_SQ_INTERRUPT_MSG)
kfd_signal_event_interrupt(ihre->pasid, ihre->data & 0xFF, 8);
else if (ihre->source_id == CIK_INTSRC_CP_BAD_OPCODE)
diff --git a/drivers/gpu/drm/amd/amdkfd/cik_int.h b/drivers/gpu/drm/amd/amdkfd/cik_int.h
index feb3c24..9054068 100644
--- a/drivers/gpu/drm/amd/amdkfd/cik_int.h
+++ b/drivers/gpu/drm/amd/amdkfd/cik_int.h
@@ -50,6 +50,7 @@ struct cik_ih_ring_entry {
#define CIK_INTSRC_SQ_INTERRUPT_MSG 0xEF
#define CIK_INTSRC_GFX_PAGE_INV_FAULT 0x92
#define CIK_INTSRC_GFX_MEM_PROT_FAULT 0x93
+#define CIK_INTSRC_SDMA_TRAP 0xE0
#endif
--
2.7.4
|
