drm/nouveau/bios/gv100: initial support

No real surprises here so far.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 3674db6..9394522 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -2397,6 +2397,7 @@ nv13b_chipset = {
 static const struct nvkm_device_chip
 nv140_chipset = {
        .name = "GV100",
+       .bios = nvkm_bios_new,
        .pci = gp100_pci_new,
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c
index 0f537c2..3634cd0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c
@@ -78,7 +78,10 @@ pramin_init(struct nvkm_bios *bios, const char *name)
         * important as we don't want to be touching vram on an
         * uninitialised board
         */
-       addr = nvkm_rd32(device, 0x619f04);
+       if (device->card_type >= GV100)
+               addr = nvkm_rd32(device, 0x625f04);
+       else
+               addr = nvkm_rd32(device, 0x619f04);
        if (!(addr & 0x00000008)) {
                nvkm_debug(subdev, "... not enabled\n");
                return ERR_PTR(-ENODEV);