diff options
author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2017-11-02 12:44:52 +0300 |
---|---|---|
committer | Zhenyu Wang <zhenyuw@linux.intel.com> | 2017-11-16 06:48:35 +0300 |
commit | 5c35258de6cfc0829803fe9f9869253a4e600925 (patch) | |
tree | 02ae05ee86606dd6ade4d88a19eeb62c084faed5 /drivers/gpu/drm/i915/gvt/gtt.h | |
parent | c4270d122ccff963a021d1beb893d6192336af96 (diff) | |
download | linux-5c35258de6cfc0829803fe9f9869253a4e600925.tar.xz |
Revert "drm/i915/gvt: Refine broken PPGTT scratch"
This reverts commit b20d09886fd1b74cd2255d846029a049e524db14.
This caused windows driver boot errors for invalid page address.
Revert for now.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: Zhi Wang <zhi.a.wang@intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/gtt.h')
-rw-r--r-- | drivers/gpu/drm/i915/gvt/gtt.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/gvt/gtt.h b/drivers/gpu/drm/i915/gvt/gtt.h index 416b2f868cf0..f98c1c19b4cb 100644 --- a/drivers/gpu/drm/i915/gvt/gtt.h +++ b/drivers/gpu/drm/i915/gvt/gtt.h @@ -188,12 +188,9 @@ extern void intel_vgpu_destroy_mm(struct kref *mm_ref); struct intel_vgpu_guest_page; -struct intel_vgpu_shadow_page { - void *vaddr; +struct intel_vgpu_scratch_pt { struct page *page; - int type; - struct hlist_node node; - unsigned long mfn; + unsigned long page_mfn; }; struct intel_vgpu_gtt { @@ -205,7 +202,7 @@ struct intel_vgpu_gtt { atomic_t n_tracked_guest_page; struct list_head oos_page_list_head; struct list_head post_shadow_list_head; - struct intel_vgpu_shadow_page ppgtt_scratch_page[GTT_TYPE_MAX]; + struct intel_vgpu_scratch_pt scratch_pt[GTT_TYPE_MAX]; }; extern int intel_vgpu_init_gtt(struct intel_vgpu *vgpu); @@ -221,6 +218,14 @@ extern struct intel_vgpu_mm *intel_gvt_find_ppgtt_mm(struct intel_vgpu *vgpu, struct intel_vgpu_oos_page; +struct intel_vgpu_shadow_page { + void *vaddr; + struct page *page; + int type; + struct hlist_node node; + unsigned long mfn; +}; + struct intel_vgpu_page_track { struct hlist_node node; bool tracked; |