| commit | 22827fa42b0baa9287ea56691f26dc45fecea049 | [log] [tgz] |
|---|---|---|
| author | Ben Skeggs <bskeggs@redhat.com> | Thu Aug 20 14:54:16 2015 +1000 |
| committer | Ben Skeggs <bskeggs@redhat.com> | Fri Aug 28 12:40:33 2015 +1000 |
| tree | 3b6186bdf6b2aa2ca79c6d13134afab4a00af8ba | |
| parent | d56241794c293ff7341d373d853e5a4e2f5de244 [diff] |
drm/nouveau/nvif: return chipset/board names from device info method Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/drivers/gpu/drm/nouveau/include/nvif/class.h b/drivers/gpu/drm/nouveau/include/nvif/class.h index f7394b9..9c25272 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/class.h +++ b/drivers/gpu/drm/nouveau/include/nvif/class.h
@@ -153,6 +153,8 @@ __u8 pad06[2]; __u64 ram_size; __u64 ram_user; + char chip[16]; + char name[64]; };
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c index c16bde4..e44d607 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
@@ -106,6 +106,8 @@ if (imem && args->v0.ram_size > 0) args->v0.ram_user = args->v0.ram_user - imem->reserved; + strncpy(args->v0.chip, device->cname, sizeof(args->v0.chip)); + strncpy(args->v0.name, device->cname, sizeof(args->v0.name)); return 0; }