Browse Source

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>
Emil Velikov 12 years ago
parent
commit
f1aa4a1de5
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/gpu/drm/nouveau/nouveau_bios.c

+ 2 - 2
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;
 }