drm/i915: Reapply page flip atomic preparation patches.
Subsystems (2)
cover drm/i915: Reapply page flip atomic preparation patches.
Add some minor changes to prevent bisect breaking.
Main change is making sure crtc_state is not freed while the mmio update still runs.
Maarten Lankhorst (9):
drm/i915: Allow mmio updates on all platforms, v3. drm/i915: Convert flip_work to a list, v2.
drm/i915: Add the exclusive fence to plane_state. drm/i915: Rework intel_crtc_page_flip to be almost atomic, v4. drm/i915: Remove cs based page flip support, v2. drm/i915: Remove use_mmio_flip kernel parameter. drm/i915: Remove queue_flip pointer.
drm/i915: Remove reset_counter from intel_crtc. drm/i915: Pass atomic states to fbc update functions.
drivers/gpu/drm/i915/i915_debugfs.c | 89 ++- drivers/gpu/drm/i915/i915_drv.h | 5 - drivers/gpu/drm/i915/i915_irq.c | 120 +--- drivers/gpu/drm/i915/i915_params.c | 5 - drivers/gpu/drm/i915/i915_params.h | 1 - drivers/gpu/drm/i915/intel_atomic_plane.c | 1 + drivers/gpu/drm/i915/intel_display.c | 1118 ++++++++--------------------- drivers/gpu/drm/i915/intel_drv.h | 37 +- drivers/gpu/drm/i915/intel_fbc.c | 39 +- drivers/gpu/drm/i915/intel_lrc.c | 4 +- 10 files changed, 417 insertions(+), 1002 deletions(-)
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/9 drm/i915: Allow mmio updates on all platforms, v3.
With intel_pipe_update begin/end we ensure that the mmio updates don't run during vblank interrupt, using the hw counter we can be sure that when current vblank count != vblank count at the time of pipe_update_end the mmio update is complete.
This allows us to use mmio updates on all platforms, using the update_plane call.
With Chris Wilson's patch to skip waiting for vblanks for legacy_cursor_update this potentially leaves a small race condition. In case of !legacy_cursor_update we wait for flips to complete so there's no race for freeing crtc_state. In case of legacy_cursor_update there's a check forwork->crtc_state == old_crtc_state. In that case the old_crtc_state is removed from intel_atomic_state and freed by intel_unpin_work_fn. This ensures that intel_mmio_flip_work_func never uses a freed pointer to crtc_state.
Changes since v1:
- Split out the flip_work rename.
Changes since v2:
- Do not break bisect by reverting the stall fix for cursor updates, instead add crtc_state to intel_flip_work, and make sure it's not freed in intel_atomic_commit for legacy cursor updates.
--- drivers/gpu/drm/i915/intel_display.c | 118 ++++++++--------------------------- drivers/gpu/drm/i915/intel_drv.h | 4 +- 2 files changed, 29 insertions(+), 93 deletions(-)
drivers/gpu/drm/i915/intel_display.c +26 -92
@@ -10976,6 +10976,9 @@ static void intel_unpin_work_fn(struct work_struct *__work)BUG_ON (atomic_read (&crtc->unpin_work_count) ==0 );atomic_dec (&crtc->unpin_work_count); +if (work->free_new_crtc_state) +intel_crtc_destroy_state (&crtc->base, &work->new_crtc_state->base); +kfree (work); }
@@ -11373,9 +11376,6 @@ static bool use_mmio_flip(struct intel_engine_cs *engine,if (engine ==NULL )return true; -if (INTEL_GEN (engine->i915) <5 ) -return false; -if (i915.use_mmio_flip <0 )return false;else if (i915.use_mmio_flip >0 )
@@ -11390,92 +11390,15 @@ 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_flip_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_flip_work *work) -{ -struct drm_device *dev = intel_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); - -I915_WRITE (DSPSURF (intel_crtc->plane), work->gtt_offset); -POSTING_READ (DSPSURF (intel_crtc->plane)); -} -static void intel_mmio_flip_work_func (struct work_struct *w) {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 (crtc->base.primary->fb); -struct drm_i915_gem_object *obj = intel_fb->obj; +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_plane *primary =to_intel_plane (crtc->base.primary); +struct drm_i915_gem_object *obj =intel_fb_obj (primary->base.state->fb);if (work->flip_queued_req) WARN_ON(__i915_wait_request(work->flip_queued_req,
@@ -11489,13 +11412,9 @@ static void intel_mmio_flip_work_func(struct work_struct *w) MAX_SCHEDULE_TIMEOUT) < 0);intel_pipe_update_start (crtc); - -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); - + primary->update_plane (&primary->base, + work->new_crtc_state, +to_intel_plane_state (primary->base.state));intel_pipe_update_end (crtc, work); }
@@ -11622,6 +11541,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,if (work ==NULL )return -ENOMEM ; + work->new_crtc_state =to_intel_crtc_state (crtc->state); + work->event = event; work->crtc = crtc; work->old_fb = old_fb;
@@ -11720,7 +11641,6 @@ 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) {INIT_WORK (&work->mmio_work, intel_mmio_flip_work_func);
@@ -13779,6 +13699,20 @@ static int intel_atomic_commit(struct drm_device *dev,modeset_put_power_domains (dev_priv, put_domains[i]);intel_modeset_verify_crtc (crtc, old_crtc_state, crtc->state); + +if (state->legacy_cursor_update && +to_intel_crtc (crtc)->flip_work) { +struct intel_flip_work *work; + +spin_lock_irq (&dev->event_lock); + work =to_intel_crtc (crtc)->flip_work; +if (work && &work->new_crtc_state->base == old_crtc_state) { + state->crtcs[i] =NULL ; + state->crtc_states[i] =NULL ; + work->free_new_crtc_state = true; + } +spin_unlock_irq (&dev->event_lock); + } }if (intel_state->modeset)
drivers/gpu/drm/i915/intel_drv.h +3 -1
@@ -976,6 +976,9 @@ struct intel_flip_work {struct work_struct unpin_work;struct work_struct mmio_work; +struct intel_crtc_state *new_crtc_state; +bool free_new_crtc_state; +struct drm_crtc *crtc;struct drm_framebuffer *old_fb;struct drm_i915_gem_object *pending_flip_obj;
@@ -986,7 +989,6 @@ struct intel_flip_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 {
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/9 drm/i915: Convert flip_work to a list, v2.
In reply to Maarten LankhorstThis will be required to allow more than 1 outstanding update in the future. For now it's unclear how this will will be handled, but with a list it's definitely possible.
Changes since v1:
- Changed to prevent breaking with the legacy cursor update changes.
--- drivers/gpu/drm/i915/i915_debugfs.c | 90 +++++++++++--------- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 156 +++++++++++++++++++++-------------- drivers/gpu/drm/i915/intel_drv.h | 4 +- 4 files changed, 149 insertions(+), 103 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +51 -39
@@ -621,6 +621,53 @@ static int i915_gem_gtt_info(struct seq_file *m, void *data)return 0 ; } +static void i915_dump_pageflip (struct seq_file *m, +struct drm_i915_private *dev_priv, +struct intel_crtc *crtc, +struct intel_flip_work *work) +{ +const char pipe =pipe_name (crtc->pipe); +const char plane =plane_name (crtc->plane); +u32 pending; +u32 addr; + + pending =atomic_read (&work->pending); +if (pending) { +seq_printf (m,"Flip ioctl preparing on pipe %c (plane %c)\n" , + pipe, plane); + }else { +seq_printf (m,"Flip pending (waiting for vsync) on pipe %c (plane %c)\n" , + pipe, plane); + } +if (work->flip_queued_req) { +struct intel_engine_cs *engine =i915_gem_request_get_engine (work->flip_queued_req); + +seq_printf (m,"Flip queued on %s at seqno %x, next seqno %x [current breadcrumb %x], completed? %d\n" , + engine->name, +i915_gem_request_get_seqno (work->flip_queued_req), + dev_priv->next_seqno, + engine->get_seqno (engine), +i915_gem_request_completed (work->flip_queued_req, true)); + }else +seq_printf (m,"Flip not associated with any ring\n" ); +seq_printf (m,"Flip queued on frame %d, (was ready on frame %d), now %d\n" , + work->flip_queued_vblank, + work->flip_ready_vblank, +intel_crtc_get_vblank_counter (crtc)); +seq_printf (m,"%d prepares\n" ,atomic_read (&work->pending)); + +if (INTEL_INFO (dev_priv)->gen >=4 ) + addr =I915_HI_DISPBASE (I915_READ (DSPSURF (crtc->plane))); +else + addr =I915_READ (DSPADDR (crtc->plane)); +seq_printf (m,"Current scanout address 0x%08x\n" , addr); + +if (work->pending_flip_obj) { +seq_printf (m,"New framebuffer address 0x%08lx\n" , (long )work->gtt_offset); +seq_printf (m,"MMIO update completed? %d\n" , addr == work->gtt_offset); + } +} +static int i915_gem_pageflip_info (struct seq_file *m,void *data) {struct drm_info_node *node = m->private;
@@ -639,48 +686,13 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)struct intel_flip_work *work;spin_lock_irq (&dev->event_lock); - work = crtc->flip_work; -if (work ==NULL ) { +if (list_empty (&crtc->flip_work)) {seq_printf (m,"No flip due on pipe %c (plane %c)\n" , pipe, plane); }else { -u32 pending; -u32 addr; - - pending =atomic_read (&work->pending); -if (pending) { -seq_printf (m,"Flip ioctl preparing on pipe %c (plane %c)\n" , - pipe, plane); - }else { -seq_printf (m,"Flip pending (waiting for vsync) on pipe %c (plane %c)\n" , - pipe, plane); - } -if (work->flip_queued_req) { -struct intel_engine_cs *engine =i915_gem_request_get_engine (work->flip_queued_req); - -seq_printf (m,"Flip queued on %s at seqno %x, next seqno %x [current breadcrumb %x], completed? %d\n" , - engine->name, -i915_gem_request_get_seqno (work->flip_queued_req), - dev_priv->next_seqno, - engine->get_seqno (engine), -i915_gem_request_completed (work->flip_queued_req, true)); - }else -seq_printf (m,"Flip not associated with any ring\n" ); -seq_printf (m,"Flip queued on frame %d, (was ready on frame %d), now %d\n" , - work->flip_queued_vblank, - work->flip_ready_vblank, -intel_crtc_get_vblank_counter (crtc)); -seq_printf (m,"%d prepares\n" ,atomic_read (&work->pending)); - -if (INTEL_INFO (dev)->gen >=4 ) - addr =I915_HI_DISPBASE (I915_READ (DSPSURF (crtc->plane))); -else - addr =I915_READ (DSPADDR (crtc->plane)); -seq_printf (m,"Current scanout address 0x%08x\n" , addr); - -if (work->pending_flip_obj) { -seq_printf (m,"New framebuffer address 0x%08lx\n" , (long )work->gtt_offset); -seq_printf (m,"MMIO update completed? %d\n" , addr == work->gtt_offset); +list_for_each_entry (work, &crtc->flip_work, head) { +i915_dump_pageflip (m, dev_priv, crtc, work); +seq_puts (m,"\n" ); } }spin_unlock_irq (&dev->event_lock);
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -622,7 +622,7 @@ struct drm_i915_display_funcs {struct drm_framebuffer *fb, struct drm_i915_gem_object *obj, struct drm_i915_gem_request *req, - uint32_t flags); + uint64_t gtt_offset);void (*hpd_irq_setup)(struct drm_i915_private *dev_priv);/* clock updates for mode set */ /* cursor updates */
drivers/gpu/drm/i915/intel_display.c +94 -62
346 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +3 -1
@@ -644,7 +644,7 @@ struct intel_crtc {unsigned long enabled_power_domains;bool lowfreq_avail;struct intel_overlay *overlay; -struct intel_flip_work *flip_work; +struct list_head flip_work;atomic_t unpin_work_count;
@@ -973,6 +973,8 @@ intel_get_crtc_for_plane(struct drm_device *dev, int plane) }struct intel_flip_work { +struct list_head head; +struct work_struct unpin_work;struct work_struct mmio_work;
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/9 drm/i915: Add the exclusive fence to plane_state.
In reply to Maarten LankhorstSet plane_state->base.fence to the dma_buf exclusive fence, and add a wait to the mmio function. This will make it easier to unify plane updates later on.
--- drivers/gpu/drm/i915/intel_atomic_plane.c | 1 + drivers/gpu/drm/i915/intel_display.c | 54 +++++++++++++++++++++++-------- 2 files changed, 42 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/intel_atomic_plane.c +1 -0
@@ -102,6 +102,7 @@ intel_plane_destroy_state(struct drm_plane *plane, struct drm_plane_state *state) {WARN_ON (state &&to_intel_plane_state (state)->wait_req); +WARN_ON (state && state->fence);drm_atomic_helper_plane_destroy_state (plane, state); }
drivers/gpu/drm/i915/intel_display.c +41 -13
84 lines not on this page · raw message
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/9 drm/i915: Rework intel_crtc_page_flip to be almost atomic, v4.
In reply to Maarten LankhorstCreate a work structure that will be used for all changes. This will be used later on in the atomic commit function.
Changes since v1:
- Free old_crtc_state from unpin_work_fn properly. Changes since v2:
- Add hunk for calling hw state verifier.
- Add missing support for color spaces.
Changes since v3:
- Update for legacy cursor work.
- null pointer to request_unreference is no longer allowed.
--- drivers/gpu/drm/i915/i915_debugfs.c | 36 +- drivers/gpu/drm/i915/intel_display.c | 676 +++++++++++++++++++++-------------- drivers/gpu/drm/i915/intel_drv.h | 17 +- 3 files changed, 444 insertions(+), 285 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +25 -11
@@ -627,29 +627,43 @@ static void i915_dump_pageflip(struct seq_file *m, struct intel_flip_work *work) {const char pipe =pipe_name (crtc->pipe); -const char plane =plane_name (crtc->plane);u32 pending;u32 addr; +int i; pending =atomic_read (&work->pending);if (pending) {seq_printf (m,"Flip ioctl preparing on pipe %c (plane %c)\n" , - pipe, plane); + pipe,plane_name (crtc->plane)); }else {seq_printf (m,"Flip pending (waiting for vsync) on pipe %c (plane %c)\n" , - pipe, plane); + pipe,plane_name (crtc->plane)); } -if (work->flip_queued_req) { -struct intel_engine_cs *engine =i915_gem_request_get_engine (work->flip_queued_req); -seq_printf (m,"Flip queued on %s at seqno %x, next seqno %x [current breadcrumb %x], completed? %d\n" , + +for (i =0 ; i < work->num_planes; i++) { +struct intel_plane_state *old_plane_state = work->old_plane_state[i]; +struct drm_plane *plane = old_plane_state->base.plane; +struct drm_i915_gem_request *req = old_plane_state->wait_req; +struct intel_engine_cs *engine; + +seq_printf (m,"[PLANE:%i] part of flip.\n" , plane->base.id); + +if (!req) { +seq_printf (m,"Plane not associated with any engine\n" ); +continue ; + } + + engine =i915_gem_request_get_engine (req); + +seq_printf (m,"Plane blocked on %s at seqno %x, next seqno %x [current breadcrumb %x], completed? %d\n" , engine->name, -i915_gem_request_get_seqno (work->flip_queued_req), +i915_gem_request_get_seqno (req), dev_priv->next_seqno, engine->get_seqno (engine), -i915_gem_request_completed (work->flip_queued_req, true)); - }else -seq_printf (m,"Flip not associated with any ring\n" ); +i915_gem_request_completed (req, true)); + } + seq_printf(m, "Flip queued on frame %d, (was ready on frame %d), now %d\n", work->flip_queued_vblank, work->flip_ready_vblank,
@@ -662,7 +676,7 @@ static void i915_dump_pageflip(struct seq_file *m, addr =I915_READ (DSPADDR (crtc->plane));seq_printf (m,"Current scanout address 0x%08x\n" , addr); -if (work->pending_flip_obj) { +if (work->flip_queued_req) {seq_printf (m,"New framebuffer address 0x%08lx\n" , (long )work->gtt_offset);seq_printf (m,"MMIO update completed? %d\n" , addr == work->gtt_offset); }
drivers/gpu/drm/i915/intel_display.c +408 -268
867 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +11 -6
@@ -978,12 +978,6 @@ struct intel_flip_work {struct work_struct unpin_work;struct work_struct mmio_work; -struct intel_crtc_state *new_crtc_state; -bool free_new_crtc_state; - -struct drm_crtc *crtc; -struct drm_framebuffer *old_fb; -struct drm_i915_gem_object *pending_flip_obj;struct drm_pending_vblank_event *event;atomic_t pending;u32 flip_count;
@@ -991,6 +985,17 @@ struct intel_flip_work {struct drm_i915_gem_request *flip_queued_req;u32 flip_queued_vblank;u32 flip_ready_vblank; + +unsigned put_power_domains; +unsigned num_planes; + +bool can_async_unpin, flip_prepared, free_new_crtc_state; + +unsigned fb_bits; + +struct intel_crtc_state *old_crtc_state, *new_crtc_state; +struct intel_plane_state *old_plane_state[I915_MAX_PLANES +1 ]; +struct intel_plane_state *new_plane_state[I915_MAX_PLANES +1 ]; };struct intel_load_detect_pipe {
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/9 drm/i915: Rework intel_crtc_page_flip to be almost atomic, v5.
Create a work structure that will be used for all changes. This will be used later on in the atomic commit function.
Changes since v1:
- Free old_crtc_state from unpin_work_fn properly. Changes since v2:
- Add hunk for calling hw state verifier.
- Add missing support for color spaces.
Changes since v3:
- Update for legacy cursor work.
- null pointer to request_unreference is no longer allowed. Changes since v4:
- Only call trace_i915_flip_request once. (Ville)
--- drivers/gpu/drm/i915/i915_debugfs.c | 36 +- drivers/gpu/drm/i915/intel_display.c | 674 +++++++++++++++++++++-------------- drivers/gpu/drm/i915/intel_drv.h | 17 +- 3 files changed, 442 insertions(+), 285 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +25 -11
@@ -627,29 +627,43 @@ static void i915_dump_pageflip(struct seq_file *m, struct intel_flip_work *work) {const char pipe =pipe_name (crtc->pipe); -const char plane =plane_name (crtc->plane);u32 pending;u32 addr; +int i; pending =atomic_read (&work->pending);if (pending) {seq_printf (m,"Flip ioctl preparing on pipe %c (plane %c)\n" , - pipe, plane); + pipe,plane_name (crtc->plane)); }else {seq_printf (m,"Flip pending (waiting for vsync) on pipe %c (plane %c)\n" , - pipe, plane); + pipe,plane_name (crtc->plane)); } -if (work->flip_queued_req) { -struct intel_engine_cs *engine =i915_gem_request_get_engine (work->flip_queued_req); -seq_printf (m,"Flip queued on %s at seqno %x, next seqno %x [current breadcrumb %x], completed? %d\n" , + +for (i =0 ; i < work->num_planes; i++) { +struct intel_plane_state *old_plane_state = work->old_plane_state[i]; +struct drm_plane *plane = old_plane_state->base.plane; +struct drm_i915_gem_request *req = old_plane_state->wait_req; +struct intel_engine_cs *engine; + +seq_printf (m,"[PLANE:%i] part of flip.\n" , plane->base.id); + +if (!req) { +seq_printf (m,"Plane not associated with any engine\n" ); +continue ; + } + + engine =i915_gem_request_get_engine (req); + +seq_printf (m,"Plane blocked on %s at seqno %x, next seqno %x [current breadcrumb %x], completed? %d\n" , engine->name, -i915_gem_request_get_seqno (work->flip_queued_req), +i915_gem_request_get_seqno (req), dev_priv->next_seqno, engine->get_seqno (engine), -i915_gem_request_completed (work->flip_queued_req, true)); - }else -seq_printf (m,"Flip not associated with any ring\n" ); +i915_gem_request_completed (req, true)); + } + seq_printf(m, "Flip queued on frame %d, (was ready on frame %d), now %d\n", work->flip_queued_vblank, work->flip_ready_vblank,
@@ -662,7 +676,7 @@ static void i915_dump_pageflip(struct seq_file *m, addr =I915_READ (DSPADDR (crtc->plane));seq_printf (m,"Current scanout address 0x%08x\n" , addr); -if (work->pending_flip_obj) { +if (work->flip_queued_req) {seq_printf (m,"New framebuffer address 0x%08lx\n" , (long )work->gtt_offset);seq_printf (m,"MMIO update completed? %d\n" , addr == work->gtt_offset); }
drivers/gpu/drm/i915/intel_display.c +406 -268
865 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +11 -6
@@ -978,12 +978,6 @@ struct intel_flip_work {struct work_struct unpin_work;struct work_struct mmio_work; -struct intel_crtc_state *new_crtc_state; -bool free_new_crtc_state; - -struct drm_crtc *crtc; -struct drm_framebuffer *old_fb; -struct drm_i915_gem_object *pending_flip_obj;struct drm_pending_vblank_event *event;atomic_t pending;u32 flip_count;
@@ -991,6 +985,17 @@ struct intel_flip_work {struct drm_i915_gem_request *flip_queued_req;u32 flip_queued_vblank;u32 flip_ready_vblank; + +unsigned put_power_domains; +unsigned num_planes; + +bool can_async_unpin, flip_prepared, free_new_crtc_state; + +unsigned fb_bits; + +struct intel_crtc_state *old_crtc_state, *new_crtc_state; +struct intel_plane_state *old_plane_state[I915_MAX_PLANES +1 ]; +struct intel_plane_state *new_plane_state[I915_MAX_PLANES +1 ]; };struct intel_load_detect_pipe {
Signature · 7 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/9 drm/i915: Remove cs based page flip support, v2.
In reply to Maarten LankhorstWith mmio flips now available on all platforms it's time to remove support for cs flips.
Changes since v1:
- Rebase for legacy cursor updates.
--- drivers/gpu/drm/i915/i915_debugfs.c | 19 +- drivers/gpu/drm/i915/i915_irq.c | 120 ++--------- drivers/gpu/drm/i915/intel_display.c | 392 +---------------------------------- drivers/gpu/drm/i915/intel_drv.h | 9 +- 4 files changed, 33 insertions(+), 507 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -17
@@ -628,7 +628,6 @@ static void i915_dump_pageflip(struct seq_file *m, {const char pipe =pipe_name (crtc->pipe);u32 pending; -u32 addr;int i; pending =atomic_read (&work->pending);
@@ -640,7 +639,6 @@ static void i915_dump_pageflip(struct seq_file *m, pipe, plane_name(crtc->plane)); } -for (i =0 ; i < work->num_planes; i++) {struct intel_plane_state *old_plane_state = work->old_plane_state[i];struct drm_plane *plane = old_plane_state->base.plane;
@@ -664,22 +662,9 @@ static void i915_dump_pageflip(struct seq_file *m, i915_gem_request_completed(req, true)); } -seq_printf (m,"Flip queued on frame %d, (was ready on frame %d), now %d\n" , - work->flip_queued_vblank, - work->flip_ready_vblank, +seq_printf (m,"Flip queued on frame %d, now %d\n" , + pending ? work->flip_queued_vblank :-1 ,intel_crtc_get_vblank_counter (crtc)); -seq_printf (m,"%d prepares\n" ,atomic_read (&work->pending)); - -if (INTEL_INFO (dev_priv)->gen >=4 ) - addr =I915_HI_DISPBASE (I915_READ (DSPSURF (crtc->plane))); -else - addr =I915_READ (DSPADDR (crtc->plane)); -seq_printf (m,"Current scanout address 0x%08x\n" , addr); - -if (work->flip_queued_req) { -seq_printf (m,"New framebuffer address 0x%08lx\n" , (long )work->gtt_offset); -seq_printf (m,"MMIO update completed? %d\n" , addr == work->gtt_offset); - } }static int i915_gem_pageflip_info (struct seq_file *m,void *data)
drivers/gpu/drm/i915/i915_irq.c +22 -98
189 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +7 -385
472 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +2 -7
@@ -980,16 +980,12 @@ struct intel_flip_work {struct drm_pending_vblank_event *event;atomic_t pending; -u32 flip_count; -u32 gtt_offset; -struct drm_i915_gem_request *flip_queued_req;u32 flip_queued_vblank; -u32 flip_ready_vblank;unsigned put_power_domains;unsigned num_planes; -bool can_async_unpin, flip_prepared, free_new_crtc_state; +bool can_async_unpin, free_new_crtc_state;unsigned fb_bits;
@@ -1207,9 +1203,8 @@ struct drm_framebuffer * __intel_framebuffer_create(struct drm_device *dev, struct drm_mode_fb_cmd2 *mode_cmd, struct drm_i915_gem_object *obj); -void intel_finish_page_flip_cs (struct drm_i915_private *dev_priv,int pipe);void intel_finish_page_flip_mmio (struct drm_i915_private *dev_priv,int pipe); -void intel_check_page_flip (struct drm_i915_private *dev_priv,int pipe); +int intel_prepare_plane_fb (struct drm_plane *plane,const struct drm_plane_state *new_state); void intel_cleanup_plane_fb(struct drm_plane *plane,
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/9 drm/i915: Remove cs based page flip support, v3.
With mmio flips now available on all platforms it's time to remove support for cs flips.
Changes since v1:
- Rebase for legacy cursor updates.
Changes since v2:
- Silence remainder of cs page flip handler.
--- drivers/gpu/drm/i915/i915_debugfs.c | 19 +- drivers/gpu/drm/i915/i915_irq.c | 120 ++--------- drivers/gpu/drm/i915/intel_display.c | 390 +---------------------------------- drivers/gpu/drm/i915/intel_drv.h | 9 +- 4 files changed, 33 insertions(+), 505 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -17
@@ -628,7 +628,6 @@ static void i915_dump_pageflip(struct seq_file *m, {const char pipe =pipe_name (crtc->pipe);u32 pending; -u32 addr;int i; pending =atomic_read (&work->pending);
@@ -640,7 +639,6 @@ static void i915_dump_pageflip(struct seq_file *m, pipe, plane_name(crtc->plane)); } -for (i =0 ; i < work->num_planes; i++) {struct intel_plane_state *old_plane_state = work->old_plane_state[i];struct drm_plane *plane = old_plane_state->base.plane;
@@ -664,22 +662,9 @@ static void i915_dump_pageflip(struct seq_file *m, i915_gem_request_completed(req, true)); } -seq_printf (m,"Flip queued on frame %d, (was ready on frame %d), now %d\n" , - work->flip_queued_vblank, - work->flip_ready_vblank, +seq_printf (m,"Flip queued on frame %d, now %d\n" , + pending ? work->flip_queued_vblank :-1 ,intel_crtc_get_vblank_counter (crtc)); -seq_printf (m,"%d prepares\n" ,atomic_read (&work->pending)); - -if (INTEL_INFO (dev_priv)->gen >=4 ) - addr =I915_HI_DISPBASE (I915_READ (DSPSURF (crtc->plane))); -else - addr =I915_READ (DSPADDR (crtc->plane)); -seq_printf (m,"Current scanout address 0x%08x\n" , addr); - -if (work->flip_queued_req) { -seq_printf (m,"New framebuffer address 0x%08lx\n" , (long )work->gtt_offset); -seq_printf (m,"MMIO update completed? %d\n" , addr == work->gtt_offset); - } }static int i915_gem_pageflip_info (struct seq_file *m,void *data)
drivers/gpu/drm/i915/i915_irq.c +22 -98
189 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +7 -383
470 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +2 -7
@@ -980,16 +980,12 @@ struct intel_flip_work {struct drm_pending_vblank_event *event;atomic_t pending; -u32 flip_count; -u32 gtt_offset; -struct drm_i915_gem_request *flip_queued_req;u32 flip_queued_vblank; -u32 flip_ready_vblank;unsigned put_power_domains;unsigned num_planes; -bool can_async_unpin, flip_prepared, free_new_crtc_state; +bool can_async_unpin, free_new_crtc_state;unsigned fb_bits;
@@ -1207,9 +1203,8 @@ struct drm_framebuffer * __intel_framebuffer_create(struct drm_device *dev, struct drm_mode_fb_cmd2 *mode_cmd, struct drm_i915_gem_object *obj); -void intel_finish_page_flip_cs (struct drm_i915_private *dev_priv,int pipe);void intel_finish_page_flip_mmio (struct drm_i915_private *dev_priv,int pipe); -void intel_check_page_flip (struct drm_i915_private *dev_priv,int pipe); +int intel_prepare_plane_fb (struct drm_plane *plane,const struct drm_plane_state *new_state); void intel_cleanup_plane_fb(struct drm_plane *plane,
Signature · 7 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/9 drm/i915: Remove use_mmio_flip kernel parameter.
In reply to Maarten LankhorstWith the removal of cs flips this is always force enabled.
--- drivers/gpu/drm/i915/i915_params.c | 5 ----- drivers/gpu/drm/i915/i915_params.h | 1 - drivers/gpu/drm/i915/intel_lrc.c | 4 +--- 3 files changed, 1 insertion(+), 9 deletions(-)
drivers/gpu/drm/i915/i915_params.c +0 -5
@@ -49,7 +49,6 @@ struct i915_params i915 __read_mostly = { .invert_brightness = 0, .disable_display = 0, .enable_cmd_parser = 1, - .use_mmio_flip = 0, .mmio_debug = 0, .verbose_state_checks = 1, .nuclear_pageflip = 0,
@@ -175,10 +174,6 @@ module_param_named_unsafe(enable_cmd_parser, i915.enable_cmd_parser, int, 0600);MODULE_PARM_DESC (enable_cmd_parser,"Enable command parsing (1=enabled [default], 0=disabled)" ); -module_param_named_unsafe (use_mmio_flip, i915.use_mmio_flip, int,0600 ); -MODULE_PARM_DESC (use_mmio_flip, -"use MMIO flips (-1=never, 0=driver discretion [default], 1=always)" ); -module_param_named (mmio_debug, i915.mmio_debug, int,0600 );MODULE_PARM_DESC (mmio_debug, "Enable the MMIO debug code for the first N failures (default: off). "
drivers/gpu/drm/i915/i915_params.h +0 -1
@@ -48,7 +48,6 @@ struct i915_params {int enable_guc_loading;int enable_guc_submission;int guc_log_level; -int use_mmio_flip;int mmio_debug;int edp_vswing;unsigned int inject_load_failure;
drivers/gpu/drm/i915/intel_lrc.c +1 -3
@@ -260,9 +260,7 @@ int intel_sanitize_enable_execlists(struct drm_i915_private *dev_priv, int enablif (enable_execlists ==0 )return 0 ; -if (HAS_LOGICAL_RING_CONTEXTS (dev_priv) && -USES_PPGTT (dev_priv) && - i915.use_mmio_flip >=0 ) +if (HAS_LOGICAL_RING_CONTEXTS (dev_priv) &&USES_PPGTT (dev_priv))return 1 ;return 0 ;
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/9 drm/i915: Remove queue_flip pointer.
In reply to Maarten LankhorstWith the removal of cs support this is no longer reachable. Can be revived if needed.
--- drivers/gpu/drm/i915/i915_drv.h | 5 - drivers/gpu/drm/i915/intel_display.c | 259 ----------------------------------- 2 files changed, 264 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -5
@@ -618,11 +618,6 @@ struct drm_i915_display_funcs {void (*audio_codec_disable)(struct intel_encoder *encoder);void (*fdi_link_train)(struct drm_crtc *crtc);void (*init_clock_gating)(struct drm_device *dev); -int (*queue_flip)(struct drm_device *dev,struct drm_crtc *crtc, -struct drm_framebuffer *fb, -struct drm_i915_gem_object *obj, -struct drm_i915_gem_request *req, -uint64_t gtt_offset);void (*hpd_irq_setup)(struct drm_i915_private *dev_priv);/* clock updates for mode set */ /* cursor updates */
drivers/gpu/drm/i915/intel_display.c +0 -259
271 lines not on this page · raw message
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/9 drm/i915: Remove reset_counter from intel_crtc.
In reply to Maarten LankhorstWith the removal of cs-based flips all mmio waits will finish without requiring the reset counter, because the waits will complete during gpu reset.
--- drivers/gpu/drm/i915/intel_display.c | 9 --------- drivers/gpu/drm/i915/intel_drv.h | 3 --- 2 files changed, 12 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -9
@@ -3180,14 +3180,6 @@ void intel_finish_reset(struct drm_i915_private *dev_priv)static bool intel_crtc_has_pending_flip (struct drm_crtc *crtc) { -struct drm_device *dev = crtc->dev; -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -unsigned reset_counter; - - reset_counter =i915_reset_counter (&to_i915 (dev)->gpu_error); -if (intel_crtc->reset_counter != reset_counter) -return false; -return !list_empty_careful (&to_intel_crtc (crtc)->flip_work); }
@@ -11288,7 +11280,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,intel_fbc_pre_update (intel_crtc); - intel_crtc->reset_counter =i915_reset_counter (&dev_priv->gpu_error);schedule_work (&work->mmio_work);mutex_unlock (&dev->struct_mutex);
drivers/gpu/drm/i915/intel_drv.h +0 -3
@@ -662,9 +662,6 @@ struct intel_crtc {struct intel_crtc_state *config; -/* reset counter value when the last flip was submitted */ -unsigned int reset_counter; -/* Access to these should be protected by dev_priv->irq_lock. */ bool cpu_fifo_underrun_disabled;bool pch_fifo_underrun_disabled;
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/9 drm/i915: Pass atomic states to fbc update functions.
In reply to Maarten LankhorstThis is required to let fbc updates run async. It has a lot of checks whether certain locks are taken, which can be removed when the relevant states are passed in as pointers.
--- drivers/gpu/drm/i915/intel_display.c | 8 +++++--- drivers/gpu/drm/i915/intel_drv.h | 8 ++++++-- drivers/gpu/drm/i915/intel_fbc.c | 39 +++++++++++++++++------------------- 3 files changed, 29 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/intel_display.c +5 -3
@@ -4590,7 +4590,7 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state)struct intel_plane_state *old_primary_state =to_intel_plane_state (old_pri_state); -intel_fbc_pre_update (crtc); +intel_fbc_pre_update (crtc, pipe_config, primary_state);if (old_primary_state->visible && (modeset || !primary_state->visible))
@@ -11278,7 +11278,9 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,if (obj->base.dma_buf) work->old_plane_state[0 ]->base.fence =intel_get_excl_fence (obj); -intel_fbc_pre_update (intel_crtc); +intel_fbc_pre_update (intel_crtc, +to_intel_crtc_state (new_crtc_state), +to_intel_plane_state (new_state));schedule_work (&work->mmio_work);
@@ -13247,7 +13249,7 @@ static int intel_atomic_commit(struct drm_device *dev,if (crtc->state->active &&drm_atomic_get_existing_plane_state (state, crtc->primary)) -intel_fbc_enable (intel_crtc); +intel_fbc_enable (intel_crtc, pipe_config,to_intel_plane_state (crtc->primary->state));if (crtc->state->active && (crtc->state->planes_changed || update_pipe))
drivers/gpu/drm/i915/intel_drv.h +6 -2
@@ -1424,11 +1424,15 @@ static inline void intel_fbdev_restore_mode(struct drm_device *dev)void intel_fbc_choose_crtc (struct drm_i915_private *dev_priv,struct drm_atomic_state *state);bool intel_fbc_is_active (struct drm_i915_private *dev_priv); -void intel_fbc_pre_update (struct intel_crtc *crtc); +void intel_fbc_pre_update (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state);void intel_fbc_post_update (struct intel_crtc *crtc);void intel_fbc_init (struct drm_i915_private *dev_priv);void intel_fbc_init_pipe_state (struct drm_i915_private *dev_priv); -void intel_fbc_enable (struct intel_crtc *crtc); +void intel_fbc_enable (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state);void intel_fbc_disable (struct intel_crtc *crtc);void intel_fbc_global_disable (struct drm_i915_private *dev_priv); void intel_fbc_invalidate(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_fbc.c +18 -21
@@ -480,10 +480,10 @@ static void intel_fbc_deactivate(struct drm_i915_private *dev_priv)intel_fbc_hw_deactivate (dev_priv); } -static bool multiple_pipes_ok (struct intel_crtc *crtc) +static bool multiple_pipes_ok (struct intel_crtc *crtc, +struct intel_plane_state *plane_state) { -struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; -struct drm_plane *primary = crtc->base.primary; +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_fbc *fbc = &dev_priv->fbc;enum pipe pipe = crtc->pipe;
@@ -491,9 +491,7 @@ static bool multiple_pipes_ok(struct intel_crtc *crtc)if (!no_fbc_on_multiple_pipes (dev_priv))return true; -WARN_ON (!drm_modeset_is_locked (&primary->mutex)); - -if (to_intel_plane_state (primary->state)->visible) +if (plane_state->visible) fbc->visible_pipes_mask |= (1 << pipe);else fbc->visible_pipes_mask &= ~(1 << pipe);
@@ -708,21 +706,16 @@ static bool intel_fbc_hw_tracking_covers_screen(struct intel_crtc *crtc)return effective_w <= max_w && effective_h <= max_h; } -static void intel_fbc_update_state_cache (struct intel_crtc *crtc) +static void intel_fbc_update_state_cache (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state) {struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;struct intel_fbc *fbc = &dev_priv->fbc;struct intel_fbc_state_cache *cache = &fbc->state_cache; -struct intel_crtc_state *crtc_state = -to_intel_crtc_state (crtc->base.state); -struct intel_plane_state *plane_state = -to_intel_plane_state (crtc->base.primary->state);struct drm_framebuffer *fb = plane_state->base.fb;struct drm_i915_gem_object *obj; -WARN_ON (!drm_modeset_is_locked (&crtc->base.mutex)); -WARN_ON (!drm_modeset_is_locked (&crtc->base.primary->mutex)); - cache->crtc.mode_flags = crtc_state->base.adjusted_mode.flags;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) cache->crtc.hsw_bdw_pixel_rate =
@@ -887,7 +880,9 @@ static bool intel_fbc_reg_params_equal(struct intel_fbc_reg_params *params1,return memcmp (params1, params2,sizeof (*params1)) ==0 ; } -void intel_fbc_pre_update (struct intel_crtc *crtc) +void intel_fbc_pre_update (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state) {struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;struct intel_fbc *fbc = &dev_priv->fbc;
@@ -897,7 +892,7 @@ void intel_fbc_pre_update(struct intel_crtc *crtc)mutex_lock (&fbc->lock); -if (!multiple_pipes_ok (crtc)) { +if (!multiple_pipes_ok (crtc, plane_state)) { fbc->no_fbc_reason ="more than one pipe active" ; goto deactivate; }
@@ -905,7 +900,7 @@ void intel_fbc_pre_update(struct intel_crtc *crtc)if (!fbc->enabled || fbc->crtc != crtc) goto unlock; -intel_fbc_update_state_cache (crtc); +intel_fbc_update_state_cache (crtc, crtc_state, plane_state); deactivate:intel_fbc_deactivate (dev_priv);
@@ -1089,7 +1084,9 @@ out:* intel_fbc_enable multiple times for the same pipe without an * intel_fbc_disable in the middle, as long as it is deactivated. */ -void intel_fbc_enable (struct intel_crtc *crtc) +void intel_fbc_enable (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state) {struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;struct intel_fbc *fbc = &dev_priv->fbc;
@@ -1102,19 +1099,19 @@ void intel_fbc_enable(struct intel_crtc *crtc)if (fbc->enabled) {WARN_ON (fbc->crtc ==NULL );if (fbc->crtc == crtc) { -WARN_ON (!crtc->config->enable_fbc); +WARN_ON (!crtc_state->enable_fbc);WARN_ON (fbc->active); } goto out; } -if (!crtc->config->enable_fbc) +if (!crtc_state->enable_fbc) goto out;WARN_ON (fbc->active);WARN_ON (fbc->crtc !=NULL ); -intel_fbc_update_state_cache (crtc); +intel_fbc_update_state_cache (crtc, crtc_state, plane_state);if (intel_fbc_alloc_cfb (crtc)) { fbc->no_fbc_reason ="not enough stolen memory" ; goto out;
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for drm/i915: Reapply page flip atomic preparation patches.
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Reapply page flip atomic preparation patches.
URL : https://patchwork.freedesktop.org/series/7801/
State : failure
== Summary ==
Series 7801v1 drm/i915: Reapply page flip atomic preparation patches.
http://patchwork.freedesktop.org/api/1.0/series/7801/revisions/1/mbox
Test gem_busy:
Subgroup basic-blt:
dmesg-warn -> PASS (ro-skl-i7-6700hq)
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-cmd:
pass -> FAIL (ro-byt-n2820)
Test gem_flink_basic:
Subgroup bad-open:
pass -> DMESG-WARN (ro-skl-i7-6700hq)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
fail -> PASS (ro-bdw-i7-5600u)
skip -> PASS (fi-skl-i5-6260u)
Test kms_frontbuffer_tracking:
Subgroup basic:
pass -> DMESG-WARN (ro-skl-i7-6700hq)
Test kms_psr_sink_crc:
Subgroup psr_basic:
pass -> DMESG-WARN (ro-skl-i7-6700hq)fi-bdw-i7-5557u total:209 pass:197 dwarn:0 dfail:0 fail:0 skip:12 fi-byt-n2820 total:209 pass:168 dwarn:0 dfail:0 fail:3 skip:38 fi-hsw-i7-4770k total:209 pass:190 dwarn:0 dfail:0 fail:0 skip:19 fi-hsw-i7-4770r total:209 pass:186 dwarn:0 dfail:0 fail:0 skip:23 fi-skl-i5-6260u total:209 pass:198 dwarn:0 dfail:0 fail:0 skip:11 fi-skl-i7-6700k total:209 pass:184 dwarn:0 dfail:0 fail:0 skip:25 fi-snb-i7-2600 total:209 pass:170 dwarn:0 dfail:0 fail:0 skip:39 ro-bdw-i5-5250u total:209 pass:172 dwarn:0 dfail:0 fail:0 skip:37 ro-bdw-i7-5557U total:209 pass:197 dwarn:0 dfail:0 fail:0 skip:12 ro-bdw-i7-5600u total:209 pass:181 dwarn:0 dfail:0 fail:0 skip:28 ro-bsw-n3050 total:209 pass:168 dwarn:0 dfail:0 fail:2 skip:39 ro-byt-n2820 total:209 pass:169 dwarn:0 dfail:0 fail:3 skip:37 ro-hsw-i3-4010u total:209 pass:186 dwarn:0 dfail:0 fail:0 skip:23 ro-hsw-i7-4770r total:209 pass:186 dwarn:0 dfail:0 fail:0 skip:23 ro-ilk-i7-620lm total:209 pass:146 dwarn:0 dfail:0 fail:1 skip:62 ro-ilk1-i5-650 total:204 pass:146 dwarn:0 dfail:0 fail:1 skip:57 ro-ivb-i7-3770 total:209 pass:177 dwarn:0 dfail:0 fail:0 skip:32 ro-ivb2-i7-3770 total:209 pass:181 dwarn:0 dfail:0 fail:0 skip:28 ro-skl-i7-6700hq total:204 pass:178 dwarn:5 dfail:0 fail:0 skip:21 ro-snb-i7-2620M total:209 pass:170 dwarn:0 dfail:0 fail:1 skip:38
fi-bsw-n3050 failed to connect after reboot
Results at /archive/results/CI_IGT_test/RO_Patchwork_1020/
fc9d741 drm-intel-nightly: 2016y-05m-25d-07h-45m-48s UTC integration manifest 6a3f8a8 drm/i915: Pass atomic states to fbc update functions. 4d540eb drm/i915: Remove reset_counter from intel_crtc.
b6103e9 drm/i915: Remove queue_flip pointer.
95a5895 drm/i915: Remove use_mmio_flip kernel parameter.
526331d drm/i915: Remove cs based page flip support, v2.
d159e01 drm/i915: Rework intel_crtc_page_flip to be almost atomic, v4. e8f5004 drm/i915: Add the exclusive fence to plane_state.
616a4b0 drm/i915: Convert flip_work to a list, v2.
0f8403b drm/i915: Allow mmio updates on all platforms, v3.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Ro.CI.BAT: failure for drm/i915: Reapply page flip atomic preparation patches.
Op 26-05-16 om 13:02 schreef Patchwork:
Quoted 11 lines
== Series Details ==
Series: drm/i915: Reapply page flip atomic preparation patches.
URL : https://patchwork.freedesktop.org/series/7801/
State : failure== Summary ==
Series 7801v1 drm/i915: Reapply page flip atomic preparation patches.
http://patchwork.freedesktop.org/api/1.0/series/7801/revisions/1/mbox
Quoted 6 lines
Test
gem_busy:Subgroup basic-blt: dmesg-warn -> PASS (ro-skl-i7-6700hq) Test gem_exec_flush: Subgroup basic-batch-kernel-default-cmd: pass -> FAIL (ro-byt-n2820)
Seems to fail pretty randomly on ro-byt-n2820.
https://bugs.freedesktop.org/show_bug.cgi?id=95372
Quoted 13 lines
Test
gem_flink_basic:Subgroup bad-open: pass -> DMESG-WARN (ro-skl-i7-6700hq) Test kms_flip: Subgroup basic-flip-vs-wf_vblank: fail -> PASS (ro-bdw-i7-5600u) skip -> PASS (fi-skl-i5-6260u) Test kms_frontbuffer_tracking: Subgroup basic: pass -> DMESG-WARN (ro-skl-i7-6700hq) Test kms_psr_sink_crc: Subgroup psr_basic: pass -> DMESG-WARN (ro-skl-i7-6700hq)
-skl failures are all "[drm:intel_pipe_update_start [i915]] *ERROR* Potential atomic update failure on pipe A", which seem to happen randomly.
https://bugs.freedesktop.org/show_bug.cgi?id=95632
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 3 lines · Maarten Lankhorst
Add some minor changes to prevent bisect breaking.
Main change is making sure
crtc_stateis not freed while the mmio update still runs.
I didn't see fixes for the other obvious issues.
Quoted 31 lines
Maarten Lankhorst (9):
drm/i915: Allow mmio updates on all platforms, v3. drm/i915: Convertflip_workto a list, v2.
drm/i915: Add the exclusive fence toplane_state. drm/i915: Reworkintel_crtc_page_flipto be almost atomic, v4. drm/i915: Remove cs based page flip support, v2. drm/i915: Removeuse_mmio_flipkernel parameter. drm/i915: Removequeue_flippointer.
drm/i915: Removereset_counterfromintel_crtc. drm/i915: Pass atomic states to fbc update functions.drivers/gpu/drm/i915/i915_debugfs.c | 89 ++- drivers/gpu/drm/i915/i915_drv.h | 5 - drivers/gpu/drm/i915/i915_irq.c | 120 +--- drivers/gpu/drm/i915/i915_params.c | 5 - drivers/gpu/drm/i915/i915_params.h | 1 - drivers/gpu/drm/i915/intel_atomic_plane.c | 1 + drivers/gpu/drm/i915/intel_display.c | 1118 ++++++++--------------------- drivers/gpu/drm/i915/intel_drv.h | 37 +- drivers/gpu/drm/i915/intel_fbc.c | 39 +- drivers/gpu/drm/i915/intel_lrc.c | 4 +- 10 files changed, 417 insertions(+), 1002 deletions(-)Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Op 26-05-16 om 13:35 schreef Ville Syrjälä:
Quoted 5 lines · Maarten Lankhorst
Quoted 3 lines
Add some minor changes to prevent bisect breaking.
Main change is making sure
crtc_stateis not freed while the mmio update still runs.I didn't see fixes for the other obvious issues.
This doesn't reapply nonblocking unpin/pageflip, which caused all problems. So what issues do you mean?
~Maarten
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Maarten Lankhorst
Op 26-05-16 om 13:35 schreef Ville Syrjälä:
Quoted 5 lines · Maarten Lankhorst
Quoted 3 lines
Add some minor changes to prevent bisect breaking.
Main change is making sure
crtc_stateis not freed while the mmio update still runs.I didn't see fixes for the other obvious issues.
This doesn't reapply nonblocking unpin/pageflip, which caused all problems. So what issues do you mean?
The two I now remember off the top of my head were the killing of the flip tracepoints and the annoying dmesg spamming.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Op 26-05-16 om 13:46 schreef Ville Syrjälä:
Quoted 11 lines · Maarten Lankhorst
Quoted 7 lines
Op 26-05-16 om 13:35 schreef Ville Syrjälä:
Quoted 5 lines · Maarten Lankhorst
Quoted 3 lines
Add some minor changes to prevent bisect breaking.
Main change is making sure
crtc_stateis not freed while the mmio update still runs.I didn't see fixes for the other obvious issues.
This doesn't reapply nonblocking unpin/pageflip, which caused all problems. So what issues do you mean?
The two I now remember off the top of my head were the killing of the flip tracepoints and the annoying dmesg spamming.
Flip tracepoint is still there, but I can remove the 'Finished page flip' spam from patch 5. Patch 4 accidentally seems to call trace_i915_flip_request twice, which was fixed in patch 5.
I'll send new versions for those 2 patches.
~Maarten
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx