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
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
From 9a3519db551dfc346676eb0b7e65a305a720b4ed Mon Sep 17 00:00:00 2001
From: Amber Lin <Amber.Lin@amd.com>
Date: Thu, 7 Sep 2017 11:23:48 -0400
Subject: [PATCH 2194/4131] drm/amdkfd: Add module parameter, priv_cp_queues
Add a module parameter, priv_cp_queues, to enable privileged access of CP
for user mode queues if amdkfd.priv_cp_queues=1 is set. Default is
disabled.
Change-Id: Iea2fe88b4a16826e8c1d3a05f4ee48b67c4f2386
Signed-off-by: Amber Lin <Amber.Lin@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
---
drivers/gpu/drm/amd/amdkfd/kfd_module.c | 5 +++++
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 4 ++++
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 4 ++++
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 4 ++++
drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 5 +++++
5 files changed, 22 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_module.c b/drivers/gpu/drm/amd/amdkfd/kfd_module.c
index bcd7bf8..c3e50e2 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_module.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_module.c
@@ -89,6 +89,11 @@ module_param_named(noretry, vega10_noretry, int, 0644);
MODULE_PARM_DESC(noretry,
"Set sh_mem_config.retry_disable on Vega10 (0 = retry enabled (default), 1 = retry disabled)");
+int priv_cp_queues;
+module_param(priv_cp_queues, int, 0644);
+MODULE_PARM_DESC(priv_cp_queues,
+ "Enable privileged mode for CP queues (0 = off (default), 1 = on)");
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) && defined(BUILD_AS_DKMS)
int cma_enable;
module_param(cma_enable, int, 0644);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
index 3ad4e5a..5398705 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
@@ -160,6 +160,10 @@ static int init_mqd(struct mqd_manager *mm, void **mqd,
if (q->format == KFD_QUEUE_FORMAT_AQL)
m->cp_hqd_iq_rptr = AQL_ENABLE;
+ if (priv_cp_queues)
+ m->cp_hqd_pq_control |=
+ 1 << CP_HQD_PQ_CONTROL__PRIV_STATE__SHIFT;
+
*mqd = m;
if (gart_addr)
*gart_addr = addr;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
index 417cf6e..0d4d543 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
@@ -171,6 +171,10 @@ static int init_mqd(struct mqd_manager *mm, void **mqd,
m->cp_hqd_wg_state_offset = q->ctl_stack_size;
}
+ if (priv_cp_queues)
+ m->cp_hqd_pq_control |=
+ 1 << CP_HQD_PQ_CONTROL__PRIV_STATE__SHIFT;
+
*mqd = m;
if (gart_addr)
*gart_addr = addr;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
index 7dc0011..973ea94 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
@@ -173,6 +173,10 @@ static int init_mqd(struct mqd_manager *mm, void **mqd,
m->cp_hqd_wg_state_offset = q->ctl_stack_size;
}
+ if (priv_cp_queues)
+ m->cp_hqd_pq_control |=
+ 1 << CP_HQD_PQ_CONTROL__PRIV_STATE__SHIFT;
+
*mqd = m;
if (gart_addr)
*gart_addr = addr;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index bfd8952..cec554c 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -138,6 +138,11 @@ extern int ignore_crat;
*/
extern int vega10_noretry;
+/*
+ * Enable privileged mode for all CP queues including user queues
+ */
+extern int priv_cp_queues;
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) && defined(BUILD_AS_DKMS)
/*
* Currently, mm_access() function is not exported. So for DKMS build,
--
2.7.4
|
