drm/nouveau/bios: use NPDE to locate images beyond those defined by PCIR

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

diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/image.c b/drivers/gpu/drm/nouveau/core/subdev/bios/image.c
index dd8fd2f4263b45acf521e207aba5085a36ee3024..df85cc6d0fc7ee36ae2cf066ea31434a197c2b38 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/image.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/image.c
@@ -25,11 +25,13 @@
 #include <subdev/bios.h>
 #include <subdev/bios/image.h>
 #include <subdev/bios/pcir.h>
+#include <subdev/bios/npde.h>
 
 static bool
 nvbios_imagen(struct nouveau_bios *bios, struct nvbios_image *image)
 {
        struct nvbios_pcirT pcir;
+       struct nvbios_npdeT npde;
        u8  ver;
        u16 hdr;
        u32 data;
@@ -48,6 +50,11 @@ nvbios_imagen(struct nouveau_bios *bios, struct nvbios_image *image)
        image->size = pcir.image_size;
        image->type = pcir.image_type;
        image->last = pcir.last;
+
+       if (!(data = nvbios_npdeTp(bios, image->base, &npde)))
+               return true;
+       image->size = npde.image_size;
+       image->last = npde.last;
        return true;
 }