diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-05-18 17:12:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-18 17:12:41 +1000 |
| commit | 3b064e6f7be75efbb5d8ec5991cd64c8ed09e0dd (patch) | |
| tree | 83d1a7fc3342b204f41963d2b0a92a20d0d55155 /drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c | |
| parent | 1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0 (diff) | |
| parent | 6c46d01f25bcf74608d09645c27c35c3f3940ebe (diff) | |
| download | blackbird-op-linux-3b064e6f7be75efbb5d8ec5991cd64c8ed09e0dd.tar.gz blackbird-op-linux-3b064e6f7be75efbb5d8ec5991cd64c8ed09e0dd.zip | |
Merge branch 'linux-4.18' of git://github.com/skeggsb/linux into drm-next
The main thing here is the addition of support for Volta GV100 GPUs,
everything else basically restructuring display / graphics init code
to make it possible to fit Volta support in more nicely.
There's a bunch of improvements/fixes scattered in there for earlier
GPUs too, particularly graphics engine init on all GPUs from Fermi
onwards.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv7sjDKyR43n+6=iLC+ExGhBTLRLdKqwrhcfJWjEAndK0g@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c index b069f785c5d8..49565faa854d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c @@ -24,16 +24,18 @@ #include "gk104.h" #include "changk104.h" +#include <nvif/class.h> + static const struct gk104_fifo_func gm200_fifo = { + .init_pbdma_timeout = gk208_fifo_init_pbdma_timeout, + .fault.access = gk104_fifo_fault_access, .fault.engine = gm107_fifo_fault_engine, .fault.reason = gk104_fifo_fault_reason, .fault.hubclient = gk104_fifo_fault_hubclient, .fault.gpcclient = gk104_fifo_fault_gpcclient, - .chan = { - &gm200_fifo_gpfifo_oclass, - NULL - }, + .runlist = &gm107_fifo_runlist, + .chan = {{0,0,MAXWELL_CHANNEL_GPFIFO_A}, gk104_fifo_gpfifo_new }, }; int |
