From: Emil Velikov Date: Fri, 7 Dec 2012 17:26:44 +0000 (+0000) Subject: drm/nouveau: set legacy bios data before parsing the structure X-Git-Tag: v3.9~351^2~10^2~61 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1aa4a1de5e13b794a7e31efc0b3ddcda6926c56;p=platform%2Fkernel%2Flinux-amlogic.git 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 Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index 5e1cfca..235de99 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; }