Merge tag 'drm-intel-gt-next-2021-04-06' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / gt / intel_timeline_types.h

diff --git a/drivers/gpu/drm/i915/gt/intel_timeline_types.h b/drivers/gpu/drm/i915/gt/intel_timeline_types.h
index 9f677c9..74e67db 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_timeline_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_timeline_types.h
@@ -17,7 +17,6 @@
 struct i915_vma;
 struct i915_syncmap;
 struct intel_gt;
-struct intel_timeline_hwsp;
 
 struct intel_timeline {
        u64 fence_context;
@@ -44,12 +43,11 @@ struct intel_timeline {
        atomic_t pin_count;
        atomic_t active_count;
 
+       void *hwsp_map;
        const u32 *hwsp_seqno;
        struct i915_vma *hwsp_ggtt;
        u32 hwsp_offset;
 
-       struct intel_timeline_cacheline *hwsp_cacheline;
-
        bool has_initial_breadcrumb;
 
        /**
@@ -66,6 +64,8 @@ struct intel_timeline {
         */
        struct i915_active_fence last_request;
 
+       struct i915_active active;
+
        /** A chain of completed timelines ready for early retirement. */
        struct intel_timeline *retire;
 
@@ -89,15 +89,4 @@ struct intel_timeline {
        struct rcu_head rcu;
 };
 
-struct intel_timeline_cacheline {
-       struct i915_active active;
-
-       struct intel_timeline_hwsp *hwsp;
-       void *vaddr;
-
-       u32 ggtt_offset;
-
-       struct rcu_head rcu;
-};
-
 #endif /* __I915_TIMELINE_TYPES_H__ */