drm/i915: Fix overlay frontbuffer tracking

We don't have a persistent fb holding a reference to the frontbuffer
object, so every time we do the get+put we throw the frontbuffer object
immediately away. And so the next time around we get a pristine
frontbuffer object with bits==0 even for the old vma. This confuses
the frontbuffer tracking code which understandably expects the old
frontbuffer to have the overlay's bit set.

Fix this by hanging on to the frontbuffer reference until the next
flip. And just to make this a bit more clear let's track the frontbuffer
explicitly instead of just grabbing it via the old vma.

Cc: stable@vger.kernel.org
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/1136
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210209021918.16234-2-ville.syrjala@linux.intel.com
Fixes: 8e7cb1799b4f ("drm/i915: Extract intel_frontbuffer active tracking")
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 553c23bdb4775130f333f07a51b047276bc53f79)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
index 0095c8cac9b40f1e0856151d958f26516226e25f..b73d51e766ce871e4f957a6f0a2c6e66ed428916 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_overlay.c
+++ b/drivers/gpu/drm/i915/display/intel_overlay.c
@@ -182,6 +182,7 @@ struct intel_overlay {
        struct intel_crtc *crtc;
        struct i915_vma *vma;
        struct i915_vma *old_vma;
+       struct intel_frontbuffer *frontbuffer;
        bool active;
        bool pfit_active;
        u32 pfit_vscale_ratio; /* shifted-point number, (1<<12) == 1.0 */
@@ -282,21 +283,19 @@ static void intel_overlay_flip_prepare(struct intel_overlay *overlay,
                                       struct i915_vma *vma)
 {
        enum pipe pipe = overlay->crtc->pipe;
-       struct intel_frontbuffer *from = NULL, *to = NULL;
+       struct intel_frontbuffer *frontbuffer = NULL;
 
        drm_WARN_ON(&overlay->i915->drm, overlay->old_vma);
 
-       if (overlay->vma)
-               from = intel_frontbuffer_get(overlay->vma->obj);
        if (vma)
-               to = intel_frontbuffer_get(vma->obj);
+               frontbuffer = intel_frontbuffer_get(vma->obj);
 
-       intel_frontbuffer_track(from, to, INTEL_FRONTBUFFER_OVERLAY(pipe));
+       intel_frontbuffer_track(overlay->frontbuffer, frontbuffer,
+                               INTEL_FRONTBUFFER_OVERLAY(pipe));
 
-       if (to)
-               intel_frontbuffer_put(to);
-       if (from)
-               intel_frontbuffer_put(from);
+       if (overlay->frontbuffer)
+               intel_frontbuffer_put(overlay->frontbuffer);
+       overlay->frontbuffer = frontbuffer;
 
        intel_frontbuffer_flip_prepare(overlay->i915,
                                       INTEL_FRONTBUFFER_OVERLAY(pipe));