[RFC PATCH v4 5/6] drm/i915/gvt: Deliver async primary plane page flip events at vblank

Kechen Lu
2019-07-18T07:57:59Z

Only sync primary plane page flip events are checked and delivered
as the display refresh events before, this patch tries to deliver async
primary page flip events bounded by vblanks.

To deliver correct async page flip, the new async flip bitmap is
introduced and in vblank emulation handler to check bitset.

Signed-off-by: Kechen Lu <kechen.lu@intel.com>
---
drivers/gpu/drm/i915/gvt/cmd_parser.c | 5 +++--
drivers/gpu/drm/i915/gvt/display.c | 12 ++++++++++++
drivers/gpu/drm/i915/gvt/gvt.h | 2 ++
drivers/gpu/drm/i915/gvt/handlers.c | 5 +++--
4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index 5cb59c0b4bbe..e504cc7be559 100644
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -1334,9 +1334,10 @@ static int gen8_update_plane_mmio_from_mi_display_flip(
if (info->plane == PLANE_PRIMARY)
vgpu_vreg_t(vgpu, PIPE_FLIPCOUNT_G4X(info->pipe))++;

- if (info->async_flip)
+ if (info->async_flip) {
intel_vgpu_trigger_virtual_event(vgpu, info->event);
- else
+ set_bit(info->plane, vgpu->display.async_flip_event[info->pipe]);
+ } else
set_bit(info->event, vgpu->irq.flip_done_event[info->pipe]);

return 0;
diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c
index 036db8199983..df52e4b4c1b0 100644
--- a/drivers/gpu/drm/i915/gvt/display.c
+++ b/drivers/gpu/drm/i915/gvt/display.c
@@ -420,6 +420,18 @@ static void emulate_vblank_on_pipe(struct intel_vgpu *vgpu, int pipe)
intel_vgpu_trigger_virtual_event(vgpu, event);
}

+ for_each_set_bit(event, vgpu->display.async_flip_event[pipe],
+ I915_MAX_PLANES) {
+ clear_bit(event, vgpu->display.async_flip_event[pipe]);
+ if (!pipe_is_enabled(vgpu, pipe))
+ continue;
+
+ if (event == PLANE_PRIMARY) {
+ eventfd_signal_val += DISPLAY_PRI_REFRESH_EVENT_INC;
+ pageflip_count += PAGEFLIP_INC_COUNT;
+ }
+ }
+
if (--pageflip_count < 0) {
eventfd_signal_val += DISPLAY_PRI_REFRESH_EVENT_INC;
pageflip_count = 0;
diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index b654b6fa0663..98a3dc309acb 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -128,6 +128,8 @@ struct intel_vgpu_display {
struct intel_vgpu_i2c_edid i2c_edid;
struct intel_vgpu_port ports[I915_MAX_PORTS];
struct intel_vgpu_sbi sbi;
+ DECLARE_BITMAP(async_flip_event[I915_MAX_PIPES],
+ I915_MAX_PLANES);
};

struct vgpu_sched_ctl {
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index e09bd6e0cc4d..6ad29c4f08e5 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -758,9 +758,10 @@ static int pri_surf_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,

vgpu_vreg_t(vgpu, PIPE_FLIPCOUNT_G4X(pipe))++;

- if (vgpu_vreg_t(vgpu, DSPCNTR(pipe)) & PLANE_CTL_ASYNC_FLIP)
+ if (vgpu_vreg_t(vgpu, DSPCNTR(pipe)) & PLANE_CTL_ASYNC_FLIP) {
intel_vgpu_trigger_virtual_event(vgpu, event);
- else
+ set_bit(PLANE_PRIMARY, vgpu->display.async_flip_event[pipe]);
+ } else
set_bit(event, vgpu->irq.flip_done_event[pipe]);

return 0;
--
2.17.1