summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-03-20 14:20:50 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-05-24 16:31:43 +1000
commitf1c65e7c7fb7e109290e969ad17f08c45993b41c (patch)
tree41173b42c4780fb7c9b57d1d6c3a3484c838935e /drivers/gpu
parentab394543ddd02b6cc6612a3c1991a18fb3056a45 (diff)
downloadlinux-f1c65e7c7fb7e109290e969ad17f08c45993b41c.tar.bz2
drm/nv50-/fbcon: move 2d class to subchannel 3
Kepler GRAPH has (well, sorta) fixed subchannel<->class assignments, make this match up to keep it happy without trapping. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_dma.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.h b/drivers/gpu/drm/nouveau/nouveau_dma.h
index 23d4edf992b7..47896c407284 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.h
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.h
@@ -50,8 +50,8 @@ void nv50_dma_push(struct nouveau_channel *, struct nouveau_bo *,
enum {
NvSubM2MF = 0,
NvSubSw = 1,
- NvSub2D = 2,
NvSubCtxSurf2D = 2,
+ NvSub2D = 3,
NvSubGdiRect = 3,
NvSubImageBlit = 4
};