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()

diff --combined drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
index 0760b93e9d1fd84a7833c3247a2bc4e9cec069e7,542b7095b02674006aaafe395257a760af6967e8..baab93398e54a51f84a1cac5fb71af629d52b2eb
--- 1/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
--- 2/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
@@@ -1,4 -1,3 +1,4 @@@
 +/* SPDX-License-Identifier: GPL-2.0 */
  #ifndef __NVKM_MMU_H__
  #define __NVKM_MMU_H__
  #include <core/subdev.h>
@@@ -121,6 -120,7 +121,7 @@@ int nv41_mmu_new(struct nvkm_device *, 
  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 **);