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

Commit ee62249d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes 

Thought I'd try my luck getting one more in:
- Two fixes for Tegra (one is to common code, but our userspace doesn't hit it).
- One for NV5x-class MCPs

* 'linux-4.15' of git://github.com/skeggsb/linux:
  drm/nouveau/mmu/mcp77: fix regressions in stolen memory handling
  drm/nouveau/bar/gk20a: Avoid bar teardown during init
  drm/nouveau/drm/nouveau: Pass the proper arguments to nvif_object_map_handle()
parents 75f195f4 2ffa64eb

drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ int nv41_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **); 
int nv44_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int nv50_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int g84_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int mcp77_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gf100_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gk104_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gk20a_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

drivers/gpu/drm/nouveau/nouveau_bo.c

+3 −1
Original line number Diff line number Diff line
@@ -1447,11 +1447,13 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) 
				args.nv50.ro = 0;

				args.nv50.kind = mem->kind;

				args.nv50.comp = mem->comp;

				argc = sizeof(args.nv50);

				break;

			case NVIF_CLASS_MEM_GF100:

				args.gf100.version = 0;

				args.gf100.ro = 0;

				args.gf100.kind = mem->kind;

				argc = sizeof(args.gf100);

				break;

			default:

				WARN_ON(1);
@@ -1459,7 +1461,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) 
			}



			ret = nvif_object_map_handle(&mem->mem.object,

						     &argc, argc,

						     &args, argc,

						     &handle, &length);

			if (ret != 1)

				return ret ? ret : -EINVAL;

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+2 −2
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ nvaa_chipset = { 
	.i2c = g94_i2c_new,

	.imem = nv50_instmem_new,

	.mc = g98_mc_new,

	.mmu = g84_mmu_new,

	.mmu = mcp77_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = g94_pci_new,

	.therm = g84_therm_new,
@@ -1283,7 +1283,7 @@ nvac_chipset = { 
	.i2c = g94_i2c_new,

	.imem = nv50_instmem_new,

	.mc = g98_mc_new,

	.mmu = g84_mmu_new,

	.mmu = mcp77_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = g94_pci_new,

	.therm = g84_therm_new,

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

+2 −1
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static int 
nvkm_bar_fini(struct nvkm_subdev *subdev, bool suspend)

{

	struct nvkm_bar *bar = nvkm_bar(subdev);

	if (bar->func->bar1.fini)

		bar->func->bar1.fini(bar);

	return 0;

}

drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ gk20a_bar_func = { 
	.dtor = gf100_bar_dtor,

	.oneinit = gf100_bar_oneinit,

	.bar1.init = gf100_bar_bar1_init,

	.bar1.fini = gf100_bar_bar1_fini,

	.bar1.wait = gf100_bar_bar1_wait,

	.bar1.vmm = gf100_bar_bar1_vmm,

	.flush = g84_bar_flush,