Commit d979ab97 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/core/mm: modify test for if building a mm with holes in it 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 79456e1a

drivers/gpu/drm/nouveau/core/core/mm.c

+3 −1
Original line number Diff line number Diff line
@@ -211,7 +211,9 @@ nouveau_mm_init(struct nouveau_mm *mm, u32 offset, u32 length, u32 block) 
{

	struct nouveau_mm_node *node;



	if (block) {

	if (nouveau_mm_initialised(mm)) {

		BUG_ON(block != mm->block_size);

	} else {

		INIT_LIST_HEAD(&mm->nodes);

		INIT_LIST_HEAD(&mm->free);

		mm->block_size = block;

drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ nvc0_ram_create_(struct nouveau_object *parent, struct nouveau_object *engine, 
		offset = (0x0200000000ULL >> 12) + (bsize << 8);

		length = (ram->size >> 12) - ((bsize * parts) << 8) - rsvd_tail;



		ret = nouveau_mm_init(&pfb->vram, offset, length, 0);

		ret = nouveau_mm_init(&pfb->vram, offset, length, 1);

		if (ret)

			nouveau_mm_fini(&pfb->vram);

	}