drm/nouveau/mmu: remove old vm creation hooks (af3b8d53) · Commits · jan.koester / Linux

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c

+1 −29

Original line number	Diff line number	Diff line
		@@ -616,31 +616,6 @@ nvkm_vm_legacy(struct nvkm_mmu *mmu, u64 offset, u64 length, u64 mm_offset,
		return 0;
		}

		int
		nvkm_vm_create(struct nvkm_mmu *mmu, u64 offset, u64 length, u64 mm_offset,
		u32 block, struct lock_class_key key, struct nvkm_vm *pvm)
		{
		static struct lock_class_key _key;
		struct nvkm_vm *vm;
		int ret;

		vm = kzalloc(sizeof(*vm), GFP_KERNEL);
		if (!vm)
		return -ENOMEM;

		__mutex_init(&vm->mutex, "&vm->mutex", key ? key : &_key);
		vm->mmu = mmu;

		ret = nvkm_vm_legacy(mmu, offset, length, mm_offset, block, vm);
		if (ret) {
		kfree(vm);
		return ret;
		}

		*pvm = vm;
		return 0;
		}

		int
		nvkm_vm_new(struct nvkm_device *device, u64 offset, u64 length, u64 mm_offset,
		struct lock_class_key key, struct nvkm_vm *pvm)
		@@ -666,10 +641,7 @@ nvkm_vm_new(struct nvkm_device *device, u64 offset, u64 length, u64 mm_offset,
		return ret;
		}

		if (!mmu->func->create)
		return -EINVAL;

		return mmu->func->create(mmu, offset, length, mm_offset, key, pvm);
		}

		static int

+0 −1

+0 −8

Original line number	Diff line number	Diff line
		@@ -190,13 +190,6 @@ gf100_vm_flush(struct nvkm_vm *vm)
		mutex_unlock(&mmu->subdev.mutex);
		}

		int
		gf100_vm_create(struct nvkm_mmu *mmu, u64 offset, u64 length, u64 mm_offset,
		struct lock_class_key key, struct nvkm_vm *pvm)
		{
		return nvkm_vm_create(mmu, offset, length, mm_offset, 4096, key, pvm);
		}

		static const struct nvkm_mmu_func
		gf100_mmu = {
		.limit = (1ULL << 40),
		@@ -204,7 +197,6 @@ gf100_mmu = {
		.pgt_bits = 27 - 12,
		.spg_shift = 12,
		.lpg_shift = 17,
		.create = gf100_vm_create,
		.map_pgt = gf100_vm_map_pgt,
		.map = gf100_vm_map,
		.map_sg = gf100_vm_map_sg,

+0 −1

+0 −1