Revert "drm/i915/gvt: Refine broken PPGTT scratch"

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / gvt / gtt.h

diff --git a/drivers/gpu/drm/i915/gvt/gtt.h b/drivers/gpu/drm/i915/gvt/gtt.h
index 416b2f868cf09289d725247664233a5b37225351..f98c1c19b4cb47324697cab8b51995979068e1ca 100644 (file)
--- 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;