From 27f88e71182744513833730efe9c414624ff1ced Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Wed, 25 Jul 2012 20:42:05 +0200 Subject: [PATCH] --- yaml --- r: 318749 b: refs/heads/master c: 715855457e6bc93e148caf8cb3b5dcabbf605b0d h: refs/heads/master i: 318747: 07510510d4e001b67fd9dea10ceb815ede6a940d v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_drv.h | 2 -- trunk/drivers/gpu/drm/nouveau/nouveau_irq.c | 4 ---- trunk/drivers/gpu/drm/nouveau/nouveau_software.h | 1 + 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b7962c6c27eb..da772b468dbd 100644 --- 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 index 03da38373552..4f2cc95ce264 100644 --- 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 index 868c7fd74854..b2c2937531a8 100644 --- 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 index 9914cf154f65..709e5ac680ec 100644 --- 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