diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 47ce220f4..ebe2dca4c 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -2014,6 +2014,13 @@ int gk20a_init_gpu_characteristics(struct gk20a *g)
 
 	gpu->local_video_memory_size = g->mm.vidmem.size;
 
+	gpu->pci_vendor_id = g->pci_vendor_id;
+	gpu->pci_device_id = g->pci_device_id;
+	gpu->pci_subsystem_vendor_id = g->pci_subsystem_vendor_id;
+	gpu->pci_subsystem_device_id = g->pci_subsystem_device_id;
+	gpu->pci_class = g->pci_class;
+	gpu->pci_revision = g->pci_revision;
+
 	return 0;
 }
 
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 721703621..b534389ef 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -908,6 +908,12 @@ struct gk20a {
 	struct debugfs_blob_wrapper bios_blob;
 
 	struct gk20a_ce_app ce_app;
+
+	/* PCI device identifier */
+	u16 pci_vendor_id, pci_device_id;
+	u16 pci_subsystem_vendor_id, pci_subsystem_device_id;
+	u16 pci_class;
+	u8 pci_revision;
 };
 
 static inline unsigned long gk20a_get_gr_idle_timeout(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/pci.c b/drivers/gpu/nvgpu/pci.c
index a67bbd54f..7641c7bec 100644
--- a/drivers/gpu/nvgpu/pci.c
+++ b/drivers/gpu/nvgpu/pci.c
@@ -201,6 +201,13 @@ static int nvgpu_pci_probe(struct pci_dev *pdev,
 		return err;
 	pci_set_master(pdev);
 
+	g->pci_vendor_id = pdev->vendor;
+	g->pci_device_id = pdev->device;
+	g->pci_subsystem_vendor_id = pdev->subsystem_vendor;
+	g->pci_subsystem_device_id = pdev->subsystem_device;
+	g->pci_class = (pdev->class >> 8) & 0xFFFFU; // we only want base/sub
+	g->pci_revision = pdev->revision;
+
 	g->irq_stall = pdev->irq;
 	g->irq_nonstall = pdev->irq;
 	if (g->irq_stall < 0)
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h
index 66ea05b3f..fe4e6de9a 100644
--- a/include/uapi/linux/nvgpu.h
+++ b/include/uapi/linux/nvgpu.h
@@ -198,6 +198,13 @@ struct nvgpu_gpu_characteristics {
 
 	__u64 local_video_memory_size; /* in bytes, non-zero only for dGPUs */
 
+	/* These are meaningful only for PCI devices */
+	__u16 pci_vendor_id, pci_device_id;
+	__u16 pci_subsystem_vendor_id, pci_subsystem_device_id;
+	__u16 pci_class;
+	__u8  pci_revision;
+	__u8  reserved2[5];
+
 	/* Notes:
 	   - This struct can be safely appended with new fields. However, always
 	     keep the structure size multiple of 8 and make sure that the binary