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

drm/nouveau/device: store revision 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2014-11-17 22:56:37 +10:00
parent 373535431b
commit 3704791d97
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/core/engine/device/base.c
View File

@ -138,7 +138,7 @@ nouveau_devobj_info(struct nouveau_object *object, void *data, u32 size)
} }
args->v0.chipset = device->chipset; 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; if (pfb) args->v0.ram_size = args->v0.ram_user = pfb->ram->size;
else args->v0.ram_size = args->v0.ram_user = 0; else args->v0.ram_size = args->v0.ram_user = 0;
if (imem) args->v0.ram_user = args->v0.ram_user - imem->reserved; 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 */ /* determine chipset and derive architecture from it */
if ((boot0 & 0x1f000000) > 0) { if ((boot0 & 0x1f000000) > 0) {
device->chipset = (boot0 & 0x1ff00000) >> 20; device->chipset = (boot0 & 0x1ff00000) >> 20;
device->chiprev = (boot0 & 0x000000ff);
switch (device->chipset & 0x1f0) { switch (device->chipset & 0x1f0) {
case 0x010: { case 0x010: {
if (0x461 & (1 << (device->chipset & 0xf))) if (0x461 & (1 << (device->chipset & 0xf)))
device->card_type = NV_10; device->card_type = NV_10;
else else
device->card_type = NV_11; device->card_type = NV_11;
device->chiprev = 0x00;
break; break;
} }
case 0x020: device->card_type = NV_20; break; case 0x020: device->card_type = NV_20; break;

1
drivers/gpu/drm/nouveau/core/include/core/device.h
View File

@ -92,6 +92,7 @@ struct nouveau_device {
GM100 = 0x110, GM100 = 0x110,
} card_type; } card_type;
u32 chipset; u32 chipset;
u8 chiprev;
u32 crystal; u32 crystal;
struct nouveau_oclass *oclass[NVDEV_SUBDEV_NR]; struct nouveau_oclass *oclass[NVDEV_SUBDEV_NR];