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_object_types.h

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h
index 18bf4f8d6d809a169199f01e1d2703787def2bfb..ede0eb4218a81b9f1c67390afe7b2433afdf7a49 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h
@@ -13,6 +13,7 @@
 #include "i915_selftest.h"
 
 struct drm_i915_gem_object;
+struct intel_fronbuffer;
 
 /*
  * struct i915_lut_handle tracks the fast lookups from handle to vma used
@@ -114,7 +115,6 @@ struct drm_i915_gem_object {
        unsigned int userfault_count;
        struct list_head userfault_link;
 
-       struct list_head batch_pool_link;
        I915_SELFTEST_DECLARE(struct list_head st_link);
 
        /*
@@ -142,9 +142,7 @@ struct drm_i915_gem_object {
         */
        u16 write_domain;
 
-       atomic_t frontbuffer_bits;
-       unsigned int frontbuffer_ggtt_origin; /* write once */
-       struct i915_active_request frontbuffer_write;
+       struct intel_frontbuffer *frontbuffer;
 
        /** Current tiling stride for the object, if it's tiled. */
        unsigned int tiling_and_stride;
@@ -154,7 +152,6 @@ struct drm_i915_gem_object {
 
        /** Count of VMA actually bound by this object */
        atomic_t bind_count;
-       unsigned int active_count;
        /** Count of how many global VMA are currently pinned for use by HW */
        unsigned int pin_global;
 
@@ -226,9 +223,6 @@ struct drm_i915_gem_object {
                bool quirked:1;
        } mm;
 
-       /** References from framebuffers, locks out tiling changes. */
-       unsigned int framebuffer_references;
-
        /** Record of address bit 17 of each page at last unbind. */
        unsigned long *bit_17;