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

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

drm/nouveau/drm: fix crash in vram manager debug callback 



It's probably impossible to hit it now on mainline kernel.
I only noticed it because one of my debugging patches uses it.

Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent fffeba2a

drivers/gpu/drm/nouveau/nouveau_ttm.c

+6 −3
Original line number Diff line number Diff line
@@ -35,14 +35,16 @@ 
static int

nouveau_vram_manager_init(struct ttm_mem_type_manager *man, unsigned long psize)

{

	/* nothing to do */

	struct nouveau_drm *drm = nouveau_bdev(man->bdev);

	struct nouveau_fb *pfb = nouveau_fb(drm->device);

	man->priv = pfb;

	return 0;

}



static int

nouveau_vram_manager_fini(struct ttm_mem_type_manager *man)

{

	/* nothing to do */

	man->priv = NULL;

	return 0;

}
@@ -104,7 +106,8 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man, 
static void

nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)

{

	struct nouveau_mm *mm = man->priv;

	struct nouveau_fb *pfb = man->priv;

	struct nouveau_mm *mm = &pfb->vram;

	struct nouveau_mm_node *r;

	u32 total = 0, free = 0;