drm/nouveau: set legacy bios data before parsing the structure

Commit 767baf82 drm/nouveau: remove some more unnecessary legacy bios code

has introduced a regression my misplacing the code that sets the major/chip
versions, which are used whist parsing the bmp/bit structure in vbios

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 5e1cfcacb140b020b1234b0c0c6833350e1e6f55..235de99ae37a524842eae7c0fcf84c667717fad5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -2008,6 +2008,8 @@ static bool NVInitVBIOS(struct drm_device *dev)
 
        legacy->data = bios->data;
        legacy->length = bios->size;
+       legacy->major_version = bios->version.major;
+       legacy->chip_version = bios->version.chip;
        if (bios->bit_offset) {
                legacy->type = NVBIOS_BIT;
                legacy->offset = bios->bit_offset;
@@ -2019,8 +2021,6 @@ static bool NVInitVBIOS(struct drm_device *dev)
                return !parse_bmp_structure(dev, legacy, legacy->offset);
        }
 
-       legacy->major_version = bios->version.major;
-       legacy->chip_version = bios->version.chip;
        return false;
 }