diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-12-10 21:49:18 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-12-23 07:59:28 -0500 |
commit | 0dd660d4ab9ceb48f24f4df2ebab3e73d908a1e8 (patch) | |
tree | 71df50093e12fd8693c09e52fbfede9d70546706 /drivers/gpu | |
parent | 1ed731668d011d0ee894d949b80dc3d11fc9ef75 (diff) |
drm/nouveau/bios: parse/display extra version component
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/nouveau/core/include/subdev/bios.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/bios/base.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/bios.h b/drivers/gpu/drm/nouveau/core/include/subdev/bios.h index d145b25e6be4..5bd1ca8cd20d 100644 --- a/drivers/gpu/drm/nouveau/core/include/subdev/bios.h +++ b/drivers/gpu/drm/nouveau/core/include/subdev/bios.h | |||
@@ -17,6 +17,7 @@ struct nouveau_bios { | |||
17 | u8 chip; | 17 | u8 chip; |
18 | u8 minor; | 18 | u8 minor; |
19 | u8 micro; | 19 | u8 micro; |
20 | u8 patch; | ||
20 | } version; | 21 | } version; |
21 | }; | 22 | }; |
22 | 23 | ||
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c index dd111947eb86..f621f69fa1a2 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c | |||
@@ -447,6 +447,7 @@ nouveau_bios_ctor(struct nouveau_object *parent, | |||
447 | bios->version.chip = nv_ro08(bios, bit_i.offset + 2); | 447 | bios->version.chip = nv_ro08(bios, bit_i.offset + 2); |
448 | bios->version.minor = nv_ro08(bios, bit_i.offset + 1); | 448 | bios->version.minor = nv_ro08(bios, bit_i.offset + 1); |
449 | bios->version.micro = nv_ro08(bios, bit_i.offset + 0); | 449 | bios->version.micro = nv_ro08(bios, bit_i.offset + 0); |
450 | bios->version.patch = nv_ro08(bios, bit_i.offset + 4); | ||
450 | } else | 451 | } else |
451 | if (bmp_version(bios)) { | 452 | if (bmp_version(bios)) { |
452 | bios->version.major = nv_ro08(bios, bios->bmp_offset + 13); | 453 | bios->version.major = nv_ro08(bios, bios->bmp_offset + 13); |
@@ -455,9 +456,9 @@ nouveau_bios_ctor(struct nouveau_object *parent, | |||
455 | bios->version.micro = nv_ro08(bios, bios->bmp_offset + 10); | 456 | bios->version.micro = nv_ro08(bios, bios->bmp_offset + 10); |
456 | } | 457 | } |
457 | 458 | ||
458 | nv_info(bios, "version %02x.%02x.%02x.%02x\n", | 459 | nv_info(bios, "version %02x.%02x.%02x.%02x.%02x\n", |
459 | bios->version.major, bios->version.chip, | 460 | bios->version.major, bios->version.chip, |
460 | bios->version.minor, bios->version.micro); | 461 | bios->version.minor, bios->version.micro, bios->version.patch); |
461 | 462 | ||
462 | return 0; | 463 | return 0; |
463 | } | 464 | } |