Use the blit ring for submitting flips since the render ring doesn't
generate flip complete interrupts.
Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org>
---
drivers/gpu/drm/i915/intel_display.c | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index 06748f3a..3d095de 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6379,6 +6379,28 @@ out:
return ret;
}
+static int intel_gen7_queue_flip(struct drm_device *dev,
+ struct drm_crtc *crtc,
+ struct drm_framebuffer *fb,
+ struct drm_i915_gem_object *obj)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+ int ret;
+
+ ret = intel_ring_begin(&dev_priv->ring[BCS], 4);
+ if (ret)
+ goto out;
+
+ intel_ring_emit(&dev_priv->ring[BCS], (MI_DISPLAY_FLIP_I915 |
(intel_crtc->plane << 19)) | (1 << 17));
+ intel_ring_emit(&dev_priv->ring[BCS], (fb->pitch | obj->tiling_mode));
+ intel_ring_emit(&dev_priv->ring[BCS], (obj->gtt_offset));
+ intel_ring_emit(&dev_priv->ring[BCS], (MI_NOOP));
+ intel_ring_advance(&dev_priv->ring[BCS]);
+out:
+ return ret;
+}
+
static int intel_crtc_page_flip(struct drm_crtc *crtc,
struct drm_framebuffer *fb,
struct drm_pending_vblank_event *event)
@@ -7744,6 +7766,9 @@ static void intel_init_display(struct drm_device *dev)
case 6:
dev_priv->display.queue_flip = intel_gen6_queue_flip;
break;
+ case 7:
+ dev_priv->display.queue_flip = intel_gen7_queue_flip;
+ break;
}
}
--
1.7.4.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
