diff options
| author |   Christoph Hellwig <hch@lst.de> | 2022-04-11 16:13:39 +0200 |
|---|---|---|
| committer |   Zhi Wang <zhi.a.wang@intel.com> | 2022-04-21 07:36:56 -0400 |
| commit | 62980cacc37f58bd054de012d08052dfc4f5fa48 (patch) | |
| tree | 216624d693850ef1a7bc2e4b6aefa33d936395c3 /drivers/gpu/drm/i915/gvt/vgpu.c | |
| parent | drm/i915/gvt: remove the unused from_virt_to_mfn op (diff) | |
| download | wireguard-linux-62980cacc37f58bd054de012d08052dfc4f5fa48.tar.xz wireguard-linux-62980cacc37f58bd054de012d08052dfc4f5fa48.zip | |
drm/i915/gvt: merge struct kvmgt_vdev into struct intel_vgpu
Move towards having only a single structure for the per-VGPU state.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20220411141403.86980-11-hch@lst.de
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Zhi Wang <zhi.a.wang@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/vgpu.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/vgpu.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/gvt/vgpu.c b/drivers/gpu/drm/i915/gvt/vgpu.c index 8dddd0a940a1..fd335a7bcb84 100644 --- a/drivers/gpu/drm/i915/gvt/vgpu.c +++ b/drivers/gpu/drm/i915/gvt/vgpu.c @@ -405,13 +405,9 @@ static struct intel_vgpu *__intel_gvt_create_vgpu(struct intel_gvt *gvt, populate_pvinfo_page(vgpu); - ret = intel_gvt_hypervisor_attach_vgpu(vgpu); - if (ret) - goto out_clean_vgpu_resource; - ret = intel_vgpu_init_gtt(vgpu); if (ret) - goto out_detach_hypervisor_vgpu; + goto out_clean_vgpu_resource; ret = intel_vgpu_init_opregion(vgpu); if (ret) @@ -454,8 +450,6 @@ out_clean_opregion: intel_vgpu_clean_opregion(vgpu); out_clean_gtt: intel_vgpu_clean_gtt(vgpu); -out_detach_hypervisor_vgpu: - intel_gvt_hypervisor_detach_vgpu(vgpu); out_clean_vgpu_resource: intel_vgpu_free_resource(vgpu); out_clean_vgpu_mmio: |