diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-11-22 00:42:23 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-11-28 18:58:05 -0500 |
commit | b2f04fc6cbf1467baf86a364efe3783be8f76a33 (patch) | |
tree | 83dabe17957fce7e7f8f295755160affa29d3c71 | |
parent | 4946980099c617ba7612f97f77cba7ece5b7f820 (diff) |
drm/nve0/bsp: implement initial support for engine
Will allow use of the engine if firmware (nvXX_fuc084) provided.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/Makefile | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c | 110 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/core/include/engine/bsp.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/device/nve0.c | 3 |
5 files changed, 117 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile index af6c5c236ecb..18bdf7f6eaa8 100644 --- a/drivers/gpu/drm/nouveau/Makefile +++ b/drivers/gpu/drm/nouveau/Makefile | |||
@@ -125,6 +125,7 @@ nouveau-y += core/engine/dmaobj/nv50.o | |||
125 | nouveau-y += core/engine/dmaobj/nvc0.o | 125 | nouveau-y += core/engine/dmaobj/nvc0.o |
126 | nouveau-y += core/engine/dmaobj/nvd0.o | 126 | nouveau-y += core/engine/dmaobj/nvd0.o |
127 | nouveau-y += core/engine/bsp/nv84.o | 127 | nouveau-y += core/engine/bsp/nv84.o |
128 | nouveau-y += core/engine/bsp/nve0.o | ||
128 | nouveau-y += core/engine/copy/nva3.o | 129 | nouveau-y += core/engine/copy/nva3.o |
129 | nouveau-y += core/engine/copy/nvc0.o | 130 | nouveau-y += core/engine/copy/nvc0.o |
130 | nouveau-y += core/engine/copy/nve0.o | 131 | nouveau-y += core/engine/copy/nve0.o |
diff --git a/drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c b/drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c new file mode 100644 index 000000000000..d4f23bbd75b4 --- /dev/null +++ b/drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c | |||
@@ -0,0 +1,110 @@ | |||
1 | /* | ||
2 | * Copyright 2012 Red Hat Inc. | ||
3 | * | ||
4 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
5 | * copy of this software and associated documentation files (the "Software"), | ||
6 | * to deal in the Software without restriction, including without limitation | ||
7 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
8 | * and/or sell copies of the Software, and to permit persons to whom the | ||
9 | * Software is furnished to do so, subject to the following conditions: | ||
10 | * | ||
11 | * The above copyright notice and this permission notice shall be included in | ||
12 | * all copies or substantial portions of the Software. | ||
13 | * | ||
14 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
15 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
16 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
17 | * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR | ||
18 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
19 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
20 | * OTHER DEALINGS IN THE SOFTWARE. | ||
21 | * | ||
22 | * Authors: Ben Skeggs | ||
23 | */ | ||
24 | |||
25 | #include <core/falcon.h> | ||
26 | |||
27 | #include <engine/bsp.h> | ||
28 | |||
29 | struct nve0_bsp_priv { | ||
30 | struct nouveau_falcon base; | ||
31 | }; | ||
32 | |||
33 | /******************************************************************************* | ||
34 | * BSP object classes | ||
35 | ******************************************************************************/ | ||
36 | |||
37 | static struct nouveau_oclass | ||
38 | nve0_bsp_sclass[] = { | ||
39 | { 0x95b1, &nouveau_object_ofuncs }, | ||
40 | {}, | ||
41 | }; | ||
42 | |||
43 | /******************************************************************************* | ||
44 | * PBSP context | ||
45 | ******************************************************************************/ | ||
46 | |||
47 | static struct nouveau_oclass | ||
48 | nve0_bsp_cclass = { | ||
49 | .handle = NV_ENGCTX(BSP, 0xe0), | ||
50 | .ofuncs = &(struct nouveau_ofuncs) { | ||
51 | .ctor = _nouveau_falcon_context_ctor, | ||
52 | .dtor = _nouveau_falcon_context_dtor, | ||
53 | .init = _nouveau_falcon_context_init, | ||
54 | .fini = _nouveau_falcon_context_fini, | ||
55 | .rd32 = _nouveau_falcon_context_rd32, | ||
56 | .wr32 = _nouveau_falcon_context_wr32, | ||
57 | }, | ||
58 | }; | ||
59 | |||
60 | /******************************************************************************* | ||
61 | * PBSP engine/subdev functions | ||
62 | ******************************************************************************/ | ||
63 | |||
64 | static int | ||
65 | nve0_bsp_init(struct nouveau_object *object) | ||
66 | { | ||
67 | struct nve0_bsp_priv *priv = (void *)object; | ||
68 | int ret; | ||
69 | |||
70 | ret = nouveau_falcon_init(&priv->base); | ||
71 | if (ret) | ||
72 | return ret; | ||
73 | |||
74 | nv_wr32(priv, 0x084010, 0x0000fff2); | ||
75 | nv_wr32(priv, 0x08401c, 0x0000fff2); | ||
76 | return 0; | ||
77 | } | ||
78 | |||
79 | static int | ||
80 | nve0_bsp_ctor(struct nouveau_object *parent, struct nouveau_object *engine, | ||
81 | struct nouveau_oclass *oclass, void *data, u32 size, | ||
82 | struct nouveau_object **pobject) | ||
83 | { | ||
84 | struct nve0_bsp_priv *priv; | ||
85 | int ret; | ||
86 | |||
87 | ret = nouveau_falcon_create(parent, engine, oclass, 0x084000, true, | ||
88 | "PBSP", "bsp", &priv); | ||
89 | *pobject = nv_object(priv); | ||
90 | if (ret) | ||
91 | return ret; | ||
92 | |||
93 | nv_subdev(priv)->unit = 0x00008000; | ||
94 | nv_engine(priv)->cclass = &nve0_bsp_cclass; | ||
95 | nv_engine(priv)->sclass = nve0_bsp_sclass; | ||
96 | return 0; | ||
97 | } | ||
98 | |||
99 | struct nouveau_oclass | ||
100 | nve0_bsp_oclass = { | ||
101 | .handle = NV_ENGINE(BSP, 0xe0), | ||
102 | .ofuncs = &(struct nouveau_ofuncs) { | ||
103 | .ctor = nve0_bsp_ctor, | ||
104 | .dtor = _nouveau_falcon_dtor, | ||
105 | .init = nve0_bsp_init, | ||
106 | .fini = _nouveau_falcon_fini, | ||
107 | .rd32 = _nouveau_falcon_rd32, | ||
108 | .wr32 = _nouveau_falcon_wr32, | ||
109 | }, | ||
110 | }; | ||
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c index 36e81b6fafbc..35abb29c5ad6 100644 --- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | |||
@@ -138,6 +138,7 @@ nve0_fifo_context_attach(struct nouveau_object *parent, | |||
138 | case NVDEV_ENGINE_GR : | 138 | case NVDEV_ENGINE_GR : |
139 | case NVDEV_ENGINE_COPY0: | 139 | case NVDEV_ENGINE_COPY0: |
140 | case NVDEV_ENGINE_COPY1: addr = 0x0210; break; | 140 | case NVDEV_ENGINE_COPY1: addr = 0x0210; break; |
141 | case NVDEV_ENGINE_BSP : addr = 0x0270; break; | ||
141 | default: | 142 | default: |
142 | return -EINVAL; | 143 | return -EINVAL; |
143 | } | 144 | } |
@@ -172,6 +173,7 @@ nve0_fifo_context_detach(struct nouveau_object *parent, bool suspend, | |||
172 | case NVDEV_ENGINE_GR : | 173 | case NVDEV_ENGINE_GR : |
173 | case NVDEV_ENGINE_COPY0: | 174 | case NVDEV_ENGINE_COPY0: |
174 | case NVDEV_ENGINE_COPY1: addr = 0x0210; break; | 175 | case NVDEV_ENGINE_COPY1: addr = 0x0210; break; |
176 | case NVDEV_ENGINE_BSP : addr = 0x0270; break; | ||
175 | default: | 177 | default: |
176 | return -EINVAL; | 178 | return -EINVAL; |
177 | } | 179 | } |
diff --git a/drivers/gpu/drm/nouveau/core/include/engine/bsp.h b/drivers/gpu/drm/nouveau/core/include/engine/bsp.h index 75d1ed5f85fd..0374e345db10 100644 --- a/drivers/gpu/drm/nouveau/core/include/engine/bsp.h +++ b/drivers/gpu/drm/nouveau/core/include/engine/bsp.h | |||
@@ -41,5 +41,6 @@ struct nouveau_bsp { | |||
41 | #define _nouveau_bsp_fini _nouveau_engine_fini | 41 | #define _nouveau_bsp_fini _nouveau_engine_fini |
42 | 42 | ||
43 | extern struct nouveau_oclass nv84_bsp_oclass; | 43 | extern struct nouveau_oclass nv84_bsp_oclass; |
44 | extern struct nouveau_oclass nve0_bsp_oclass; | ||
44 | 45 | ||
45 | #endif | 46 | #endif |
diff --git a/drivers/gpu/drm/nouveau/core/subdev/device/nve0.c b/drivers/gpu/drm/nouveau/core/subdev/device/nve0.c index 8f1cf51686ed..78c923fa3d0f 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/device/nve0.c +++ b/drivers/gpu/drm/nouveau/core/subdev/device/nve0.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <engine/graph.h> | 45 | #include <engine/graph.h> |
46 | #include <engine/disp.h> | 46 | #include <engine/disp.h> |
47 | #include <engine/copy.h> | 47 | #include <engine/copy.h> |
48 | #include <engine/bsp.h> | ||
48 | 49 | ||
49 | int | 50 | int |
50 | nve0_identify(struct nouveau_device *device) | 51 | nve0_identify(struct nouveau_device *device) |
@@ -74,6 +75,7 @@ nve0_identify(struct nouveau_device *device) | |||
74 | device->oclass[NVDEV_ENGINE_DISP ] = &nve0_disp_oclass; | 75 | device->oclass[NVDEV_ENGINE_DISP ] = &nve0_disp_oclass; |
75 | device->oclass[NVDEV_ENGINE_COPY0 ] = &nve0_copy0_oclass; | 76 | device->oclass[NVDEV_ENGINE_COPY0 ] = &nve0_copy0_oclass; |
76 | device->oclass[NVDEV_ENGINE_COPY1 ] = &nve0_copy1_oclass; | 77 | device->oclass[NVDEV_ENGINE_COPY1 ] = &nve0_copy1_oclass; |
78 | device->oclass[NVDEV_ENGINE_BSP ] = &nve0_bsp_oclass; | ||
77 | break; | 79 | break; |
78 | case 0xe7: | 80 | case 0xe7: |
79 | device->cname = "GK107"; | 81 | device->cname = "GK107"; |
@@ -99,6 +101,7 @@ nve0_identify(struct nouveau_device *device) | |||
99 | device->oclass[NVDEV_ENGINE_DISP ] = &nve0_disp_oclass; | 101 | device->oclass[NVDEV_ENGINE_DISP ] = &nve0_disp_oclass; |
100 | device->oclass[NVDEV_ENGINE_COPY0 ] = &nve0_copy0_oclass; | 102 | device->oclass[NVDEV_ENGINE_COPY0 ] = &nve0_copy0_oclass; |
101 | device->oclass[NVDEV_ENGINE_COPY1 ] = &nve0_copy1_oclass; | 103 | device->oclass[NVDEV_ENGINE_COPY1 ] = &nve0_copy1_oclass; |
104 | device->oclass[NVDEV_ENGINE_BSP ] = &nve0_bsp_oclass; | ||
102 | break; | 105 | break; |
103 | default: | 106 | default: |
104 | nv_fatal(device, "unknown Kepler chipset\n"); | 107 | nv_fatal(device, "unknown Kepler chipset\n"); |