Merge tag 'usercopy-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

[linux.git] / drivers / gpu / drm / i915 / gem / i915_gem_context_types.h

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
index cc513410eeef57791925df8bda3b752df8336468..260d59cc3de8436290263938586f6774a6b5a12e 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
@@ -26,7 +26,7 @@ struct pid;
 struct drm_i915_private;
 struct drm_i915_file_private;
 struct i915_address_space;
-struct i915_timeline;
+struct intel_timeline;
 struct intel_ring;
 
 struct i915_gem_engines {
@@ -77,7 +77,7 @@ struct i915_gem_context {
        struct i915_gem_engines __rcu *engines;
        struct mutex engines_mutex; /* guards writes to engines */
 
-       struct i915_timeline *timeline;
+       struct intel_timeline *timeline;
 
        /**
         * @vm: unique address space (GTT)
@@ -169,11 +169,6 @@ struct i915_gem_context {
 
        struct i915_sched_attr sched;
 
-       /** ring_size: size for allocating the per-engine ring buffer */
-       u32 ring_size;
-       /** desc_template: invariant fields for the HW context descriptor */
-       u32 desc_template;
-
        /** guilty_count: How many times this context has caused a GPU hang. */
        atomic_t guilty_count;
        /**