drm/nve0/ce: link ce2 to its engine, rather than from graphics

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
index 4419fd23d0d1339254e3044c9b8be4c4b82906bb..eff2b5791db97e2801e69fad9191224f8aae644c 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
@@ -44,7 +44,8 @@ static const struct {
        u64 subdev;
        u64 mask;
 } fifo_engine[] = {
-       _(NVDEV_ENGINE_GR      , (1ULL << NVDEV_ENGINE_SW)),
+       _(NVDEV_ENGINE_GR      , (1ULL << NVDEV_ENGINE_SW) |
+                                (1ULL << NVDEV_ENGINE_COPY2)),
        _(NVDEV_ENGINE_VP      , 0),
        _(NVDEV_ENGINE_PPP     , 0),
        _(NVDEV_ENGINE_BSP     , 0),

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
index 678c16f630559219477656e798ae1a816311477d..b0a5a8847a89b6399a0f901aa355f7b16e35ccf4 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
@@ -36,7 +36,6 @@ nve0_graph_sclass[] = {
        { 0xa040, &nouveau_object_ofuncs },
        { 0xa097, &nouveau_object_ofuncs },
        { 0xa0c0, &nouveau_object_ofuncs },
-       { 0xa0b5, &nouveau_object_ofuncs },
        {}
 };