diff --git a/[refs] b/[refs]
index dc1843a36ed9..d1b7dace4363 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab394543ddd02b6cc6612a3c1991a18fb3056a45
+refs/heads/master: f1c65e7c7fb7e109290e969ad17f08c45993b41c
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_dma.h b/trunk/drivers/gpu/drm/nouveau/nouveau_dma.h
index 23d4edf992b7..47896c407284 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_dma.h
+++ b/trunk/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
 };