46484438ab
drm/nouveau/bios: convert to new-style nvkm_subdev
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:42 +10:00
3293228174
drm/nouveau/bar: convert to new-style nvkm_subdev
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:42 +10:00
ef8bc5760b
drm/nouveau/core: kill some (now) dead code
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:42 +10:00
07b9e6cc95
drm/nouveau/sw: convert user classes to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:42 +10:00
5ffeb84b8e
drm/nouveau/pm: convert user classes to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:41 +10:00
218f978d43
drm/nouveau/mpeg: convert user classes to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:41 +10:00
27f3d6cf80
drm/nouveau/gr: convert user classes to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:41 +10:00
b3c9815047
drm/nouveau/cipher: convert user classes to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:41 +10:00
e5ff112781
drm/nouveau/ce: convert user classes to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:41 +10:00
c79a191b27
drm/nouveau/xtensa: convert user classes to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:41 +10:00
9d498e0f7a
drm/nouveau/falcon: convert user classes to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:40 +10:00
8f0649b5c6
drm/nouveau/fifo: convert user classes to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:40 +10:00
9a65a38c45
drm/nouveau/fifo: split user classes out from engine implementations
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:40 +10:00
0ce41e3c66
drm/nouveau/disp: convert user classes to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:40 +10:00
2a7909c0ad
drm/nouveau/disp: split user classes out from engine implementations
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:40 +10:00
0710cc3148
drm/nouveau/dma: convert user classes to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:40 +10:00
19fef52d93
drm/nouveau/dma: split user classes out from engine implementations
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:39 +10:00
0e29998a89
drm/nouveau/device: convert ctrl class to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:39 +10:00
2a9f847f5d
drm/nouveau/device: convert user class to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:39 +10:00
24bd0930be
drm/nouveau/client: convert to new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:39 +10:00
6157091177
drm/nouveau/sw: remove dependence on namedb/engctx lookup
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:39 +10:00
590801c1a3
drm/nouveau/mpeg: remove dependence on namedb/engctx lookup
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:39 +10:00
a65955e19e
drm/nouveau/gr: remove dependence on namedb/engctx lookup
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:38 +10:00
6ca307b0c9
drm/nouveau/fifo: remove dependence on namedb/engctx lookup
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:38 +10:00
35acf3d72c
drm/nouveau/cipher: remove dependence on namedb/engctx lookup
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:38 +10:00
a83d8872fc
drm/nouveau/falcon: remove dependence on namedb/engctx lookup
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:38 +10:00
344c2d429d
drm/nouveau/fb: remove dependence on namedb/engctx lookup
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:38 +10:00
898a2b3213
drm/nouveau/sw: turn flip completion into an event
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:38 +10:00
cd459e7776
drm/nouveau/sw/nv04: replace direct context access with GetRef method
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:37 +10:00
1d2a1e5386
drm/nouveau/ramht: remove dependence on namedb
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:37 +10:00
f027f49166
drm/nouveau/gpuobj: separate allocation from nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:37 +10:00
227c95d90a
drm/nouveau/gr: directly use instmem where currently possible
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:37 +10:00
358ce601ae
drm/nouveau/fifo: directly use instmem for runlists and polling areas
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:37 +10:00
faf468981e
drm/nouveau/xtensa: directly use instmem for ucode image
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:37 +10:00
406ca8c714
drm/nouveau/falcon: directly use instmem for ucode image
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:36 +10:00
5b1ab0c2c7
drm/nouveau/imem/nv04-nv40: directly use instmem for vbios/ramfc/ramro
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:36 +10:00
adb53d2773
drm/nouveau/bar/gf100: directly use instmem for channel descriptors
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:36 +10:00
d0659d3277
drm/nouveau/mmu: directly use instmem for page tables
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:36 +10:00
d8e83994aa
drm/nouveau/imem: improve management of instance memory
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:36 +10:00
1de68568d6
drm/nouveau/mmu: protect each vm with its own mutex
...
An upcoming commit requires being able to modify the PRAMIN BAR page
tables while already holding the MMU subdev mutex.
To solve this issue, each VM has been given its own mutex. As a nice
side-effect, this also allows separate VMs to be updated concurrently.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:35 +10:00
524bdbf202
drm/nouveau/core: prepare for new-style objects
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:35 +10:00
6cf813fb26
drm/nouveau/device: prepare for new-style subdevs
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:35 +10:00
7974dd1bdb
drm/nouveau/device: separate construction of pci/tegra devices
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:34 +10:00
168c2e213d
drm/nouveau/engine: implement support for new-style nvkm_engine
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:34 +10:00
f0290215c4
drm/nouveau/subdev: implement support for new-style nvkm_subdev
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:34 +10:00
cbea21e2ab
drm/nouveau/object: implement support for new-style nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:34 +10:00
89c651e221
drm/nouveau/engine: rename some functions to avoid upcoming conflicts
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:34 +10:00
3a8c3400f3
drm/nouveau/subdev: rename some functions to avoid upcoming conflicts
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:33 +10:00
aa35888ff0
drm/nouveau/object: rename some functions to avoid upcoming conflicts
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:33 +10:00
d61f4c178c
drm/nouveau/nvif: device time mthd
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:33 +10:00
159045cdc4
drm/nouveau/nvif: replace pushbuf with vm in fermi/kepler gpfifo class args
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:33 +10:00
22827fa42b
drm/nouveau/nvif: return chipset/board names from device info method
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:33 +10:00
d56241794c
drm/nouveau/nvif: add supported engines query to kepler gpfifo class
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:33 +10:00
41a634064d
drm/nouveau/nvif: return min/max versions for supported object classes
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:32 +10:00
f58ddf9581
drm/nouveau/nvif: assign internal class identifiers to sw classes
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:32 +10:00
315a8b2edf
drm/nouveau/nvif: use negative oclass identifier for internal classes
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:32 +10:00
5c15bf709e
drm/nouveau/nvif: return success from sclass even for objects without children
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:32 +10:00
99d4d36ad6
drm/nouveau/nvif: extend nop ioctl to return nvif version identifier
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:32 +10:00
bf81df9be2
drm/nouveau/nvif: replace path-based object identification
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:32 +10:00
a01ca78c8f
drm/nouveau/nvif: simplify and tidy library interfaces
...
A variety of tweaks to the NVIF library interfaces, mostly ripping out
things that turned out to be not so useful.
- Removed refcounting from nvif_object, callers are expected to not be
stupid instead.
- nvif_client is directly reachable from anything derived from nvif_object,
removing the need for heuristics to locate it
- _new() versions of interfaces, that allocate memory for the object
they construct, have been removed. The vast majority of callers used
the embedded _init() interfaces.
- No longer storing constructor arguments (and the data returned from
nvkm) inside nvif_object, it's more or less unused and just wastes
memory.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:32 +10:00
4e7e62d607
drm/nouveau/client: store default device by handle, not reference
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:31 +10:00
102b49da15
drm/nouveau/parent: remove some (now) unnecessary special-case handling
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:31 +10:00
493f189dc0
drm/nouveau/object: store object type data outside of handle
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:31 +10:00
a1e8873622
drm/nouveau/device: decouple from engine machinery
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:31 +10:00
a1bfb29a33
drm/nouveau/device: split user device implementation out on its own
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:31 +10:00
0ac9d210a1
drm/nouveau/device: simplify subdev construction
...
Replaces the piece-by-piece (in response to NV_DEVICE ctor args) device
contruction with a once-off all-or-nothing approach, eliminating some
tricky refcounting issues. The partial device init capability was only
required by some tools, and has been moved to probe time instead.
Temporarily removes a workaround for some boards where we need to fiddle
with AGP registers before executing the DEVINIT scripts. A later commit
in this series reinstates it.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:31 +10:00
e781dc8f6c
drm/nouveau/device: tidy ctor/dtor interfaces
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:30 +10:00
76ecea5b4b
drm/nouveau/client: tidy ctor/dtor interfaces
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:30 +10:00
47b2505efb
drm/nouveau/platform: remove subclassing of nvkm_device
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:30 +10:00
f2c906fc0c
drm/nouveau/disp: transition outp/conn away from being based on nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:30 +10:00
2aa5eac516
drm/nouveau/i2c: transition pad/ports away from being based on nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:29 +10:00
d36a99d2da
drm/nouveau/fb: transition nvkm_ram away from being based on nvkm_object
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:29 +10:00
a8dae9fe0e
drm/nouveau/vga: require nvkm_device pointer in accessor functions
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:29 +10:00
95cf469cc3
drm/nouveau/imem: use object accessor function for suspend/resume
...
Very much not ideal, but this will be improved later.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:29 +10:00
cfdc4c44b4
drm/nouveau/core: wrap direct use of object accessor functions
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:29 +10:00
572fb13db2
drm/nouveau/mpeg: switch to gpuobj accessor macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:28 +10:00
142ea05f49
drm/nouveau/gr: switch to gpuobj accessor macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:28 +10:00
5444e770e3
drm/nouveau/fifo: switch to gpuobj accessor macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:28 +10:00
3f532ef1e2
drm/nouveau/dma: switch to gpuobj accessor macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:28 +10:00
6d06fd68cb
drm/nouveau/cipher: switch to gpuobj accessor macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:28 +10:00
edb1dc51de
drm/nouveau/xtensa: switch to gpuobj accessor macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:28 +10:00
9cc264a3aa
drm/nouveau/falcon: switch to gpuobj accessor macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:28 +10:00
cd821077aa
drm/nouveau/mmu: switch to gpuobj accessor macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:27 +10:00
1918707556
drm/nouveau/bar: switch to gpuobj accessor macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:27 +10:00
45ea503161
drm/nouveau/core: switch to gpuobj accessor macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:27 +10:00
384af9acea
drm/nouveau/gpuobj: type-safe accessor macros
...
These require an explicit struct nvkm_gpuobj pointer, unlike the previous
macros which take a void *, and work with any nvkm_object.
New semantics require acquiring/releasing a gpuobj before accessing them,
which will be made use of in later patches to greatly reduce the overhead
of accesses, particularly when a direct mmio mapping of the object is not
available (suspend/resume, out of ioremap() space, and on GK20A).
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:27 +10:00
9ccdc76006
drm/nouveau/xtensa: remove object accessor functions
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:27 +10:00
63902181a7
drm/nouveau/falcon: remove object accessor functions
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:27 +10:00
a47474261e
drm/nouveau/imem: remove object accessor functions
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:26 +10:00
7e24c1145a
drm/nouveau/fuse: remove object accessor functions
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:26 +10:00
7f5f518fd7
drm/nouveau/bios: remove object accessor functions
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:26 +10:00
5300394106
drm/nouveau/core: remove last printks
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:26 +10:00
9ad97ede4b
drm/nouveau: use dev_* for logging
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:26 +10:00
9e3911e5b2
drm/nouveau/sec: switch to subdev printk macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:26 +10:00
476901ff6c
drm/nouveau/pm: switch to subdev printk macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:25 +10:00
b835c09bc6
drm/nouveau/mpeg: switch to subdev printk macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:25 +10:00
109c2f2f1c
drm/nouveau/gr: switch to subdev printk macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:25 +10:00
e5c5e4f5d3
drm/nouveau/fifo: switch to subdev printk macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:25 +10:00
84407824e9
drm/nouveau/disp: switch to subdev printk macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:25 +10:00
e37f543370
drm/nouveau/device: switch to dev_printk macros
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2015-08-28 12:40:25 +10:00
Ben Skeggs