i915/gvt: Use the initial HW state snapshot saved in i915

The code of saving initial HW state snapshot has been moved into i915.
Let the GVT-g core logic use that snapshot.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Vivi Rodrigo <rodrigo.vivi@intel.com>
Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: Zhi Wang <zhi.a.wang@intel.com>
Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20220407071945.72148-4-zhi.a.wang@intel.com

diff --git a/drivers/gpu/drm/i915/gvt/firmware.c b/drivers/gpu/drm/i915/gvt/firmware.c
index 1a8274a..54fe442 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/firmware.c
+++ b/drivers/gpu/drm/i915/gvt/firmware.c
@@ -66,22 +66,16 @@ static struct bin_attribute firmware_attr = {
        .mmap = NULL,
 };
 
-static int mmio_snapshot_handler(struct intel_gvt *gvt, u32 offset, void *data)
-{
-       *(u32 *)(data + offset) = intel_uncore_read_notrace(gvt->gt->uncore,
-                                                           _MMIO(offset));
-       return 0;
-}
-
 static int expose_firmware_sysfs(struct intel_gvt *gvt)
 {
        struct intel_gvt_device_info *info = &gvt->device_info;
-       struct pci_dev *pdev = to_pci_dev(gvt->gt->i915->drm.dev);
+       struct drm_i915_private *i915 = gvt->gt->i915;
+       struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
        struct gvt_firmware_header *h;
        void *firmware;
        void *p;
        unsigned long size, crc32_start;
-       int i, ret;
+       int ret;
 
        size = sizeof(*h) + info->mmio_size + info->cfg_space_size;
        firmware = vzalloc(size);
@@ -99,17 +93,16 @@ static int expose_firmware_sysfs(struct intel_gvt *gvt)
 
        p = firmware + h->cfg_space_offset;
 
-       for (i = 0; i < h->cfg_space_size; i += 4)
-               pci_read_config_dword(pdev, i, p + i);
-
-       memcpy(gvt->firmware.cfg_space, p, info->cfg_space_size);
+       memcpy(gvt->firmware.cfg_space, i915->vgpu.initial_cfg_space,
+              info->cfg_space_size);
+       memcpy(p, gvt->firmware.cfg_space, info->cfg_space_size);
 
        p = firmware + h->mmio_offset;
 
-       /* Take a snapshot of hw mmio registers. */
-       intel_gvt_for_each_tracked_mmio(gvt, mmio_snapshot_handler, p);
+       memcpy(gvt->firmware.mmio, i915->vgpu.initial_mmio,
+              info->mmio_size);
 
-       memcpy(gvt->firmware.mmio, p, info->mmio_size);
+       memcpy(p, gvt->firmware.mmio, info->mmio_size);
 
        crc32_start = offsetof(struct gvt_firmware_header, crc32) + 4;
        h->crc32 = crc32_le(0, firmware + crc32_start, size - crc32_start);