drm/nouveau: init vblank requests list

commit 715855457e6bc93e148caf8cb3b5dcabbf605b0d upstream.

Fixes kernel panic when vblank interrupt triggers before first sync to
vblank request.

(Besides init, remove some relevant leftovers from vblank rework)

Reported-by: Ortwin Glück <odi@odi.ch>
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 8613cb23808c585ef35175f4d4305f1c739d1add..b863a3a92ebef6dd2952004848aa7ce4c559a520 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/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/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
index 868c7fd74854dae082581177858a48fe847b1ff1..b2c2937531a80e04854f287ca904369d346e148b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/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/drivers/gpu/drm/nouveau/nouveau_software.h b/drivers/gpu/drm/nouveau/nouveau_software.h
index e60bc6ce90034b1eb2893092db09a21df0479bc8..b507a92fa274a2c5522719c6f85bfbaf6b042b57 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_software.h
+++ b/drivers/gpu/drm/nouveau/nouveau_software.h
@@ -38,6 +38,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