mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-09 21:04:42 -04:00
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>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user