[PATCH v2 13/15] drm/xe/display: Use async flip for flipping initial fb.

[Maarten Lankhorst]

Since memirq requires a ggtt allocation, irqs will be initialised
later. This means we cannot rely on drm_wait_for_vblank any more as
it requires interrupts.

Fortunately there's still SURFLIVE

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
 drivers/gpu/drm/xe/display/xe_plane_initial.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c b/drivers/gpu/drm/xe/display/xe_plane_initial.c
index 4660db0aecb68..3fd0fe2dbc27a 100644
--- a/drivers/gpu/drm/xe/display/xe_plane_initial.c
+++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c
@@ -17,6 +17,8 @@
 #include "intel_fb_pin.h"
 #include "intel_frontbuffer.h"
 #include "intel_plane_initial.h"
+#include "intel_uncore.h"
+#include "skl_universal_plane_regs.h"
 #include "xe_bo.h"
 #include "xe_wa.h"
 
@@ -187,6 +189,7 @@ static void
 intel_find_initial_plane_obj(struct intel_crtc *crtc,
 			     struct intel_initial_plane_config plane_configs[])
 {
+	struct xe_device *xe = to_xe_device(crtc->base.dev);
 	struct intel_initial_plane_config *plane_config =
 		&plane_configs[crtc->pipe];
 	struct intel_plane *plane =
@@ -235,6 +238,14 @@ intel_find_initial_plane_obj(struct intel_crtc *crtc,
 	plane_state->uapi.crtc = &crtc->base;
 	intel_plane_copy_uapi_to_hw_state(plane_state, plane_state, crtc);
 
+	/* Flip async, we don't have interrupts yet */
+	plane_state->ctl = intel_uncore_read(&xe->uncore, PLANE_CTL(plane->pipe, PLANE_1));
+	plane->async_flip(plane, to_intel_crtc_state(crtc->base.state), plane_state, true);
+
+	/* Wait 40 ms (1 frame at 25 fps) for async flip to complete */
+	if (intel_wait_for_register_fw(&xe->uncore, PLANE_SURFLIVE(plane->pipe, PLANE_1), XE_PAGE_SIZE - 1, vma->node->base.start, 40) < 0)
+		drm_warn(&xe->drm, "async flip timed out\n");
+
 	atomic_or(plane->frontbuffer_bit, &to_intel_frontbuffer(fb)->bits);
 
 	plane_config->vma = vma;
@@ -292,9 +303,6 @@ void intel_initial_plane_config(struct drm_i915_private *i915)
 		 */
 		intel_find_initial_plane_obj(crtc, plane_configs);
 
-		if (i915->display.funcs.display->fixup_initial_plane_config(crtc, plane_config))
-			intel_crtc_wait_for_next_vblank(crtc);
-
 		plane_config_fini(plane_config);
 	}
 }
-- 
2.45.2