diff options
| author | Mark Brown <broonie@kernel.org> | 2020-06-17 14:39:12 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-06-17 14:39:12 +0300 |
| commit | 6870112c46c867f50cd27570860a05bd82614b5c (patch) | |
| tree | bd9f13f6ab25072809564460a34bf0fb40900069 /drivers/gpu/drm/i915/gem/i915_gem_object_types.h | |
| parent | 6f1cf5257acc6e6242ddf2f52bc7912aed77b79f (diff) | |
| parent | b3a9e3b9622ae10064826dccb4f7a52bd88c7407 (diff) | |
| download | linux-6870112c46c867f50cd27570860a05bd82614b5c.tar.xz | |
Merge tag 'v5.8-rc1' into regulator-5.8
Linux 5.8-rc1
Diffstat (limited to 'drivers/gpu/drm/i915/gem/i915_gem_object_types.h')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 |
1 files changed, 0 insertions, 3 deletions
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 a0b10bcd8d8a..54ee658bb168 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h @@ -179,9 +179,6 @@ struct drm_i915_gem_object { #define TILING_MASK (FENCE_MINIMUM_STRIDE - 1) #define STRIDE_MASK (~TILING_MASK) - /** Count of VMA actually bound by this object */ - atomic_t bind_count; - struct { /* * Protects the pages and their use. Do not use directly, but |