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

[platform/kernel/linux-starfive.git] / drivers / gpu / drm / i915 / display / intel_frontbuffer.c

diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.c b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
index b2744c5..6fc6965 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
@@ -227,8 +227,10 @@ static void frontbuffer_release(struct kref *ref)
        drm_WARN_ON(obj->base.dev, atomic_read(&front->bits));
 
        spin_lock(&obj->vma.lock);
-       for_each_ggtt_vma(vma, obj)
+       for_each_ggtt_vma(vma, obj) {
+               i915_vma_clear_scanout(vma);
                vma->display_alignment = I915_GTT_MIN_ALIGNMENT;
+       }
        spin_unlock(&obj->vma.lock);
 
        RCU_INIT_POINTER(obj->frontbuffer, NULL);