From: Ben Skeggs Date: Thu, 20 Aug 2015 04:54:16 +0000 (+1000) Subject: drm/nouveau/nvif: return chipset/board names from device info method X-Git-Tag: firefly_0821_release~176^2~1083^2^2~95 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=22827fa42b0baa9287ea56691f26dc45fecea049;p=firefly-linux-kernel-4.4.55.git drm/nouveau/nvif: return chipset/board names from device info method Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/include/nvif/class.h b/drivers/gpu/drm/nouveau/include/nvif/class.h index f7394b9a1047..9c25272b4b79 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/class.h +++ b/drivers/gpu/drm/nouveau/include/nvif/class.h @@ -153,6 +153,8 @@ struct nv_device_info_v0 { __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 c16bde41c279..e44d60739b56 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 @@ nvkm_udevice_info(struct nvkm_object *object, void *data, u32 size) 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; }