Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71585545 authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Ben Skeggs
Browse files

drm/nouveau: init vblank requests list 



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>
Cc: stable@vger.kernel.org [3.5]
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0ade74b6

drivers/gpu/drm/nouveau/nouveau_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/nouveau/nouveau_irq.c

+0 −4
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/nouveau/nouveau_software.h

+1 −0
Original line number Diff line number Diff line
@@ -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