Merge drm/drm-next into drm-intel-next-queued

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_gem.c

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 50f72ae39ad897d81cef13bb87bbec618def48ca..902162c04d3593a377ad4a84d55a75453304a59c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3979,7 +3979,7 @@ static bool discard_backing_storage(struct drm_i915_gem_object *obj)
         * acquiring such a reference whilst we are in the middle of
         * freeing the object.
         */
-       return atomic_long_read(&obj->base.filp->f_count) == 1;
+       return file_count(obj->base.filp) == 1;
 }
 
 static void __i915_gem_free_objects(struct drm_i915_private *i915,