diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2012-12-07 17:26:44 +0000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-02-20 16:00:30 +1000 |
| commit | f1aa4a1de5e13b794a7e31efc0b3ddcda6926c56 (patch) | |
| tree | 8389117aa8bff0a16cb730026a60fb9869090dc7 /drivers | |
| parent | 708ff04b137f1ec233b9e82cb4852ee53ad26f9f (diff) | |
| download | linux-3.10-f1aa4a1de5e13b794a7e31efc0b3ddcda6926c56.tar.gz linux-3.10-f1aa4a1de5e13b794a7e31efc0b3ddcda6926c56.tar.bz2 linux-3.10-f1aa4a1de5e13b794a7e31efc0b3ddcda6926c56.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index 5e1cfcacb14..235de99ae37 100644 --- 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; } |