---

yaml --- r: 228633 b: refs/heads/master c: b2b0993 h: refs/heads/master i: 228631: 1a2802f v: v3
git-mirror · Dec 21, 2010 · 201c139 · 201c139
1 parent 12fa438
commit 201c139
Show file tree

Hide file tree

Showing 3 changed files with 362 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 529c4959129c7c425aaf3d5b6acc63edf76827ad
+refs/heads/master: b2b099388fa76f0be25431794d369d251a4002dd
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_drv.h b/trunk/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -240,6 +240,7 @@ struct nouveau_channel {
 	/* PFIFO context */
 	struct nouveau_gpuobj *ramfc;
 	struct nouveau_gpuobj *cache;
+	void *fifo_priv;
 
 	/* PGRAPH context */
 	/* XXX may be merge 2 pointers as private data ??? */
@@ -337,6 +338,7 @@ struct nouveau_fb_engine {
 };
 
 struct nouveau_fifo_engine {
+	void *priv;
 	int  channels;
 
 	struct nouveau_gpuobj *playlist[2];