From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 20 Mar 2012 04:20:50 +0000 (+1000)
Subject: drm/nv50-/fbcon: move 2d class to subchannel 3
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f1c65e7c7fb7e109290e969ad17f08c45993b41c;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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
 };