On Wed, Mar 23, 2016 at 02:24:30PM +0100, 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 allow the vblank interrupt to complete mmio work to > have mmio flips run correctly on g4 and earlier.
Before you actually go and trust drm_vblank_count() you should make it race free. > > Signed-off-by: Maarten Lankhorst <[email protected]> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 4 +- > drivers/gpu/drm/i915/intel_display.c | 271 > +++++++++++------------------------ > drivers/gpu/drm/i915/intel_drv.h | 16 +-- > 3 files changed, 87 insertions(+), 204 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c > b/drivers/gpu/drm/i915/i915_debugfs.c > index 4a0078c17cd1..bc2ae70abcea 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -573,10 +573,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); > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index c52eb1bb4f24..3b082020aab8 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -47,6 +47,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, > @@ -3243,7 +3248,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; > @@ -3825,7 +3830,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; > @@ -3837,11 +3842,11 @@ 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; > > - /* ensure that the unpin work is consistent wrt ->pending. */ > + /* ensure that the flip work is consistent wrt ->pending. */ > smp_rmb(); > - intel_crtc->unpin_work = NULL; > + intel_crtc->flip_work = NULL; > > if (work->event) > drm_send_vblank_event(intel_crtc->base.dev, > @@ -3851,7 +3856,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); > @@ -3875,9 +3880,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); > } > @@ -6259,7 +6266,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); > > @@ -10781,15 +10788,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); > } > > @@ -10800,12 +10808,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); > @@ -10871,16 +10882,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 */ > @@ -10892,11 +10903,11 @@ 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_INACTIVE || > - !page_flip_finished(intel_crtc)) { > + !page_flip_finished(intel_crtc)) { > spin_unlock_irqrestore(&dev->event_lock, flags); > return; > } > @@ -10922,7 +10933,7 @@ 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_flip_work *work) > { > /* Ensure that the work item is consistent when activating it ... */ > smp_wmb(); > @@ -10959,10 +10970,9 @@ 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 */ > > - intel_mark_page_flip_active(intel_crtc->unpin_work); > return 0; > } > > @@ -10991,10 +11001,9 @@ 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); > > - intel_mark_page_flip_active(intel_crtc->unpin_work); > return 0; > } > > @@ -11022,7 +11031,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 > @@ -11033,7 +11042,6 @@ static int intel_gen4_queue_flip(struct drm_device > *dev, > pipesrc = I915_READ(PIPESRC(intel_crtc->pipe)) & 0x0fff0fff; > intel_ring_emit(engine, pf | pipesrc); > > - intel_mark_page_flip_active(intel_crtc->unpin_work); > return 0; > } > > @@ -11057,7 +11065,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 > @@ -11069,7 +11077,6 @@ static int intel_gen6_queue_flip(struct drm_device > *dev, > pipesrc = I915_READ(PIPESRC(intel_crtc->pipe)) & 0x0fff0fff; > intel_ring_emit(engine, pf | pipesrc); > > - intel_mark_page_flip_active(intel_crtc->unpin_work); > return 0; > } > > @@ -11161,10 +11168,9 @@ 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)); > > - intel_mark_page_flip_active(intel_crtc->unpin_work); > return 0; > } > > @@ -11182,9 +11188,6 @@ static bool use_mmio_flip(struct intel_engine_cs > *engine, > if (engine == NULL) > return true; > > - if (INTEL_INFO(engine->dev)->gen < 5) > - return false; > - > if (i915.use_mmio_flip < 0) > return false; > else if (i915.use_mmio_flip > 0) > @@ -11199,126 +11202,21 @@ static bool use_mmio_flip(struct intel_engine_cs > *engine, > return engine != > i915_gem_request_get_engine(obj->last_write_req); > } > > -static void skl_do_mmio_flip(struct intel_crtc *intel_crtc, > - unsigned int rotation, > - struct intel_unpin_work *work) > -{ > - struct drm_device *dev = intel_crtc->base.dev; > - struct drm_i915_private *dev_priv = dev->dev_private; > - struct drm_framebuffer *fb = intel_crtc->base.primary->fb; > - const enum pipe pipe = intel_crtc->pipe; > - u32 ctl, stride, tile_height; > - > - ctl = I915_READ(PLANE_CTL(pipe, 0)); > - ctl &= ~PLANE_CTL_TILED_MASK; > - switch (fb->modifier[0]) { > - case DRM_FORMAT_MOD_NONE: > - break; > - case I915_FORMAT_MOD_X_TILED: > - ctl |= PLANE_CTL_TILED_X; > - break; > - case I915_FORMAT_MOD_Y_TILED: > - ctl |= PLANE_CTL_TILED_Y; > - break; > - case I915_FORMAT_MOD_Yf_TILED: > - ctl |= PLANE_CTL_TILED_YF; > - break; > - default: > - MISSING_CASE(fb->modifier[0]); > - } > - > - /* > - * The stride is either expressed as a multiple of 64 bytes chunks for > - * linear buffers or in number of tiles for tiled buffers. > - */ > - if (intel_rotation_90_or_270(rotation)) { > - /* stride = Surface height in tiles */ > - tile_height = intel_tile_height(dev_priv, fb->modifier[0], 0); > - stride = DIV_ROUND_UP(fb->height, tile_height); > - } else { > - stride = fb->pitches[0] / > - intel_fb_stride_alignment(dev_priv, fb->modifier[0], > - fb->pixel_format); > - } > - > - /* > - * Both PLANE_CTL and PLANE_STRIDE are not updated on vblank but on > - * PLANE_SURF updates, the update is then guaranteed to be atomic. > - */ > - I915_WRITE(PLANE_CTL(pipe, 0), ctl); > - I915_WRITE(PLANE_STRIDE(pipe, 0), stride); > - > - I915_WRITE(PLANE_SURF(pipe, 0), work->gtt_offset); > - POSTING_READ(PLANE_SURF(pipe, 0)); > -} > - > -static void ilk_do_mmio_flip(struct intel_crtc *intel_crtc, > - struct intel_unpin_work *work) > +static void intel_mmio_flip_work_func(struct work_struct *w) > { > - struct drm_device *dev = intel_crtc->base.dev; > + 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_device *dev = crtc->base.dev; > struct drm_i915_private *dev_priv = dev->dev_private; > - struct intel_framebuffer *intel_fb = > - to_intel_framebuffer(intel_crtc->base.primary->fb); > - struct drm_i915_gem_object *obj = intel_fb->obj; > - i915_reg_t reg = DSPCNTR(intel_crtc->plane); > - u32 dspcntr; > - > - dspcntr = I915_READ(reg); > - > - if (obj->tiling_mode != I915_TILING_NONE) > - dspcntr |= DISPPLANE_TILED; > - else > - dspcntr &= ~DISPPLANE_TILED; > - > - I915_WRITE(reg, dspcntr); > + struct intel_plane *primary = to_intel_plane(crtc->base.primary); > + struct drm_i915_gem_object *obj = intel_fb_obj(primary->base.state->fb); > > - I915_WRITE(DSPSURF(intel_crtc->plane), work->gtt_offset); > - 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) > -{ > - 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_framebuffer *intel_fb = > - to_intel_framebuffer(mmio_flip->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, > - mmio_flip->crtc->reset_counter, > + if (work->flip_queued_req) > + WARN_ON(__i915_wait_request(work->flip_queued_req, > + crtc->reset_counter, > 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) > @@ -11326,29 +11224,12 @@ 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; > - > - INIT_WORK(&mmio_flip->work, intel_mmio_flip_work_func); > - schedule_work(&mmio_flip->work); > - > - return 0; > + intel_pipe_update_start(crtc); > + primary->update_plane(&primary->base, > + crtc->config, > + to_intel_plane_state(primary->base.state)); > + atomic_set(&work->pending, INTEL_FLIP_PENDING); > + intel_pipe_update_end(crtc); > } > > static int intel_default_queue_flip(struct drm_device *dev, > @@ -11366,7 +11247,7 @@ 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; > + struct intel_flip_work *work = intel_crtc->flip_work; > u32 addr; > u32 pending; > > @@ -11374,6 +11255,13 @@ static bool __intel_pageflip_stall_check(struct > drm_device *dev, > if (pending == INTEL_FLIP_INACTIVE) > return false; > > + /* > + * If this is a mmio flip return true because state > + * is changed to INTEL_FLIP_PENDING after updating. > + */ > + if (is_mmio_work(work)) > + return true; > + > if (work->flip_ready_vblank == 0) { > if (work->flip_queued_req && > !i915_gem_request_completed(work->flip_queued_req, true)) > @@ -11404,7 +11292,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()); > > @@ -11412,14 +11300,15 @@ 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", > + WARN_ONCE(!is_mmio_work(work), > + "Kicking stuck page flip: queued at %d, now %d\n", > work->flip_queued_vblank, drm_vblank_count(dev, pipe)); > page_flip_completed(intel_crtc); > work = NULL; > } > - if (work != NULL && > + if (work != NULL && !is_mmio_work(work) && > drm_vblank_count(dev, pipe) - work->flip_queued_vblank > 1) > intel_queue_rps_boost_for_request(dev, work->flip_queued_req); > spin_unlock(&dev->event_lock); > @@ -11437,7 +11326,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; > @@ -11474,19 +11363,20 @@ 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. > */ > - if (__intel_pageflip_stall_check(dev, crtc)) { > + if (!is_mmio_work(intel_crtc->flip_work) && > + __intel_pageflip_stall_check(dev, crtc)) { > DRM_DEBUG_DRIVER("flip queue: previous flip completed, > continuing\n"); > page_flip_completed(intel_crtc); > } else { > @@ -11498,7 +11388,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) > @@ -11567,23 +11457,22 @@ static int intel_crtc_page_flip(struct drm_crtc > *crtc, > work->flip_queued_vblank = drm_crtc_vblank_count(crtc); > > if (mmio_flip) { > - ret = intel_queue_mmio_flip(dev, crtc, obj); > - if (ret) > - goto cleanup_unpin; > + INIT_WORK(&work->mmio_work, intel_mmio_flip_work_func); > > i915_gem_request_assign(&work->flip_queued_req, > obj->last_write_req); > + > + 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); > - } > - > - if (request) > + intel_mark_page_flip_active(work); > i915_add_request_no_flush(request); > + } > > work->flip_queued_vblank = drm_crtc_vblank_count(crtc); > > @@ -11613,7 +11502,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); > diff --git a/drivers/gpu/drm/i915/intel_drv.h > b/drivers/gpu/drm/i915/intel_drv.h > index e26293ead94f..cac368138764 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -592,14 +592,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; > @@ -614,7 +606,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; > > @@ -935,8 +927,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; > -- > 2.1.0 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
