drm/nouveau/device: store revision

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/drm/nouveau/core/engine/device/base.c b/drivers/gpu/drm/nouveau/core/engine/device/base.c
index 786119e633e9..9262f27904c8 100644
--- a/drivers/gpu/drm/nouveau/core/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/core/engine/device/base.c
@@ -138,7 +138,7 @@ nouveau_devobj_info(struct nouveau_object *object, void *data, u32 size)
         }
 
         args->v0.chipset  = device->chipset;
-        args->v0.revision = device->chipset >= 0x10 ? nv_rd32(device, 0) : 0x00;
+        args->v0.revision = device->chiprev;
         if (pfb)  args->v0.ram_size = args->v0.ram_user = pfb->ram->size;
         else      args->v0.ram_size = args->v0.ram_user = 0;
         if (imem) args->v0.ram_user = args->v0.ram_user - imem->reserved;
@@ -354,12 +354,14 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
                 /* determine chipset and derive architecture from it */
                 if ((boot0 & 0x1f000000) > 0) {
                         device->chipset = (boot0 & 0x1ff00000) >> 20;
+                        device->chiprev = (boot0 & 0x000000ff);
                         switch (device->chipset & 0x1f0) {
                         case 0x010: {
                                 if (0x461 & (1 << (device->chipset & 0xf)))
                                         device->card_type = NV_10;
                                 else
                                         device->card_type = NV_11;
+                                device->chiprev = 0x00;
                                 break;
                         }
                         case 0x020: device->card_type = NV_20; break;
diff --git a/drivers/gpu/drm/nouveau/core/include/core/device.h b/drivers/gpu/drm/nouveau/core/include/core/device.h
index 0d839e1ddaf4..0e0ce436600f 100644
--- a/drivers/gpu/drm/nouveau/core/include/core/device.h
+++ b/drivers/gpu/drm/nouveau/core/include/core/device.h
@@ -92,6 +92,7 @@ struct nouveau_device {
                 GM100    = 0x110,
         } card_type;
         u32 chipset;
+        u8  chiprev;
         u32 crystal;
 
         struct nouveau_oclass *oclass[NVDEV_SUBDEV_NR];