UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Emil Velikov 2012-12-07 17:26:44 +00:00 committed by Ben Skeggs
parent 708ff04b13
commit f1aa4a1de5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/nouveau_bios.c
View File

@ -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;
}