aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2013-04-28 19:36:42 -0400
committerBen Skeggs <bskeggs@redhat.com>2013-06-30 23:43:36 -0400
commit48506d17d55911c9e814108c88a9b0747313ba89 (patch)
treef32698308a967c7069c3f5815990017362baff4c
parent01672ef454307bf63e93defb3599399b678ff58b (diff)
drm/nve0/ce: link ce2 to its engine, rather than from graphics
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c3
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/nve0.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
index 4419fd23d0d1..eff2b5791db9 100644
--- 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 {
44 u64 subdev; 44 u64 subdev;
45 u64 mask; 45 u64 mask;
46} fifo_engine[] = { 46} fifo_engine[] = {
47 _(NVDEV_ENGINE_GR , (1ULL << NVDEV_ENGINE_SW)), 47 _(NVDEV_ENGINE_GR , (1ULL << NVDEV_ENGINE_SW) |
48 (1ULL << NVDEV_ENGINE_COPY2)),
48 _(NVDEV_ENGINE_VP , 0), 49 _(NVDEV_ENGINE_VP , 0),
49 _(NVDEV_ENGINE_PPP , 0), 50 _(NVDEV_ENGINE_PPP , 0),
50 _(NVDEV_ENGINE_BSP , 0), 51 _(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 678c16f63055..b0a5a8847a89 100644
--- 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[] = {
36 { 0xa040, &nouveau_object_ofuncs }, 36 { 0xa040, &nouveau_object_ofuncs },
37 { 0xa097, &nouveau_object_ofuncs }, 37 { 0xa097, &nouveau_object_ofuncs },
38 { 0xa0c0, &nouveau_object_ofuncs }, 38 { 0xa0c0, &nouveau_object_ofuncs },
39 { 0xa0b5, &nouveau_object_ofuncs },
40 {} 39 {}
41}; 40};
42 41