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 f7394b9a1047b8ae0edf9af1b041830c4e0ddcef..9c25272b4b793f91a09f14dabc7eb5a6cec9ed35 100644 (file)
--- 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 c16bde41c279aba0b0c31fd34ee9b6e12f4098fc..e44d60739b56ee3e3127a331c0218816f855da69 100644 (file)
--- 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;
 }