summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2014-09-25 02:11:16 (GMT)
committerBen Skeggs <bskeggs@redhat.com>2014-12-02 05:43:51 (GMT)
commit9b4de93bc91c482122b082ace212cb1db36ffe08 (patch)
tree510bce7b788fe4f813f2da69f2c5f752da9d0d00 /drivers/gpu/drm/nouveau
parent798dda552840ddb56dccaa5a6c601cf939192867 (diff)
downloadlinux-9b4de93bc91c482122b082ace212cb1db36ffe08.tar.xz
drm/nouveau/bios: stop after NV+NPDS+ISBN image
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/bios/image.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/image.c b/drivers/gpu/drm/nouveau/core/subdev/bios/image.c
index d91e2f3..373f9a5 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/image.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/image.c
@@ -53,10 +53,15 @@ nvbios_imagen(struct nouveau_bios *bios, struct nvbios_image *image)
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;
+ if (image->type != 0x70) {
+ if (!(data = nvbios_npdeTp(bios, image->base, &npde)))
+ return true;
+ image->size = npde.image_size;
+ image->last = npde.last;
+ } else {
+ image->last = true;
+ }
+
return true;
}