Commit f1aa4a1d authored by Emil Velikov's avatar Emil Velikov Committed by Ben Skeggs

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: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 708ff04b
...@@ -2008,6 +2008,8 @@ static bool NVInitVBIOS(struct drm_device *dev) ...@@ -2008,6 +2008,8 @@ static bool NVInitVBIOS(struct drm_device *dev)
legacy->data = bios->data; legacy->data = bios->data;
legacy->length = bios->size; legacy->length = bios->size;
legacy->major_version = bios->version.major;
legacy->chip_version = bios->version.chip;
if (bios->bit_offset) { if (bios->bit_offset) {
legacy->type = NVBIOS_BIT; legacy->type = NVBIOS_BIT;
legacy->offset = bios->bit_offset; legacy->offset = bios->bit_offset;
...@@ -2019,8 +2021,6 @@ static bool NVInitVBIOS(struct drm_device *dev) ...@@ -2019,8 +2021,6 @@ static bool NVInitVBIOS(struct drm_device *dev)
return !parse_bmp_structure(dev, legacy, legacy->offset); return !parse_bmp_structure(dev, legacy, legacy->offset);
} }
legacy->major_version = bios->version.major;
legacy->chip_version = bios->version.chip;
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment