Message ID | 1461052359-24154-6-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Apr 19, 2016 at 09:52:25AM +0200, Maarten Lankhorst wrote: > Rename intel_unpin_work to intel_flip_work and use it for mmio flips > and unpinning. Use flip_queued_req to hold the wait request in the > mmio case, and the vblank counter from intel_crtc_get_vblank_counter. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 6 +- > drivers/gpu/drm/i915/intel_display.c | 189 +++++++++++++++-------------------- > drivers/gpu/drm/i915/intel_drv.h | 19 ++-- > drivers/gpu/drm/i915/intel_sprite.c | 8 +- > 4 files changed, 98 insertions(+), 124 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index def95532d421..aabd7a13cec7 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -604,10 +604,10 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) > for_each_intel_crtc(dev, crtc) { > const char pipe = pipe_name(crtc->pipe); > const char plane = plane_name(crtc->plane); > - struct intel_unpin_work *work; > + struct intel_flip_work *work; > > spin_lock_irq(&dev->event_lock); > - work = crtc->unpin_work; > + work = crtc->flip_work; > if (work == NULL) { > seq_printf(m, "No flip due on pipe %c (plane %c)\n", > pipe, plane); > @@ -637,7 +637,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) > seq_printf(m, "Flip queued on frame %d, (was ready on frame %d), now %d\n", > work->flip_queued_vblank, > work->flip_ready_vblank, > - drm_crtc_vblank_count(&crtc->base)); > + intel_crtc_get_vblank_counter(crtc)); > seq_printf(m, "%d prepares\n", atomic_read(&work->pending)); > > if (INTEL_INFO(dev)->gen >= 4) > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 2086e8bd10da..1d7ef9fb526c 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -48,6 +48,11 @@ > #include <linux/reservation.h> > #include <linux/dma-buf.h> > > +static bool is_mmio_work(struct intel_flip_work *work) > +{ > + return work->mmio_work.func; > +} > + > /* Primary plane formats for gen <= 3 */ > static const uint32_t i8xx_primary_formats[] = { > DRM_FORMAT_C8, > @@ -3302,7 +3307,7 @@ static bool intel_crtc_has_pending_flip(struct drm_crtc *crtc) > return false; > > spin_lock_irq(&dev->event_lock); > - pending = to_intel_crtc(crtc)->unpin_work != NULL; > + pending = to_intel_crtc(crtc)->flip_work != NULL; > spin_unlock_irq(&dev->event_lock); > > return pending; > @@ -3881,7 +3886,7 @@ bool intel_has_pending_fb_unpin(struct drm_device *dev) > if (atomic_read(&crtc->unpin_work_count) == 0) > continue; > > - if (crtc->unpin_work) > + if (crtc->flip_work) > intel_wait_for_vblank(dev, crtc->pipe); > > return true; > @@ -3893,9 +3898,9 @@ bool intel_has_pending_fb_unpin(struct drm_device *dev) > static void page_flip_completed(struct intel_crtc *intel_crtc) > { > struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); > - struct intel_unpin_work *work = intel_crtc->unpin_work; > + struct intel_flip_work *work = intel_crtc->flip_work; > > - intel_crtc->unpin_work = NULL; > + intel_crtc->flip_work = NULL; > > if (work->event) > drm_crtc_send_vblank_event(&intel_crtc->base, work->event); > @@ -3903,7 +3908,7 @@ static void page_flip_completed(struct intel_crtc *intel_crtc) > drm_crtc_vblank_put(&intel_crtc->base); > > wake_up_all(&dev_priv->pending_flip_queue); > - queue_work(dev_priv->wq, &work->work); > + queue_work(dev_priv->wq, &work->unpin_work); > > trace_i915_flip_complete(intel_crtc->plane, > work->pending_flip_obj); > @@ -3927,9 +3932,11 @@ static int intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc) > > if (ret == 0) { > struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > + struct intel_flip_work *work; > > spin_lock_irq(&dev->event_lock); > - if (intel_crtc->unpin_work) { > + work = intel_crtc->flip_work; > + if (work && !is_mmio_work(work)) { > WARN_ONCE(1, "Removing stuck page flip\n"); > page_flip_completed(intel_crtc); > } > @@ -6328,7 +6335,7 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc) > return; > > if (to_intel_plane_state(crtc->primary->state)->visible) { > - WARN_ON(intel_crtc->unpin_work); > + WARN_ON(intel_crtc->flip_work); > > intel_pre_disable_primary_noatomic(crtc); > > @@ -10916,15 +10923,16 @@ static void intel_crtc_destroy(struct drm_crtc *crtc) > { > struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > struct drm_device *dev = crtc->dev; > - struct intel_unpin_work *work; > + struct intel_flip_work *work; > > spin_lock_irq(&dev->event_lock); > - work = intel_crtc->unpin_work; > - intel_crtc->unpin_work = NULL; > + work = intel_crtc->flip_work; > + intel_crtc->flip_work = NULL; > spin_unlock_irq(&dev->event_lock); > > if (work) { > - cancel_work_sync(&work->work); > + cancel_work_sync(&work->mmio_work); > + cancel_work_sync(&work->unpin_work); > kfree(work); > } > > @@ -10935,12 +10943,15 @@ static void intel_crtc_destroy(struct drm_crtc *crtc) > > static void intel_unpin_work_fn(struct work_struct *__work) > { > - struct intel_unpin_work *work = > - container_of(__work, struct intel_unpin_work, work); > + struct intel_flip_work *work = > + container_of(__work, struct intel_flip_work, unpin_work); > struct intel_crtc *crtc = to_intel_crtc(work->crtc); > struct drm_device *dev = crtc->base.dev; > struct drm_plane *primary = crtc->base.primary; > > + if (is_mmio_work(work)) > + flush_work(&work->mmio_work); > + > mutex_lock(&dev->struct_mutex); > intel_unpin_fb_obj(work->old_fb, primary->state->rotation); > drm_gem_object_unreference(&work->pending_flip_obj->base); > @@ -11010,16 +11021,16 @@ static bool page_flip_finished(struct intel_crtc *crtc) > * anyway, we don't really care. > */ > return (I915_READ(DSPSURFLIVE(crtc->plane)) & ~0xfff) == > - crtc->unpin_work->gtt_offset && > + crtc->flip_work->gtt_offset && > g4x_flip_count_after_eq(I915_READ(PIPE_FLIPCOUNT_G4X(crtc->pipe)), > - crtc->unpin_work->flip_count); > + crtc->flip_work->flip_count); > } > > static void do_intel_finish_page_flip(struct drm_device *dev, > struct drm_crtc *crtc) > { > struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > - struct intel_unpin_work *work; > + struct intel_flip_work *work; > unsigned long flags; > > /* Ignore early vblank irqs */ > @@ -11031,7 +11042,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev, > * lost pageflips) so needs the full irqsave spinlocks. > */ > spin_lock_irqsave(&dev->event_lock, flags); > - work = intel_crtc->unpin_work; > + work = intel_crtc->flip_work; > > if (work != NULL && > atomic_read(&work->pending) == INTEL_FLIP_PENDING && > @@ -11057,8 +11068,11 @@ void intel_finish_page_flip_plane(struct drm_device *dev, int plane) > do_intel_finish_page_flip(dev, crtc); > } > > -static inline void intel_mark_page_flip_active(struct intel_unpin_work *work) > +static inline void intel_mark_page_flip_active(struct intel_crtc *crtc, > + struct intel_flip_work *work) > { > + work->flip_queued_vblank = intel_crtc_get_vblank_counter(crtc); > + > /* Ensure that the work item is consistent when activating it ... */ > smp_mb__before_atomic(); > atomic_set(&work->pending, INTEL_FLIP_PENDING); > @@ -11092,7 +11106,7 @@ static int intel_gen2_queue_flip(struct drm_device *dev, > intel_ring_emit(engine, MI_DISPLAY_FLIP | > MI_DISPLAY_FLIP_PLANE(intel_crtc->plane)); > intel_ring_emit(engine, fb->pitches[0]); > - intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset); > + intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset); > intel_ring_emit(engine, 0); /* aux display base address, unused */ > > return 0; > @@ -11123,7 +11137,7 @@ static int intel_gen3_queue_flip(struct drm_device *dev, > intel_ring_emit(engine, MI_DISPLAY_FLIP_I915 | > MI_DISPLAY_FLIP_PLANE(intel_crtc->plane)); > intel_ring_emit(engine, fb->pitches[0]); > - intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset); > + intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset); > intel_ring_emit(engine, MI_NOOP); > > return 0; > @@ -11153,7 +11167,7 @@ static int intel_gen4_queue_flip(struct drm_device *dev, > intel_ring_emit(engine, MI_DISPLAY_FLIP | > MI_DISPLAY_FLIP_PLANE(intel_crtc->plane)); > intel_ring_emit(engine, fb->pitches[0]); > - intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset | > + intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset | > obj->tiling_mode); > > /* XXX Enabling the panel-fitter across page-flip is so far > @@ -11187,7 +11201,7 @@ static int intel_gen6_queue_flip(struct drm_device *dev, > intel_ring_emit(engine, MI_DISPLAY_FLIP | > MI_DISPLAY_FLIP_PLANE(intel_crtc->plane)); > intel_ring_emit(engine, fb->pitches[0] | obj->tiling_mode); > - intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset); > + intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset); > > /* Contrary to the suggestions in the documentation, > * "Enable Panel Fitter" does not seem to be required when page > @@ -11290,7 +11304,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev, > > intel_ring_emit(engine, MI_DISPLAY_FLIP_I915 | plane_bit); > intel_ring_emit(engine, (fb->pitches[0] | obj->tiling_mode)); > - intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset); > + intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset); > intel_ring_emit(engine, (MI_NOOP)); > > return 0; > @@ -11329,7 +11343,7 @@ static bool use_mmio_flip(struct intel_engine_cs *engine, > > static void skl_do_mmio_flip(struct intel_crtc *intel_crtc, > unsigned int rotation, > - struct intel_unpin_work *work) > + struct intel_flip_work *work) > { > struct drm_device *dev = intel_crtc->base.dev; > struct drm_i915_private *dev_priv = dev->dev_private; > @@ -11381,7 +11395,7 @@ static void skl_do_mmio_flip(struct intel_crtc *intel_crtc, > } > > static void ilk_do_mmio_flip(struct intel_crtc *intel_crtc, > - struct intel_unpin_work *work) > + struct intel_flip_work *work) > { > struct drm_device *dev = intel_crtc->base.dev; > struct drm_i915_private *dev_priv = dev->dev_private; > @@ -11404,48 +11418,20 @@ static void ilk_do_mmio_flip(struct intel_crtc *intel_crtc, > POSTING_READ(DSPSURF(intel_crtc->plane)); > } > > -/* > - * XXX: This is the temporary way to update the plane registers until we get > - * around to using the usual plane update functions for MMIO flips > - */ > -static void intel_do_mmio_flip(struct intel_mmio_flip *mmio_flip) > +static void intel_mmio_flip_work_func(struct work_struct *w) > { > - struct intel_crtc *crtc = mmio_flip->crtc; > - struct intel_unpin_work *work; > - > - spin_lock_irq(&crtc->base.dev->event_lock); > - work = crtc->unpin_work; > - spin_unlock_irq(&crtc->base.dev->event_lock); > - if (work == NULL) > - return; > - > - intel_pipe_update_start(crtc); > - > - if (INTEL_INFO(mmio_flip->i915)->gen >= 9) > - skl_do_mmio_flip(crtc, mmio_flip->rotation, work); > - else > - /* use_mmio_flip() retricts MMIO flips to ilk+ */ > - ilk_do_mmio_flip(crtc, work); > - > - intel_pipe_update_end(crtc); > - > - intel_mark_page_flip_active(work); > -} > - > -static void intel_mmio_flip_work_func(struct work_struct *work) > -{ > - struct intel_mmio_flip *mmio_flip = > - container_of(work, struct intel_mmio_flip, work); > + struct intel_flip_work *work = > + container_of(w, struct intel_flip_work, mmio_work); > + struct intel_crtc *crtc = to_intel_crtc(work->crtc); > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > struct intel_framebuffer *intel_fb = > - to_intel_framebuffer(mmio_flip->crtc->base.primary->fb); > + to_intel_framebuffer(crtc->base.primary->fb); > struct drm_i915_gem_object *obj = intel_fb->obj; > > - if (mmio_flip->req) { > - WARN_ON(__i915_wait_request(mmio_flip->req, > + if (work->flip_queued_req) > + WARN_ON(__i915_wait_request(work->flip_queued_req, > false, NULL, > - &mmio_flip->i915->rps.mmioflips)); > - i915_gem_request_unreference__unlocked(mmio_flip->req); > - } > + &dev_priv->rps.mmioflips)); > > /* For framebuffer backed by dmabuf, wait for fence */ > if (obj->base.dma_buf) > @@ -11453,29 +11439,15 @@ static void intel_mmio_flip_work_func(struct work_struct *work) > false, false, > MAX_SCHEDULE_TIMEOUT) < 0); > > - intel_do_mmio_flip(mmio_flip); > - kfree(mmio_flip); > -} > - > -static int intel_queue_mmio_flip(struct drm_device *dev, > - struct drm_crtc *crtc, > - struct drm_i915_gem_object *obj) > -{ > - struct intel_mmio_flip *mmio_flip; > - > - mmio_flip = kmalloc(sizeof(*mmio_flip), GFP_KERNEL); > - if (mmio_flip == NULL) > - return -ENOMEM; > - > - mmio_flip->i915 = to_i915(dev); > - mmio_flip->req = i915_gem_request_reference(obj->last_write_req); > - mmio_flip->crtc = to_intel_crtc(crtc); > - mmio_flip->rotation = crtc->primary->state->rotation; > + intel_pipe_update_start(crtc); > > - INIT_WORK(&mmio_flip->work, intel_mmio_flip_work_func); > - schedule_work(&mmio_flip->work); > + if (INTEL_GEN(dev_priv) >= 9) > + skl_do_mmio_flip(crtc, work->rotation, work); > + else > + /* use_mmio_flip() retricts MMIO flips to ilk+ */ > + ilk_do_mmio_flip(crtc, work); > > - return 0; > + intel_pipe_update_end(crtc, work); > } > > static int intel_default_queue_flip(struct drm_device *dev, > @@ -11493,8 +11465,8 @@ static bool __intel_pageflip_stall_check(struct drm_device *dev, > { > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > - struct intel_unpin_work *work = intel_crtc->unpin_work; > - u32 addr; > + struct intel_flip_work *work = intel_crtc->flip_work; > + u32 addr, vblank; > u32 pending; > > pending = atomic_read(&work->pending); > @@ -11504,15 +11476,18 @@ static bool __intel_pageflip_stall_check(struct drm_device *dev, > if (pending == INTEL_FLIP_INACTIVE) > return false; > > + smp_mb__after_atomic(); > + vblank = intel_crtc_get_vblank_counter(intel_crtc); > + > if (work->flip_ready_vblank == 0) { > if (work->flip_queued_req && > !i915_gem_request_completed(work->flip_queued_req, true)) > return false; > > - work->flip_ready_vblank = drm_crtc_vblank_count(crtc); > + work->flip_ready_vblank = vblank; > } > > - if (drm_crtc_vblank_count(crtc) - work->flip_ready_vblank < 3) > + if (vblank - work->flip_ready_vblank < 3) > return false; > > /* Potential stall - if we see that the flip has happened, > @@ -11534,7 +11509,7 @@ void intel_check_page_flip(struct drm_device *dev, int pipe) > struct drm_i915_private *dev_priv = dev->dev_private; > struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; > struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > - struct intel_unpin_work *work; > + struct intel_flip_work *work; > > WARN_ON(!in_interrupt()); > > @@ -11542,15 +11517,16 @@ void intel_check_page_flip(struct drm_device *dev, int pipe) > return; > > spin_lock(&dev->event_lock); > - work = intel_crtc->unpin_work; > + work = intel_crtc->flip_work; > if (work != NULL && __intel_pageflip_stall_check(dev, crtc)) { > - WARN_ONCE(1, "Kicking stuck page flip: queued at %d, now %d\n", > - work->flip_queued_vblank, drm_vblank_count(dev, pipe)); > + WARN_ONCE(1, > + "Kicking stuck page flip: queued at %d, now %d\n", > + work->flip_queued_vblank, intel_crtc_get_vblank_counter(intel_crtc)); > page_flip_completed(intel_crtc); > work = NULL; > } > - if (work != NULL && > - drm_vblank_count(dev, pipe) - work->flip_queued_vblank > 1) > + if (work != NULL && !is_mmio_work(work) && > + intel_crtc_get_vblank_counter(intel_crtc) - work->flip_queued_vblank > 1) > intel_queue_rps_boost_for_request(dev, work->flip_queued_req); > spin_unlock(&dev->event_lock); > } > @@ -11567,7 +11543,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, > struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > struct drm_plane *primary = crtc->primary; > enum pipe pipe = intel_crtc->pipe; > - struct intel_unpin_work *work; > + struct intel_flip_work *work; > struct intel_engine_cs *engine; > bool mmio_flip; > struct drm_i915_gem_request *request = NULL; > @@ -11604,15 +11580,15 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, > work->event = event; > work->crtc = crtc; > work->old_fb = old_fb; > - INIT_WORK(&work->work, intel_unpin_work_fn); > + INIT_WORK(&work->unpin_work, intel_unpin_work_fn); > > ret = drm_crtc_vblank_get(crtc); > if (ret) > goto free_work; > > - /* We borrow the event spin lock for protecting unpin_work */ > + /* We borrow the event spin lock for protecting flip_work */ > spin_lock_irq(&dev->event_lock); > - if (intel_crtc->unpin_work) { > + if (intel_crtc->flip_work) { > /* Before declaring the flip queue wedged, check if > * the hardware completed the operation behind our backs. > */ > @@ -11628,7 +11604,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, > return -EBUSY; > } > } > - intel_crtc->unpin_work = work; > + intel_crtc->flip_work = work; > spin_unlock_irq(&dev->event_lock); > > if (atomic_read(&intel_crtc->unpin_work_count) >= 2) > @@ -11699,26 +11675,23 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, > work->gtt_offset = intel_plane_obj_offset(to_intel_plane(primary), > obj, 0); > work->gtt_offset += intel_crtc->dspaddr_offset; > + work->rotation = crtc->primary->state->rotation; > > if (mmio_flip) { > - work->flip_queued_vblank = drm_crtc_vblank_count(crtc); > + INIT_WORK(&work->mmio_work, intel_mmio_flip_work_func); > > i915_gem_request_assign(&work->flip_queued_req, > obj->last_write_req); > > - ret = intel_queue_mmio_flip(dev, crtc, obj); > - if (ret) > - goto cleanup_unpin; > + schedule_work(&work->mmio_work); > } else { > + i915_gem_request_assign(&work->flip_queued_req, request); > ret = dev_priv->display.queue_flip(dev, crtc, fb, obj, request, > page_flip_flags); > if (ret) > goto cleanup_unpin; > > - i915_gem_request_assign(&work->flip_queued_req, request); > - > - work->flip_queued_vblank = drm_crtc_vblank_count(crtc); > - intel_mark_page_flip_active(work); > + intel_mark_page_flip_active(intel_crtc, work); > > i915_add_request_no_flush(request); > } > @@ -11749,7 +11722,7 @@ cleanup: > drm_framebuffer_unreference(work->old_fb); > > spin_lock_irq(&dev->event_lock); > - intel_crtc->unpin_work = NULL; > + intel_crtc->flip_work = NULL; > spin_unlock_irq(&dev->event_lock); > > drm_crtc_vblank_put(crtc); > @@ -14051,7 +14024,7 @@ static void intel_finish_crtc_commit(struct drm_crtc *crtc, > { > struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > > - intel_pipe_update_end(intel_crtc); > + intel_pipe_update_end(intel_crtc, NULL); > } > > /** > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 8efeb90eac07..e10e6959fd43 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -597,14 +597,6 @@ struct vlv_wm_state { > bool cxsr; > }; > > -struct intel_mmio_flip { > - struct work_struct work; > - struct drm_i915_private *i915; > - struct drm_i915_gem_request *req; > - struct intel_crtc *crtc; > - unsigned int rotation; > -}; > - > struct intel_crtc { > struct drm_crtc base; > enum pipe pipe; > @@ -619,7 +611,7 @@ struct intel_crtc { > unsigned long enabled_power_domains; > bool lowfreq_avail; > struct intel_overlay *overlay; > - struct intel_unpin_work *unpin_work; > + struct intel_flip_work *flip_work; > > atomic_t unpin_work_count; > > @@ -942,8 +934,10 @@ intel_get_crtc_for_plane(struct drm_device *dev, int plane) > return dev_priv->plane_to_crtc_mapping[plane]; > } > > -struct intel_unpin_work { > - struct work_struct work; > +struct intel_flip_work { > + struct work_struct unpin_work; > + struct work_struct mmio_work; > + > struct drm_crtc *crtc; > struct drm_framebuffer *old_fb; > struct drm_i915_gem_object *pending_flip_obj; > @@ -956,6 +950,7 @@ struct intel_unpin_work { > struct drm_i915_gem_request *flip_queued_req; > u32 flip_queued_vblank; > u32 flip_ready_vblank; > + unsigned int rotation; > }; > > struct intel_load_detect_pipe { > @@ -1625,7 +1620,7 @@ int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane); > int intel_sprite_set_colorkey(struct drm_device *dev, void *data, > struct drm_file *file_priv); > void intel_pipe_update_start(struct intel_crtc *crtc); > -void intel_pipe_update_end(struct intel_crtc *crtc); > +void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work); > > /* intel_tv.c */ > void intel_tv_init(struct drm_device *dev); > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > index e2de6b0df5a8..8ec7ce549835 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -151,13 +151,19 @@ void intel_pipe_update_start(struct intel_crtc *crtc) > * re-enables interrupts and verifies the update was actually completed > * before a vblank using the value of @start_vbl_count. > */ > -void intel_pipe_update_end(struct intel_crtc *crtc) > +void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work) > { > enum pipe pipe = crtc->pipe; > int scanline_end = intel_get_crtc_scanline(crtc); > u32 end_vbl_count = intel_crtc_get_vblank_counter(crtc); > ktime_t end_vbl_time = ktime_get(); > > + if (work) { > + work->flip_queued_vblank = end_vbl_count; > + smp_mb__before_atomic(); > + atomic_set(&work->pending, INTEL_FLIP_PENDING); > + } > + > trace_i915_pipe_update_end(crtc, end_vbl_count, scanline_end); > > local_irq_enable(); > -- > 2.1.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index def95532d421..aabd7a13cec7 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -604,10 +604,10 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) for_each_intel_crtc(dev, crtc) { const char pipe = pipe_name(crtc->pipe); const char plane = plane_name(crtc->plane); - struct intel_unpin_work *work; + struct intel_flip_work *work; spin_lock_irq(&dev->event_lock); - work = crtc->unpin_work; + work = crtc->flip_work; if (work == NULL) { seq_printf(m, "No flip due on pipe %c (plane %c)\n", pipe, plane); @@ -637,7 +637,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) seq_printf(m, "Flip queued on frame %d, (was ready on frame %d), now %d\n", work->flip_queued_vblank, work->flip_ready_vblank, - drm_crtc_vblank_count(&crtc->base)); + intel_crtc_get_vblank_counter(crtc)); seq_printf(m, "%d prepares\n", atomic_read(&work->pending)); if (INTEL_INFO(dev)->gen >= 4) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2086e8bd10da..1d7ef9fb526c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -48,6 +48,11 @@ #include <linux/reservation.h> #include <linux/dma-buf.h> +static bool is_mmio_work(struct intel_flip_work *work) +{ + return work->mmio_work.func; +} + /* Primary plane formats for gen <= 3 */ static const uint32_t i8xx_primary_formats[] = { DRM_FORMAT_C8, @@ -3302,7 +3307,7 @@ static bool intel_crtc_has_pending_flip(struct drm_crtc *crtc) return false; spin_lock_irq(&dev->event_lock); - pending = to_intel_crtc(crtc)->unpin_work != NULL; + pending = to_intel_crtc(crtc)->flip_work != NULL; spin_unlock_irq(&dev->event_lock); return pending; @@ -3881,7 +3886,7 @@ bool intel_has_pending_fb_unpin(struct drm_device *dev) if (atomic_read(&crtc->unpin_work_count) == 0) continue; - if (crtc->unpin_work) + if (crtc->flip_work) intel_wait_for_vblank(dev, crtc->pipe); return true; @@ -3893,9 +3898,9 @@ bool intel_has_pending_fb_unpin(struct drm_device *dev) static void page_flip_completed(struct intel_crtc *intel_crtc) { struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); - struct intel_unpin_work *work = intel_crtc->unpin_work; + struct intel_flip_work *work = intel_crtc->flip_work; - intel_crtc->unpin_work = NULL; + intel_crtc->flip_work = NULL; if (work->event) drm_crtc_send_vblank_event(&intel_crtc->base, work->event); @@ -3903,7 +3908,7 @@ static void page_flip_completed(struct intel_crtc *intel_crtc) drm_crtc_vblank_put(&intel_crtc->base); wake_up_all(&dev_priv->pending_flip_queue); - queue_work(dev_priv->wq, &work->work); + queue_work(dev_priv->wq, &work->unpin_work); trace_i915_flip_complete(intel_crtc->plane, work->pending_flip_obj); @@ -3927,9 +3932,11 @@ static int intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc) if (ret == 0) { struct intel_crtc *intel_crtc = to_intel_crtc(crtc); + struct intel_flip_work *work; spin_lock_irq(&dev->event_lock); - if (intel_crtc->unpin_work) { + work = intel_crtc->flip_work; + if (work && !is_mmio_work(work)) { WARN_ONCE(1, "Removing stuck page flip\n"); page_flip_completed(intel_crtc); } @@ -6328,7 +6335,7 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc) return; if (to_intel_plane_state(crtc->primary->state)->visible) { - WARN_ON(intel_crtc->unpin_work); + WARN_ON(intel_crtc->flip_work); intel_pre_disable_primary_noatomic(crtc); @@ -10916,15 +10923,16 @@ static void intel_crtc_destroy(struct drm_crtc *crtc) { struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct drm_device *dev = crtc->dev; - struct intel_unpin_work *work; + struct intel_flip_work *work; spin_lock_irq(&dev->event_lock); - work = intel_crtc->unpin_work; - intel_crtc->unpin_work = NULL; + work = intel_crtc->flip_work; + intel_crtc->flip_work = NULL; spin_unlock_irq(&dev->event_lock); if (work) { - cancel_work_sync(&work->work); + cancel_work_sync(&work->mmio_work); + cancel_work_sync(&work->unpin_work); kfree(work); } @@ -10935,12 +10943,15 @@ static void intel_crtc_destroy(struct drm_crtc *crtc) static void intel_unpin_work_fn(struct work_struct *__work) { - struct intel_unpin_work *work = - container_of(__work, struct intel_unpin_work, work); + struct intel_flip_work *work = + container_of(__work, struct intel_flip_work, unpin_work); struct intel_crtc *crtc = to_intel_crtc(work->crtc); struct drm_device *dev = crtc->base.dev; struct drm_plane *primary = crtc->base.primary; + if (is_mmio_work(work)) + flush_work(&work->mmio_work); + mutex_lock(&dev->struct_mutex); intel_unpin_fb_obj(work->old_fb, primary->state->rotation); drm_gem_object_unreference(&work->pending_flip_obj->base); @@ -11010,16 +11021,16 @@ static bool page_flip_finished(struct intel_crtc *crtc) * anyway, we don't really care. */ return (I915_READ(DSPSURFLIVE(crtc->plane)) & ~0xfff) == - crtc->unpin_work->gtt_offset && + crtc->flip_work->gtt_offset && g4x_flip_count_after_eq(I915_READ(PIPE_FLIPCOUNT_G4X(crtc->pipe)), - crtc->unpin_work->flip_count); + crtc->flip_work->flip_count); } static void do_intel_finish_page_flip(struct drm_device *dev, struct drm_crtc *crtc) { struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - struct intel_unpin_work *work; + struct intel_flip_work *work; unsigned long flags; /* Ignore early vblank irqs */ @@ -11031,7 +11042,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev, * lost pageflips) so needs the full irqsave spinlocks. */ spin_lock_irqsave(&dev->event_lock, flags); - work = intel_crtc->unpin_work; + work = intel_crtc->flip_work; if (work != NULL && atomic_read(&work->pending) == INTEL_FLIP_PENDING && @@ -11057,8 +11068,11 @@ void intel_finish_page_flip_plane(struct drm_device *dev, int plane) do_intel_finish_page_flip(dev, crtc); } -static inline void intel_mark_page_flip_active(struct intel_unpin_work *work) +static inline void intel_mark_page_flip_active(struct intel_crtc *crtc, + struct intel_flip_work *work) { + work->flip_queued_vblank = intel_crtc_get_vblank_counter(crtc); + /* Ensure that the work item is consistent when activating it ... */ smp_mb__before_atomic(); atomic_set(&work->pending, INTEL_FLIP_PENDING); @@ -11092,7 +11106,7 @@ static int intel_gen2_queue_flip(struct drm_device *dev, intel_ring_emit(engine, MI_DISPLAY_FLIP | MI_DISPLAY_FLIP_PLANE(intel_crtc->plane)); intel_ring_emit(engine, fb->pitches[0]); - intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset); + intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset); intel_ring_emit(engine, 0); /* aux display base address, unused */ return 0; @@ -11123,7 +11137,7 @@ static int intel_gen3_queue_flip(struct drm_device *dev, intel_ring_emit(engine, MI_DISPLAY_FLIP_I915 | MI_DISPLAY_FLIP_PLANE(intel_crtc->plane)); intel_ring_emit(engine, fb->pitches[0]); - intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset); + intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset); intel_ring_emit(engine, MI_NOOP); return 0; @@ -11153,7 +11167,7 @@ static int intel_gen4_queue_flip(struct drm_device *dev, intel_ring_emit(engine, MI_DISPLAY_FLIP | MI_DISPLAY_FLIP_PLANE(intel_crtc->plane)); intel_ring_emit(engine, fb->pitches[0]); - intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset | + intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset | obj->tiling_mode); /* XXX Enabling the panel-fitter across page-flip is so far @@ -11187,7 +11201,7 @@ static int intel_gen6_queue_flip(struct drm_device *dev, intel_ring_emit(engine, MI_DISPLAY_FLIP | MI_DISPLAY_FLIP_PLANE(intel_crtc->plane)); intel_ring_emit(engine, fb->pitches[0] | obj->tiling_mode); - intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset); + intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset); /* Contrary to the suggestions in the documentation, * "Enable Panel Fitter" does not seem to be required when page @@ -11290,7 +11304,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev, intel_ring_emit(engine, MI_DISPLAY_FLIP_I915 | plane_bit); intel_ring_emit(engine, (fb->pitches[0] | obj->tiling_mode)); - intel_ring_emit(engine, intel_crtc->unpin_work->gtt_offset); + intel_ring_emit(engine, intel_crtc->flip_work->gtt_offset); intel_ring_emit(engine, (MI_NOOP)); return 0; @@ -11329,7 +11343,7 @@ static bool use_mmio_flip(struct intel_engine_cs *engine, static void skl_do_mmio_flip(struct intel_crtc *intel_crtc, unsigned int rotation, - struct intel_unpin_work *work) + struct intel_flip_work *work) { struct drm_device *dev = intel_crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -11381,7 +11395,7 @@ static void skl_do_mmio_flip(struct intel_crtc *intel_crtc, } static void ilk_do_mmio_flip(struct intel_crtc *intel_crtc, - struct intel_unpin_work *work) + struct intel_flip_work *work) { struct drm_device *dev = intel_crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -11404,48 +11418,20 @@ static void ilk_do_mmio_flip(struct intel_crtc *intel_crtc, POSTING_READ(DSPSURF(intel_crtc->plane)); } -/* - * XXX: This is the temporary way to update the plane registers until we get - * around to using the usual plane update functions for MMIO flips - */ -static void intel_do_mmio_flip(struct intel_mmio_flip *mmio_flip) +static void intel_mmio_flip_work_func(struct work_struct *w) { - struct intel_crtc *crtc = mmio_flip->crtc; - struct intel_unpin_work *work; - - spin_lock_irq(&crtc->base.dev->event_lock); - work = crtc->unpin_work; - spin_unlock_irq(&crtc->base.dev->event_lock); - if (work == NULL) - return; - - intel_pipe_update_start(crtc); - - if (INTEL_INFO(mmio_flip->i915)->gen >= 9) - skl_do_mmio_flip(crtc, mmio_flip->rotation, work); - else - /* use_mmio_flip() retricts MMIO flips to ilk+ */ - ilk_do_mmio_flip(crtc, work); - - intel_pipe_update_end(crtc); - - intel_mark_page_flip_active(work); -} - -static void intel_mmio_flip_work_func(struct work_struct *work) -{ - struct intel_mmio_flip *mmio_flip = - container_of(work, struct intel_mmio_flip, work); + struct intel_flip_work *work = + container_of(w, struct intel_flip_work, mmio_work); + struct intel_crtc *crtc = to_intel_crtc(work->crtc); + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); struct intel_framebuffer *intel_fb = - to_intel_framebuffer(mmio_flip->crtc->base.primary->fb); + to_intel_framebuffer(crtc->base.primary->fb); struct drm_i915_gem_object *obj = intel_fb->obj; - if (mmio_flip->req) { - WARN_ON(__i915_wait_request(mmio_flip->req, + if (work->flip_queued_req) + WARN_ON(__i915_wait_request(work->flip_queued_req, false, NULL, - &mmio_flip->i915->rps.mmioflips)); - i915_gem_request_unreference__unlocked(mmio_flip->req); - } + &dev_priv->rps.mmioflips)); /* For framebuffer backed by dmabuf, wait for fence */ if (obj->base.dma_buf) @@ -11453,29 +11439,15 @@ static void intel_mmio_flip_work_func(struct work_struct *work) false, false, MAX_SCHEDULE_TIMEOUT) < 0); - intel_do_mmio_flip(mmio_flip); - kfree(mmio_flip); -} - -static int intel_queue_mmio_flip(struct drm_device *dev, - struct drm_crtc *crtc, - struct drm_i915_gem_object *obj) -{ - struct intel_mmio_flip *mmio_flip; - - mmio_flip = kmalloc(sizeof(*mmio_flip), GFP_KERNEL); - if (mmio_flip == NULL) - return -ENOMEM; - - mmio_flip->i915 = to_i915(dev); - mmio_flip->req = i915_gem_request_reference(obj->last_write_req); - mmio_flip->crtc = to_intel_crtc(crtc); - mmio_flip->rotation = crtc->primary->state->rotation; + intel_pipe_update_start(crtc); - INIT_WORK(&mmio_flip->work, intel_mmio_flip_work_func); - schedule_work(&mmio_flip->work); + if (INTEL_GEN(dev_priv) >= 9) + skl_do_mmio_flip(crtc, work->rotation, work); + else + /* use_mmio_flip() retricts MMIO flips to ilk+ */ + ilk_do_mmio_flip(crtc, work); - return 0; + intel_pipe_update_end(crtc, work); } static int intel_default_queue_flip(struct drm_device *dev, @@ -11493,8 +11465,8 @@ static bool __intel_pageflip_stall_check(struct drm_device *dev, { struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - struct intel_unpin_work *work = intel_crtc->unpin_work; - u32 addr; + struct intel_flip_work *work = intel_crtc->flip_work; + u32 addr, vblank; u32 pending; pending = atomic_read(&work->pending); @@ -11504,15 +11476,18 @@ static bool __intel_pageflip_stall_check(struct drm_device *dev, if (pending == INTEL_FLIP_INACTIVE) return false; + smp_mb__after_atomic(); + vblank = intel_crtc_get_vblank_counter(intel_crtc); + if (work->flip_ready_vblank == 0) { if (work->flip_queued_req && !i915_gem_request_completed(work->flip_queued_req, true)) return false; - work->flip_ready_vblank = drm_crtc_vblank_count(crtc); + work->flip_ready_vblank = vblank; } - if (drm_crtc_vblank_count(crtc) - work->flip_ready_vblank < 3) + if (vblank - work->flip_ready_vblank < 3) return false; /* Potential stall - if we see that the flip has happened, @@ -11534,7 +11509,7 @@ void intel_check_page_flip(struct drm_device *dev, int pipe) struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - struct intel_unpin_work *work; + struct intel_flip_work *work; WARN_ON(!in_interrupt()); @@ -11542,15 +11517,16 @@ void intel_check_page_flip(struct drm_device *dev, int pipe) return; spin_lock(&dev->event_lock); - work = intel_crtc->unpin_work; + work = intel_crtc->flip_work; if (work != NULL && __intel_pageflip_stall_check(dev, crtc)) { - WARN_ONCE(1, "Kicking stuck page flip: queued at %d, now %d\n", - work->flip_queued_vblank, drm_vblank_count(dev, pipe)); + WARN_ONCE(1, + "Kicking stuck page flip: queued at %d, now %d\n", + work->flip_queued_vblank, intel_crtc_get_vblank_counter(intel_crtc)); page_flip_completed(intel_crtc); work = NULL; } - if (work != NULL && - drm_vblank_count(dev, pipe) - work->flip_queued_vblank > 1) + if (work != NULL && !is_mmio_work(work) && + intel_crtc_get_vblank_counter(intel_crtc) - work->flip_queued_vblank > 1) intel_queue_rps_boost_for_request(dev, work->flip_queued_req); spin_unlock(&dev->event_lock); } @@ -11567,7 +11543,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct drm_plane *primary = crtc->primary; enum pipe pipe = intel_crtc->pipe; - struct intel_unpin_work *work; + struct intel_flip_work *work; struct intel_engine_cs *engine; bool mmio_flip; struct drm_i915_gem_request *request = NULL; @@ -11604,15 +11580,15 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, work->event = event; work->crtc = crtc; work->old_fb = old_fb; - INIT_WORK(&work->work, intel_unpin_work_fn); + INIT_WORK(&work->unpin_work, intel_unpin_work_fn); ret = drm_crtc_vblank_get(crtc); if (ret) goto free_work; - /* We borrow the event spin lock for protecting unpin_work */ + /* We borrow the event spin lock for protecting flip_work */ spin_lock_irq(&dev->event_lock); - if (intel_crtc->unpin_work) { + if (intel_crtc->flip_work) { /* Before declaring the flip queue wedged, check if * the hardware completed the operation behind our backs. */ @@ -11628,7 +11604,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, return -EBUSY; } } - intel_crtc->unpin_work = work; + intel_crtc->flip_work = work; spin_unlock_irq(&dev->event_lock); if (atomic_read(&intel_crtc->unpin_work_count) >= 2) @@ -11699,26 +11675,23 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, work->gtt_offset = intel_plane_obj_offset(to_intel_plane(primary), obj, 0); work->gtt_offset += intel_crtc->dspaddr_offset; + work->rotation = crtc->primary->state->rotation; if (mmio_flip) { - work->flip_queued_vblank = drm_crtc_vblank_count(crtc); + INIT_WORK(&work->mmio_work, intel_mmio_flip_work_func); i915_gem_request_assign(&work->flip_queued_req, obj->last_write_req); - ret = intel_queue_mmio_flip(dev, crtc, obj); - if (ret) - goto cleanup_unpin; + schedule_work(&work->mmio_work); } else { + i915_gem_request_assign(&work->flip_queued_req, request); ret = dev_priv->display.queue_flip(dev, crtc, fb, obj, request, page_flip_flags); if (ret) goto cleanup_unpin; - i915_gem_request_assign(&work->flip_queued_req, request); - - work->flip_queued_vblank = drm_crtc_vblank_count(crtc); - intel_mark_page_flip_active(work); + intel_mark_page_flip_active(intel_crtc, work); i915_add_request_no_flush(request); } @@ -11749,7 +11722,7 @@ cleanup: drm_framebuffer_unreference(work->old_fb); spin_lock_irq(&dev->event_lock); - intel_crtc->unpin_work = NULL; + intel_crtc->flip_work = NULL; spin_unlock_irq(&dev->event_lock); drm_crtc_vblank_put(crtc); @@ -14051,7 +14024,7 @@ static void intel_finish_crtc_commit(struct drm_crtc *crtc, { struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - intel_pipe_update_end(intel_crtc); + intel_pipe_update_end(intel_crtc, NULL); } /** diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 8efeb90eac07..e10e6959fd43 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -597,14 +597,6 @@ struct vlv_wm_state { bool cxsr; }; -struct intel_mmio_flip { - struct work_struct work; - struct drm_i915_private *i915; - struct drm_i915_gem_request *req; - struct intel_crtc *crtc; - unsigned int rotation; -}; - struct intel_crtc { struct drm_crtc base; enum pipe pipe; @@ -619,7 +611,7 @@ struct intel_crtc { unsigned long enabled_power_domains; bool lowfreq_avail; struct intel_overlay *overlay; - struct intel_unpin_work *unpin_work; + struct intel_flip_work *flip_work; atomic_t unpin_work_count; @@ -942,8 +934,10 @@ intel_get_crtc_for_plane(struct drm_device *dev, int plane) return dev_priv->plane_to_crtc_mapping[plane]; } -struct intel_unpin_work { - struct work_struct work; +struct intel_flip_work { + struct work_struct unpin_work; + struct work_struct mmio_work; + struct drm_crtc *crtc; struct drm_framebuffer *old_fb; struct drm_i915_gem_object *pending_flip_obj; @@ -956,6 +950,7 @@ struct intel_unpin_work { struct drm_i915_gem_request *flip_queued_req; u32 flip_queued_vblank; u32 flip_ready_vblank; + unsigned int rotation; }; struct intel_load_detect_pipe { @@ -1625,7 +1620,7 @@ int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane); int intel_sprite_set_colorkey(struct drm_device *dev, void *data, struct drm_file *file_priv); void intel_pipe_update_start(struct intel_crtc *crtc); -void intel_pipe_update_end(struct intel_crtc *crtc); +void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work); /* intel_tv.c */ void intel_tv_init(struct drm_device *dev); diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index e2de6b0df5a8..8ec7ce549835 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -151,13 +151,19 @@ void intel_pipe_update_start(struct intel_crtc *crtc) * re-enables interrupts and verifies the update was actually completed * before a vblank using the value of @start_vbl_count. */ -void intel_pipe_update_end(struct intel_crtc *crtc) +void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work) { enum pipe pipe = crtc->pipe; int scanline_end = intel_get_crtc_scanline(crtc); u32 end_vbl_count = intel_crtc_get_vblank_counter(crtc); ktime_t end_vbl_time = ktime_get(); + if (work) { + work->flip_queued_vblank = end_vbl_count; + smp_mb__before_atomic(); + atomic_set(&work->pending, INTEL_FLIP_PENDING); + } + trace_i915_pipe_update_end(crtc, end_vbl_count, scanline_end); local_irq_enable();
Rename intel_unpin_work to intel_flip_work and use it for mmio flips and unpinning. Use flip_queued_req to hold the wait request in the mmio case, and the vblank counter from intel_crtc_get_vblank_counter. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 6 +- drivers/gpu/drm/i915/intel_display.c | 189 +++++++++++++++-------------------- drivers/gpu/drm/i915/intel_drv.h | 19 ++-- drivers/gpu/drm/i915/intel_sprite.c | 8 +- 4 files changed, 98 insertions(+), 124 deletions(-)