---

yaml --- r: 318749 b: refs/heads/master c: 7158554 h: refs/heads/master i: 318747: 0751051 v: v3
git-mirror · Jul 26, 2012 · 27f88e7 · 27f88e7
1 parent 2beb419
commit 27f88e7
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ade74b6c6843892b52e6c2a4ac02183242eec27
+refs/heads/master: 715855457e6bc93e148caf8cb3b5dcabbf605b0d
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_drv.h b/trunk/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -689,8 +689,6 @@ struct drm_nouveau_private {
 	void (*irq_handler[32])(struct drm_device *);
 	bool msi_enabled;
 
-	struct list_head vbl_waiting;
-
 	struct {
 		struct drm_global_reference mem_global_ref;
 		struct ttm_bo_global_ref bo_global_ref;

diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_irq.c b/trunk/drivers/gpu/drm/nouveau/nouveau_irq.c
@@ -41,12 +41,8 @@
 void
 nouveau_irq_preinstall(struct drm_device *dev)
 {
-	struct drm_nouveau_private *dev_priv = dev->dev_private;
-
 	/* Master disable */
 	nv_wr32(dev, NV03_PMC_INTR_EN_0, 0);
-
-	INIT_LIST_HEAD(&dev_priv->vbl_waiting);
 }
 
 int

diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_software.h b/trunk/drivers/gpu/drm/nouveau/nouveau_software.h
@@ -23,6 +23,7 @@ static inline void
 nouveau_software_context_new(struct nouveau_software_chan *pch)
 {
 	INIT_LIST_HEAD(&pch->flip);
+	INIT_LIST_HEAD(&pch->vblank.list);
 }
 
 static inline void