Commit 4e83939a authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Greg Kroah-Hartman

drm/nouveau: init vblank requests list

commit 71585545 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: default avatarOrtwin Glück <odi@odi.ch>
Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9445d24c
...@@ -689,8 +689,6 @@ struct drm_nouveau_private { ...@@ -689,8 +689,6 @@ struct drm_nouveau_private {
void (*irq_handler[32])(struct drm_device *); void (*irq_handler[32])(struct drm_device *);
bool msi_enabled; bool msi_enabled;
struct list_head vbl_waiting;
struct { struct {
struct drm_global_reference mem_global_ref; struct drm_global_reference mem_global_ref;
struct ttm_bo_global_ref bo_global_ref; struct ttm_bo_global_ref bo_global_ref;
......
...@@ -41,12 +41,8 @@ ...@@ -41,12 +41,8 @@
void void
nouveau_irq_preinstall(struct drm_device *dev) nouveau_irq_preinstall(struct drm_device *dev)
{ {
struct drm_nouveau_private *dev_priv = dev->dev_private;
/* Master disable */ /* Master disable */
nv_wr32(dev, NV03_PMC_INTR_EN_0, 0); nv_wr32(dev, NV03_PMC_INTR_EN_0, 0);
INIT_LIST_HEAD(&dev_priv->vbl_waiting);
} }
int int
......
...@@ -38,6 +38,7 @@ static inline void ...@@ -38,6 +38,7 @@ static inline void
nouveau_software_context_new(struct nouveau_software_chan *pch) nouveau_software_context_new(struct nouveau_software_chan *pch)
{ {
INIT_LIST_HEAD(&pch->flip); INIT_LIST_HEAD(&pch->flip);
INIT_LIST_HEAD(&pch->vblank.list);
} }
static inline void static inline void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment