From: Jani Nikula <jani.nikula@intel.com>
Date: Thu, 11 Mar 2021 06:19:46 +0000 (+0200)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Tag: Ubuntu-5.13.0-19.19~3440^2~13^2~11
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=35bb28ece90dfb7f72b77ba529f25f79323d9581;p=mirror_ubuntu-jammy-kernel.git

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

Sync up with upstream.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---

35bb28ece90dfb7f72b77ba529f25f79323d9581
diff --cc drivers/gpu/drm/i915/display/intel_frontbuffer.c
index b2744c5c3653,7b38eee9980f..6fc6965b6133
--- a/drivers/gpu/drm/i915/display/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
@@@ -224,11 -224,11 +224,13 @@@ static void frontbuffer_release(struct 
  	struct drm_i915_gem_object *obj = front->obj;
  	struct i915_vma *vma;
  
 +	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);