leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
649,779 Commits 2 Branches 0 Tags 5.1 GiB
ae65a26dd3
Commit Graph

50 Commits

Author SHA1 Message Date
Ben Skeggs
ec884f74f1 drm/nouveau/fifo/gf100-: recover from host mmu faults 
This has been on the TODO list for a while now, recovering from things
such as attempting to execute a push buffer or touch a semaphore in an
unmapped memory area.

The only thing required on the HW side here is that the offending
channel is removed from the runlist, and *not* a full reset of PFIFO.

This used to be a bit messier to handle before the rework to make use
of engine topology info, but is apparently now trivial.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-12-13 11:38:51 +10:00
Ben Skeggs
1fe8c02fbc drm/nouveau/fifo/gk104-: translate engidx into human-readable name in debug output 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-07-14 11:53:25 +10:00
Ben Skeggs
952eb819e3 drm/nouveau/top: take nvkm_device as argument to public functions 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-07-14 11:53:25 +10:00
Ben Skeggs
289e082706 drm/nouveau/fifo/gk104-: identify mmu engine ids for host faults 
It appears these don't map to PBDMAs (at least on Kepler, it may or may
be valid for Fermi - this hasn't been checked), but to runlists.

This drops the NVKM_ENGINE_FIFO data from the entries too, as resetting
all of PFIFO is *not* the way to handle such faults.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-05-20 14:43:04 +10:00
Ben Skeggs
e50d0237fc drm/nouveau/fifo/gk104-: implement support for PTOP fault info 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-05-20 14:43:04 +10:00
Ben Skeggs
91419acf78 drm/nouveau/fifo/gk104-: abstract mmu fault data structures 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-05-20 14:43:04 +10:00
Ben Skeggs
98ac3f061a drm/nouveau/fifo/gk104-: subclass func 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-05-20 14:43:04 +10:00
Ben Skeggs
e93e198d46 drm/nouveau/fifo/gk104-: use device info from top subdev 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-05-20 14:43:04 +10:00
Ben Skeggs
b4c5fc4b85 drm/nouveau/fifo/gk104: submit NOP after all PBDMA_INTR_0, not just DEVICE 
Prevents the same interrupt from re-triggering forever.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-03-14 10:13:47 +10:00
Ben Skeggs
608fd040b7 drm/nouveau/fifo/gk104: add nvdec plumbing 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-03-14 10:13:46 +10:00
Ben Skeggs
9e4fff3205 drm/nouveau/fifo/gk104: add nvenc plumbing 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-03-14 10:13:46 +10:00
Ben Skeggs
19f89279fa drm/nouveau/fifo/gk104: make use of topology info during fault recovery 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-03-14 10:13:42 +10:00
Ben Skeggs
af83a67779 drm/nouveau/fifo/gk104: make use of topology info when handling ctxsw timeout 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-03-14 10:13:41 +10:00
Ben Skeggs
41e5171ba8 drm/nouveau/fifo/gk104: read device topology information from hw 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-03-14 10:13:41 +10:00
Ben Skeggs
69aa40e276 drm/nouveau/fifo/gk104: cosmetic engine->runlist changes 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-03-14 10:13:40 +10:00
Ben Skeggs
acdf7d4f7e drm/nouveau/fifo/gk104: don't attempt recovery of unknown mmu engines 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-03-14 10:13:40 +10:00
Ben Skeggs
55252da161 drm/nouveau/fifo/gk104: identify fault-recovery members more clearly 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-03-14 10:13:39 +10:00
Ben Skeggs
6d39b83f13 drm/nouveau/fifo/gk104: rename spoon to pbdma, and move detection to oneinit 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-03-14 10:13:39 +10:00
Alexandre Courbot
a2e435a1b0 drm/nouveau/fifo/gk104: take runlist target into account 
Bits 28:29 of RUNLIST_BASE specify the memory target of the runlist. Set
it to 0x3 (SYS_MEM_NONCOHERENT) if the runlist object resides in system
memory.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-03-14 10:13:31 +10:00
Xia Yang
0689aad70d drm/nouveau/fifo/gk104: fix chid bit mask 
Fix the channel id bit mask in FIFO schedule timeout error handling.

FIFO_ENGINE_STATUS_NEXT_ID is bit 27:16 thus 0x0fff0000.
FIFO_ENGINE_STATUS_ID      is bit 11:0  thus 0x00000fff.

Signed-off-by: Xia Yang <xiay@nvidia.com>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-03-14 10:13:30 +10:00
Vince Hsu
da4ee13cd5 drm/nouveau/fifo/gk104: fix engine status register offset 
The offset should be 8 on Kepler and later.

Signed-off-by: Vince Hsu <vinceh@nvidia.com>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-01-11 11:17:40 +10:00
Ben Skeggs
386ffd5e80 drm/nouveau/fifo/gk104: fix race condition when updating engine runlists 
The CPU-side tracking of engine runlists was not protected by a lock,
leading to list corruption, eventually causing runlist_update() to
overrun the GPU-side runlist, triggering an OOPS.

Fixes some of the issues noticed during parallel piglit runs.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2016-01-11 11:17:40 +10:00
Ben Skeggs
fbd58ebda9 drm/nouveau/object: merge with handle 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:47 +10:00
Ben Skeggs
68f3f702b6 drm/nouveau/core: remove the remainder of the previous style 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:47 +10:00
Ben Skeggs
13de7f4629 drm/nouveau/fifo: convert to new-style nvkm_engine 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:46 +10:00
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
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
Ben Skeggs
5300394106 drm/nouveau/core: remove last printks 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:26 +10:00
Ben Skeggs
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
Ben Skeggs
af3082b3c6 drm/nouveau/fifo: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:21 +10:00
Ben Skeggs
8774440390 drm/nouveau/fifo: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:17 +10:00
Ben Skeggs
6189f1b093 drm/nouveau/fifo: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:11 +10:00
Ben Skeggs
89025bd458 drm/nouveau/fifo/gm204: initial support 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-04-14 17:00:55 +10:00
Ben Skeggs
05c7145dae drm/nouveau/fifo: namespace + nvidia gpu names (no binary change) 
The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver.  This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).

Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.

A comparison of objdump disassemblies proves no code changes.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-01-22 12:18:02 +10:00