diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-03-05 01:55:57 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-03-05 02:10:29 +0100 |
| commit | a727df407ca4f9bc0e9c30b7b469fc990a235be3 (patch) | |
| tree | 4e8fc44e64c47c115c81d0b63ec559061038d2b7 | |
| parent | Merge tag 'misc-5.12-2021-03-02' of git://git.kernel.dk/linux-block (diff) | |
| parent | drm/nouveau/fifo/gk104-gp1xx: fix creation of sw class (diff) | |
| download | linux-a727df407ca4f9bc0e9c30b7b469fc990a235be3.tar.xz linux-a727df407ca4f9bc0e9c30b7b469fc990a235be3.zip | |
Merge branch '00.00-inst' of git://github.com/skeggsb/linux into drm-fixes
A single regression fix here that I noticed while testing a bunch of
boards for something else, not sure where this got lost! Prevents 3D
driver from initialising on some GPUs.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv5gmq14BrDmkMncfd=tHVSSaU89BdBEWfs6Jy-aRz03GQ@mail.gmail.com
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c index 69da601f1754..e771bd519ee2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c @@ -261,6 +261,9 @@ gk104_fifo_pbdma = { struct nvkm_engine * gk104_fifo_id_engine(struct nvkm_fifo *base, int engi) { + if (engi == GK104_FIFO_ENGN_SW) + return nvkm_device_engine(base->engine.subdev.device, NVKM_ENGINE_SW, 0); + return gk104_fifo(base)->engine[engi].engine; } |