All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Call intel_fbc_pre_update() after pinning the new pageflip
@ 2016-08-16  7:43 Chris Wilson
  2016-08-16  8:25 ` ✗ Ro.CI.BAT: warning for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Chris Wilson @ 2016-08-16  7:43 UTC (permalink / raw)
  To: intel-gfx; +Cc: Zanoni, Paulo R, drm-intel-fixes, Daniel Vetter

intel_fbc_pre_update() depends upon the new state being already pinned
in place in the Global GTT (primarily for both fencing which wants both
an offset and a fence register, if assigned). This requires the call to
intel_fbc_pre_update() be after intel_pin_and_fence_fb() - but commit
5a21b6650a23 ("drm/i915: Revert async unpin and nonblocking atomic
commit") seems to have returned the code to a different state.

Fixes 5a21b6650a23 ("drm/i915: Revert async unpin and nonblocking...")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: "Zanoni, Paulo R" <paulo.r.zanoni@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Cc: drm-intel-fixes@lists.freedesktop.org
---
 drivers/gpu/drm/i915/intel_display.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 37d71d5d2369..916ce7b2d4d7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12061,9 +12061,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
 	crtc->primary->fb = fb;
 	update_state_fb(crtc->primary);
 
-	intel_fbc_pre_update(intel_crtc, intel_crtc->config,
-			     to_intel_plane_state(primary->state));
-
 	work->pending_flip_obj = i915_gem_object_get(obj);
 
 	ret = i915_mutex_lock_interruptible(dev);
@@ -12109,6 +12106,9 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
 	work->gtt_offset += intel_crtc->dspaddr_offset;
 	work->rotation = crtc->primary->state->rotation;
 
+	intel_fbc_pre_update(intel_crtc, intel_crtc->config,
+			     to_intel_plane_state(primary->state));
+
 	if (mmio_flip) {
 		INIT_WORK(&work->mmio_work, intel_mmio_flip_work_func);
 
-- 
2.8.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2016-08-22 10:29 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-16  7:43 [PATCH] drm/i915: Call intel_fbc_pre_update() after pinning the new pageflip Chris Wilson
2016-08-16  8:25 ` ✗ Ro.CI.BAT: warning for " Patchwork
2016-08-16 16:49 ` [PATCH] " Zanoni, Paulo R
2016-08-16 17:04   ` chris
2016-08-17 19:41     ` Paulo Zanoni
2016-08-17 19:49       ` Chris Wilson
2016-08-17 20:00         ` Zanoni, Paulo R
2016-08-22 10:29           ` chris
2016-08-18  6:49 ` ✗ Ro.CI.BAT: warning for drm/i915: Call intel_fbc_pre_update() after pinning the new pageflip (rev2) Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.