drm/i915: Rework page flip to be more atomic like, and remove cs flips.
Subsystems (3)
Maarten Lankhorst
maintainerv2 cover drm/i915: Rework page flip to be more atomic like, and remove cs flips.
This patch first adds drm_accurate_vblank_count, which needs an ack from airlied to get through dinq.
After adding support for mmio updates on all platforms support for cs flips is removed. It's hard to test properly and makes async atomic commit harder to get right.
Maarten Lankhorst (11):
drm/core: Add drm_accurate_vblank_count, v4.
drm/i915: Remove stallcheck special handling.
drm/i915: Remove intel_prepare_page_flip.
drm/i915: Add support for detecting vblanks when hw frame counter is unavailable. drm/i915: Allow mmio updates on all platforms, v2.
drm/i915: Convert flip_work to a list.
drm/i915: Add the exclusive fence to plane_state.
drm/i915: Rework intel_crtc_page_flip to be almost atomic, v3. drm/i915: Remove cs based page flip support.
drm/i915: Remove use_mmio_flip kernel parameter.
drm/i915: Remove queue_flip pointer.
drivers/gpu/drm/drm_irq.c | 26 + drivers/gpu/drm/i915/i915_debugfs.c | 93 +-- drivers/gpu/drm/i915/i915_drv.h | 5 - drivers/gpu/drm/i915/i915_irq.c | 18 +- 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 | 1136 +++++++++-------------------- drivers/gpu/drm/i915/intel_drv.h | 43 +- drivers/gpu/drm/i915/intel_lrc.c | 3 +- drivers/gpu/drm/i915/intel_sprite.c | 16 +- include/drm/drmP.h | 1 + 12 files changed, 443 insertions(+), 905 deletions(-)
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH v2 1/11 drm/core: Add drm_accurate_vblank_count, v4.
This function is useful for gen2 intel devices which have no frame counter, but need a way to determine the current vblank count without racing with the vblank interrupt handler.
intel_pipe_update_start checks if no vblank interrupt will occur during vblank evasion, but cannot check whether the vblank handler has run to completion. This function uses the timestamps to determine when the last vblank has happened, and interpolates from there.
Changes since v1:
- Take vblank_time_lock and don't use drm_vblank_count_and_time. Changes since v2:
- Don't return time of last vblank.
Changes since v3:
- Change pipe to unsigned int. (Ville)
- Remove unused documentation for tv_ret. (kbuild)
--- drivers/gpu/drm/drm_irq.c | 26 ++++++++++++++++++++++++++ include/drm/drmP.h | 1 + 2 files changed, 27 insertions(+)
drivers/gpu/drm/drm_irq.c +26 -0
@@ -303,6 +303,32 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe,store_vblank (dev, pipe, diff, &t_vblank, cur_vblank); } +/** +* drm_accurate_vblank_count - retrieve the master vblank counter +* @crtc: which counter to retrieve +* +* This function is similar to @drm_crtc_vblank_count but this +* function interpolates to handle a race with vblank irq's. +*/ + +u32 drm_accurate_vblank_count (struct drm_crtc *crtc) +{ +struct drm_device *dev = crtc->dev; +unsigned int pipe =drm_crtc_index (crtc); +u32 vblank; +unsigned long flags; + +spin_lock_irqsave (&dev->vblank_time_lock, flags); + +drm_update_vblank_count (dev, pipe,0 ); + vblank = dev->vblank[pipe].count; + +spin_unlock_irqrestore (&dev->vblank_time_lock, flags); + +return vblank; +} +EXPORT_SYMBOL (drm_accurate_vblank_count); +/* * Disable vblank irq's on crtc, make sure that last vblank count * of hardware and corresponding consistent software vblank counter
include/drm/drmP.h +1 -0
@@ -995,6 +995,7 @@ extern void drm_crtc_vblank_off(struct drm_crtc *crtc);extern void drm_crtc_vblank_reset (struct drm_crtc *crtc);extern void drm_crtc_vblank_on (struct drm_crtc *crtc);extern void drm_vblank_cleanup (struct drm_device *dev); +extern u32 drm_accurate_vblank_count (struct drm_crtc *crtc);extern u32 drm_vblank_no_hw_counter (struct drm_device *dev,unsigned int pipe); extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH v2 2/11 drm/i915: Remove stallcheck special handling.
In reply to Maarten LankhorstRe-use unpin_work->pending, but also set vblank count before intel_mark_page_flip_active to be sure.
--- drivers/gpu/drm/i915/i915_debugfs.c | 11 ++++++----- drivers/gpu/drm/i915/intel_display.c | 31 ++++++++++++------------------- drivers/gpu/drm/i915/intel_drv.h | 1 - 3 files changed, 18 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +6 -5
@@ -582,9 +582,14 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)seq_printf (m,"No flip due on pipe %c (plane %c)\n" , pipe, plane); }else { +u32 pending;u32 addr; -if (atomic_read (&work->pending) <INTEL_FLIP_COMPLETE ) { + pending =atomic_read (&work->pending); +if (pending ==INTEL_FLIP_INACTIVE ) { +seq_printf (m,"Flip ioctl preparing on pipe %c (plane %c)\n" , + pipe, plane); + }else if (pending >=INTEL_FLIP_COMPLETE ) {seq_printf (m,"Flip queued on pipe %c (plane %c)\n" , pipe, plane); }else {
@@ -606,10 +611,6 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) work->flip_queued_vblank, work->flip_ready_vblank, drm_crtc_vblank_count(&crtc->base)); -if (work->enable_stall_check) -seq_puts (m,"Stall check enabled, " ); -else -seq_puts (m,"Stall check waiting for page flip ioctl, " );seq_printf (m,"%d prepares\n" ,atomic_read (&work->pending));if (INTEL_INFO (dev)->gen >=4 )
drivers/gpu/drm/i915/intel_display.c +12 -19
@@ -11415,8 +11415,6 @@ static void intel_do_mmio_flip(struct intel_mmio_flip *mmio_flip)if (work ==NULL )return ; -intel_mark_page_flip_active (work); -intel_pipe_update_start (crtc);if (INTEL_INFO (mmio_flip->i915)->gen >=9 )
@@ -11426,6 +11424,8 @@ static void intel_do_mmio_flip(struct intel_mmio_flip *mmio_flip)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)
@@ -11492,15 +11492,11 @@ static bool __intel_pageflip_stall_check(struct drm_device *dev,struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct intel_unpin_work *work = intel_crtc->unpin_work;u32 addr; +u32 pending; -if (atomic_read (&work->pending) >=INTEL_FLIP_COMPLETE ) -return true; - -if (atomic_read (&work->pending) <INTEL_FLIP_PENDING ) -return false; - -if (!work->enable_stall_check) -return false; + pending =atomic_read (&work->pending); +if (pending !=INTEL_FLIP_PENDING ) +return pending ==INTEL_FLIP_COMPLETE ;if (work->flip_ready_vblank ==0 ) { if (work->flip_queued_req &&
@@ -11676,6 +11672,11 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,*/ if (!mmio_flip) { ret =i915_gem_object_sync (obj, engine, &request); +if (!ret && !request) { + request =i915_gem_request_alloc (engine,NULL ); + ret =PTR_ERR_OR_ZERO (request); + } +if (ret) goto cleanup_pending; }
@@ -11687,6 +11688,7 @@ 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->flip_queued_vblank =drm_crtc_vblank_count (crtc);if (mmio_flip) { ret =intel_queue_mmio_flip (dev, crtc, obj);
@@ -11696,14 +11698,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,i915_gem_request_assign (&work->flip_queued_req, obj->last_write_req); }else { -if (!request) { - request =i915_gem_request_alloc (engine,NULL ); -if (IS_ERR (request)) { - ret =PTR_ERR (request); - goto cleanup_unpin; - } - } - ret = dev_priv->display.queue_flip (dev, crtc, fb, obj, request, page_flip_flags);if (ret)
@@ -11716,7 +11710,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,i915_add_request_no_flush (request); work->flip_queued_vblank =drm_crtc_vblank_count (crtc); - work->enable_stall_check = true;i915_gem_track_fb (intel_fb_obj (work->old_fb), obj,to_intel_plane (primary)->frontbuffer_bit);
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -952,7 +952,6 @@ struct intel_unpin_work {struct drm_i915_gem_request *flip_queued_req;u32 flip_queued_vblank;u32 flip_ready_vblank; -bool enable_stall_check; };struct intel_load_detect_pipe {
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 02/11] drm/i915: Remove stallcheck special handling.
Quoted 2 lines · Maarten Lankhorst
Re-use
unpin_work->pending, but also set vblank count beforeintel_mark_page_flip_activeto be sure.
Be sure of what?
Quoted 63 lines
Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 11 ++++++----- drivers/gpu/drm/i915/intel_display.c | 31 ++++++++++++------------------- drivers/gpu/drm/i915/intel_drv.h | 1 - 3 files changed, 18 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +6
-1@@ -582,9 +582,14 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) seq_printf(m, "No flip due on pipe %c (plane %c)\n", pipe, plane); }else { +u32 pending;u32 addr; -if (atomic_read (&work->pending) < INTEL_FLIP_COMPLETE) { + pending =atomic_read (&work->pending); +if (pending ==INTEL_FLIP_INACTIVE ) { + seq_printf(m, "Flip ioctl preparing on pipe %c (plane %c)\n", + pipe, plane); + }else if (pending >=INTEL_FLIP_COMPLETE ) {seq_printf(m, "Flip queued on pipe %c (plane
%c)\n",drivers/gpu/drm/i915/i915_debugfs.c +0
-5pipe, plane); }else {@@ -606,10 +611,6 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) work->flip_queued_vblank, work->flip_ready_vblank, drm_crtc_vblank_count(&crtc->base)); -if (work->enable_stall_check) -seq_puts (m,"Stall check enabled, " ); -else - seq_puts(m, "Stall check waiting for page flip ioctl, "); seq_printf(m, "%d prepares\n", atomic_read(&work ->pending)); if (INTEL_INFO(dev)->gen >= 4)drivers/gpu/drm/i915/intel_display.c +0
-2@@ -11415,8 +11415,6 @@ static void intel_do_mmio_flip(struct intel_mmio_flip *mmio_flip)if (work ==NULL )return ; -intel_mark_page_flip_active (work); -intel_pipe_update_start (crtc);drivers/gpu/drm/i915/intel_display.c +0
-0if (INTEL_INFO (mmio_flip->i915)->gen >=9 )
drivers/gpu/drm/i915/intel_display.c static void intel_do_mmio_flip(struct intel_mmio_flip · line 11429
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +2
-0@@ -11426,6 +11424,8 @@ static void intel_do_mmio_flip(struct intel_mmio_flip *mmio_flip)ilk_do_mmio_flip (crtc, work);intel_pipe_update_end (crtc); + +intel_mark_page_flip_active (work);
Is this to avoid triggering the stall check during the wait from a vblank evasion?
Quoted 63 lines
drivers/gpu/drm/i915/intel_display.c +0
-0}static void
intel_mmio_flip_work_func(struct work_struct *work)drivers/gpu/drm/i915/intel_display.c +4
-8@@ -11492,15 +11492,11 @@ static bool __intel_pageflip_stall_check(structdrm_device *dev, struct intel_crtc *intel_crtc = to_intel_crtc(crtc);struct intel_unpin_work *work = intel_crtc->unpin_work;u32 addr; +u32 pending; -if (atomic_read (&work->pending) >=INTEL_FLIP_COMPLETE ) -return true; - -if (atomic_read (&work->pending) <INTEL_FLIP_PENDING ) -return false; - -if (!work->enable_stall_check) -return false; + pending =atomic_read (&work->pending); +if (pending !=INTEL_FLIP_PENDING ) +return pending ==INTEL_FLIP_COMPLETE ;if (work->flip_ready_vblank ==0 ) {drivers/gpu/drm/i915/intel_display.c +5
-0if (work->flip_queued_req &&@@ -11676,6 +11672,11 @@ static int intel_crtc_page_flip(struct drm_crtc*crtc, */ if (!mmio_flip) { ret =i915_gem_object_sync (obj, engine, &request); +if (!ret && !request) { + request =i915_gem_request_alloc (engine,NULL ); + ret =PTR_ERR_OR_ZERO (request); + } +if (ret) goto cleanup_pending;drivers/gpu/drm/i915/intel_display.c +1
-8}@@ -11687,6 +11688,7 @@ 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->flip_queued_vblank =drm_crtc_vblank_count (crtc);if (mmio_flip) { ret =intel_queue_mmio_flip (dev, crtc, obj);@@ -11696,14 +11698,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,i915_gem_request_assign (&work->flip_queued_req, obj->last_write_req); }else { -if (!request) { - request =i915_gem_request_alloc (engine,NULL ); -if (IS_ERR (request)) { - ret =PTR_ERR (request); - goto cleanup_unpin; - } - } - ret = dev_priv->display.queue_flip(dev, crtc, fb, obj, request,drivers/gpu/drm/i915/intel_display.c +0
-0page_flip_flags);if (ret)
drivers/gpu/drm/i915/intel_display.c static int intel_crtc_page_flip(struct drm_crtc *crtc, · line 11712
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c +0
-0@@ -11716,7 +11710,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,i915_add_request_no_flush (request); work->flip_queued_vblank =drm_crtc_vblank_count (crtc);
Do we still need the assigment above?
Ander
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +0
-1- work->enable_stall_check = true;i915_gem_track_fb (intel_fb_obj (work->old_fb), obj,to_intel_plane (primary)->frontbuffer_bit);drivers/gpu/drm/i915/intel_drv.h +0
-0
drivers/gpu/drm/i915/intel_drv.h struct intel_unpin_work { · line 957
Quoted 7 lines
drivers/gpu/drm/i915/intel_drv.h +0
-1@@ -952,7 +952,6 @@ struct intel_unpin_work {struct drm_i915_gem_request *flip_queued_req;u32 flip_queued_vblank;u32 flip_ready_vblank; -bool enable_stall_check; };struct intel_load_detect_pipe {
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerRe: [PATCH v2 02/11] drm/i915: Remove stallcheck special handling.
Op 15-04-16 om 09:07 schreef Ander Conselvan De Oliveira:
Quoted 70 lines · Maarten Lankhorst
Quoted 2 lines
Re-use
unpin_work->pending, but also set vblank count beforeintel_mark_page_flip_activeto be sure.Be sure of what?
Quoted 65 lines
Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 11 ++++++----- drivers/gpu/drm/i915/intel_display.c | 31 ++++++++++++------------------- drivers/gpu/drm/i915/intel_drv.h | 1 - 3 files changed, 18 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +6
-1@@ -582,9 +582,14 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) seq_printf(m, "No flip due on pipe %c (plane %c)\n", pipe, plane); }else { +u32 pending;u32 addr; -if (atomic_read (&work->pending) < INTEL_FLIP_COMPLETE) { + pending =atomic_read (&work->pending); +if (pending ==INTEL_FLIP_INACTIVE ) { + seq_printf(m, "Flip ioctl preparing on pipe %c (plane %c)\n", + pipe, plane); + }else if (pending >=INTEL_FLIP_COMPLETE ) {seq_printf(m, "Flip queued on pipe %c (plane
%c)\n",drivers/gpu/drm/i915/i915_debugfs.c +0
-5pipe, plane); }else {@@ -606,10 +611,6 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) work->flip_queued_vblank, work->flip_ready_vblank, drm_crtc_vblank_count(&crtc->base)); -if (work->enable_stall_check) -seq_puts (m,"Stall check enabled, " ); -else - seq_puts(m, "Stall check waiting for page flip ioctl, "); seq_printf(m, "%d prepares\n", atomic_read(&work ->pending)); if (INTEL_INFO(dev)->gen >= 4)drivers/gpu/drm/i915/intel_display.c +0
-2@@ -11415,8 +11415,6 @@ static void intel_do_mmio_flip(struct intel_mmio_flip *mmio_flip)if (work ==NULL )return ; -intel_mark_page_flip_active (work); -intel_pipe_update_start (crtc);drivers/gpu/drm/i915/intel_display.c +0
-0if (INTEL_INFO (mmio_flip->i915)->gen >=9 )@@ -11426,6 +11424,8 @@ static void intel_do_mmio_flip(struct intel_mmio_flip *mmio_flip)ilk_do_mmio_flip (crtc, work);
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c static void intel_do_mmio_flip(struct intel_mmio_flip *mmio_flip) · line 11428
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c +2
-0intel_pipe_update_end (crtc); + +intel_mark_page_flip_active (work);Is this to avoid triggering the stall check during the wait from a vblank evasion?
It's to ensure that if a vblank happens before pipe_update_end, we don't mark the flip as completed until we actually updated the mmio registers.
Quoted 66 lines
Quoted 66 lines
drivers/gpu/drm/i915/intel_display.c +0
-0}static void
intel_mmio_flip_work_func(struct work_struct *work)drivers/gpu/drm/i915/intel_display.c +4
-8@@ -11492,15 +11492,11 @@ static bool __intel_pageflip_stall_check(structdrm_device *dev, struct intel_crtc *intel_crtc = to_intel_crtc(crtc);struct intel_unpin_work *work = intel_crtc->unpin_work;u32 addr; +u32 pending; -if (atomic_read (&work->pending) >=INTEL_FLIP_COMPLETE ) -return true; - -if (atomic_read (&work->pending) <INTEL_FLIP_PENDING ) -return false; - -if (!work->enable_stall_check) -return false; + pending =atomic_read (&work->pending); +if (pending !=INTEL_FLIP_PENDING ) +return pending ==INTEL_FLIP_COMPLETE ;if (work->flip_ready_vblank ==0 ) {drivers/gpu/drm/i915/intel_display.c +5
-0if (work->flip_queued_req &&@@ -11676,6 +11672,11 @@ static int intel_crtc_page_flip(struct drm_crtc*crtc, */ if (!mmio_flip) { ret =i915_gem_object_sync (obj, engine, &request); +if (!ret && !request) { + request =i915_gem_request_alloc (engine,NULL ); + ret =PTR_ERR_OR_ZERO (request); + } +if (ret) goto cleanup_pending;drivers/gpu/drm/i915/intel_display.c +1
-8}@@ -11687,6 +11688,7 @@ 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->flip_queued_vblank =drm_crtc_vblank_count (crtc);if (mmio_flip) { ret =intel_queue_mmio_flip (dev, crtc, obj);@@ -11696,14 +11698,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,i915_gem_request_assign (&work->flip_queued_req, obj->last_write_req); }else { -if (!request) { - request =i915_gem_request_alloc (engine,NULL ); -if (IS_ERR (request)) { - ret =PTR_ERR (request); - goto cleanup_unpin; - } - } - ret = dev_priv->display.queue_flip(dev, crtc, fb, obj, request,drivers/gpu/drm/i915/intel_display.c +0
-0page_flip_flags);if (ret)@@ -11716,7 +11710,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,i915_add_request_no_flush (request);
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c static int intel_crtc_page_flip(struct drm_crtc *crtc, · line 11712
Quoted 1 line
drivers/gpu/drm/i915/intel_display.c +0
-0work->flip_queued_vblank =drm_crtc_vblank_count (crtc);Do we still need the assigment above?
It's used for rps boosting, so likely...
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 02/11] drm/i915: Remove stallcheck special handling.
Quoted 76 lines · Maarten Lankhorst
Op 15-04-16 om 09:07 schreef Ander Conselvan De Oliveira:
Quoted 75 lines · Maarten Lankhorst
Quoted 2 lines
Re-use
unpin_work->pending, but also set vblank count beforeintel_mark_page_flip_activeto be sure.Be sure of what?
Quoted 70 lines
Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 11 ++++++----- drivers/gpu/drm/i915/intel_display.c | 31 ++++++++++++------------------- drivers/gpu/drm/i915/intel_drv.h | 1 - 3 files changed, 18 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +4
-1@@ -582,9 +582,14 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) seq_printf(m, "No flip due on pipe %c (plane %c)\n", pipe, plane); } else { +u32 pending;u32 addr; -if (atomic_read (&work->pending) < INTEL_FLIP_COMPLETE) { + pending =atomic_read (&work->pending); +if (pending ==INTEL_FLIP_INACTIVE ) { + seq_printf(m, "Flip ioctl preparing onpipe
%c (plane %c)\n",drivers/gpu/drm/i915/i915_debugfs.c +2
-0+ pipe, plane); + }else if (pending >=INTEL_FLIP_COMPLETE ) { seq_printf(m, "Flip queued on pipe %c(plane
%c)\n",drivers/gpu/drm/i915/i915_debugfs.c +0
-5pipe, plane); }else {@@ -606,10 +611,6 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) work->flip_queued_vblank, work->flip_ready_vblank, drm_crtc_vblank_count(&crtc->base)); -if (work->enable_stall_check) -seq_puts (m,"Stall check enabled, " ); -else - seq_puts(m, "Stall check waiting for page flip ioctl, "); seq_printf(m, "%d prepares\n", atomic_read(&work ->pending)); if (INTEL_INFO(dev)->gen >= 4)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -11415,8 +11415,6 @@ static void intel_do_mmio_flip(struct
intel_mmio_flip*mmio_flip)drivers/gpu/drm/i915/intel_display.c +0
-2if (work ==NULL )return ; -intel_mark_page_flip_active (work); -intel_pipe_update_start (crtc);if (INTEL_INFO (mmio_flip->i915)->gen >=9 )@@ -11426,6 +11424,8 @@ static void intel_do_mmio_flip(struct
intel_mmio_flip*mmio_flip)
ilk_do_mmio_flip(crtc, work);
Quoted 7 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c static void intel_do_mmio_flip(struct intel_mmio_flip *mmio_flip) · line 11428
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c +2
-0intel_pipe_update_end (crtc); + +intel_mark_page_flip_active (work);Is this to avoid triggering the stall check during the wait from a vblank evasion?
It's to ensure that if a vblank happens before
pipe_update_end, we don't mark the flip as completed until we actually updated the mmio registers.
But interrupts are disabled between pipe_update_start() and pipe_update_end(), so if that happens it either happens before or during pipe_update_start(), no?
Is it possible the vblank happens just after pipe_update_end() and before marking it active? Seems to me that in that case, first prepare_page_flip() will increase unpin_work->pending (so it will go from INACTIVE to PENDING) and then marking it active will set it again to PENDING, so it never gets to COMPLETE.
But even if the above can happen, that is fixed by the removal of the COMPLETE state in patch 3.
Quoted 69 lines
Quoted 69 lines
Quoted 69 lines
}
static void
intel_mmio_flip_work_func(struct work_struct *work)drivers/gpu/drm/i915/intel_display.c +4
-8@@ -11492,15 +11492,11 @@ static bool __intel_pageflip_stall_check(structdrm_device *dev, struct intel_crtc *intel_crtc = to_intel_crtc(crtc);struct intel_unpin_work *work = intel_crtc->unpin_work;u32 addr; +u32 pending; -if (atomic_read (&work->pending) >=INTEL_FLIP_COMPLETE ) -return true; - -if (atomic_read (&work->pending) <INTEL_FLIP_PENDING ) -return false; - -if (!work->enable_stall_check) -return false; + pending =atomic_read (&work->pending); +if (pending !=INTEL_FLIP_PENDING ) +return pending ==INTEL_FLIP_COMPLETE ;if (work->flip_ready_vblank ==0 ) {drivers/gpu/drm/i915/intel_display.c +5
-0if (work->flip_queued_req &&@@ -11676,6 +11672,11 @@ static int intel_crtc_page_flip(struct drm_crtc*crtc, */ if (!mmio_flip) { ret =i915_gem_object_sync (obj, engine, &request); +if (!ret && !request) { + request =i915_gem_request_alloc (engine,NULL ); + ret =PTR_ERR_OR_ZERO (request); + } +if (ret) goto cleanup_pending;drivers/gpu/drm/i915/intel_display.c +1
-0}@@ -11687,6 +11688,7 @@ 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->flip_queued_vblank =drm_crtc_vblank_count (crtc);drivers/gpu/drm/i915/intel_display.c +0
-8if (mmio_flip) { ret =intel_queue_mmio_flip (dev, crtc, obj);@@ -11696,14 +11698,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,i915_gem_request_assign (&work->flip_queued_req, obj->last_write_req); }else { -if (!request) { - request =i915_gem_request_alloc (engine,NULL ); -if (IS_ERR (request)) { - ret =PTR_ERR (request); - goto cleanup_unpin; - } - } - ret = dev_priv->display.queue_flip(dev, crtc, fb, obj, request,drivers/gpu/drm/i915/intel_display.c +0
-0page_flip_flags);if (ret)@@ -11716,7 +11710,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,i915_add_request_no_flush (request);
Quoted 4 lines
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c static int intel_crtc_page_flip(struct drm_crtc *crtc, · line 11712
Quoted 1 line
drivers/gpu/drm/i915/intel_display.c +0
-0work->flip_queued_vblank =drm_crtc_vblank_count (crtc);Do we still need the assigment above?
It's used for rps boosting, so likely...
But you added the same assignment above, so removing it would only change the timing of the boost if the count were to flip while queuing but not prevent the boost from happening. It's no big deal, I just find it odd that we need to set that value twice.
Ander
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [PATCH v2 02/11] drm/i915: Remove stallcheck special handling.
Op 18-04-16 om 09:57 schreef Ander Conselvan De Oliveira:
Quoted 87 lines · Maarten Lankhorst
Quoted 76 lines
Op 15-04-16 om 09:07 schreef Ander Conselvan De Oliveira:
Quoted 75 lines · Maarten Lankhorst
Quoted 2 lines
Re-use
unpin_work->pending, but also set vblank count beforeintel_mark_page_flip_activeto be sure.Be sure of what?
Quoted 70 lines
Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 11 ++++++----- drivers/gpu/drm/i915/intel_display.c | 31 ++++++++++++------------------- drivers/gpu/drm/i915/intel_drv.h | 1 - 3 files changed, 18 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +4
-1@@ -582,9 +582,14 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) seq_printf(m, "No flip due on pipe %c (plane %c)\n", pipe, plane); } else { +u32 pending;u32 addr; -if (atomic_read (&work->pending) < INTEL_FLIP_COMPLETE) { + pending =atomic_read (&work->pending); +if (pending ==INTEL_FLIP_INACTIVE ) { + seq_printf(m, "Flip ioctl preparing onpipe
%c (plane %c)\n",drivers/gpu/drm/i915/i915_debugfs.c +2
-0+ pipe, plane); + }else if (pending >=INTEL_FLIP_COMPLETE ) { seq_printf(m, "Flip queued on pipe %c(plane
%c)\n",drivers/gpu/drm/i915/i915_debugfs.c +0
-5pipe, plane); }else {@@ -606,10 +611,6 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) work->flip_queued_vblank, work->flip_ready_vblank, drm_crtc_vblank_count(&crtc->base)); -if (work->enable_stall_check) -seq_puts (m,"Stall check enabled, " ); -else - seq_puts(m, "Stall check waiting for page flip ioctl, "); seq_printf(m, "%d prepares\n", atomic_read(&work ->pending)); if (INTEL_INFO(dev)->gen >= 4)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -11415,8 +11415,6 @@ static void intel_do_mmio_flip(struct
intel_mmio_flip*mmio_flip)drivers/gpu/drm/i915/intel_display.c +0
-2if (work ==NULL )return ; -intel_mark_page_flip_active (work); -intel_pipe_update_start (crtc);if (INTEL_INFO (mmio_flip->i915)->gen >=9 )@@ -11426,6 +11424,8 @@ static void intel_do_mmio_flip(struct
intel_mmio_flip*mmio_flip)
ilk_do_mmio_flip(crtc, work);Quoted 7 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c static void intel_do_mmio_flip(struct intel_mmio_flip *mmio_flip) · line 11428
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c +2
-0intel_pipe_update_end (crtc); + +intel_mark_page_flip_active (work);Is this to avoid triggering the stall check during the wait from a vblank evasion?
It's to ensure that if a vblank happens before
pipe_update_end, we don't mark the flip as completed until we actually updated the mmio registers.But interrupts are disabled between
pipe_update_start()andpipe_update_end(), so if that happens it either happens before or duringpipe_update_start(), no?
Quoted 7 lines
Is it possible the vblank happens just after
pipe_update_end()and before marking it active? Seems to me that in that case, firstprepare_page_flip()will increaseunpin_work->pending(so it will go from INACTIVE to PENDING) and then marking it active will set it again to PENDING, so it never gets to COMPLETE.But even if the above can happen, that is fixed by the removal of the COMPLETE state in patch 3.
We disable local interrupts, but interrupts can still happen on another cpu.
Quoted 68 lines
Quoted 68 lines
Quoted 68 lines
Quoted 68 lines
}
static void
intel_mmio_flip_work_func(struct work_struct *work)drivers/gpu/drm/i915/intel_display.c +4
-8@@ -11492,15 +11492,11 @@ static bool __intel_pageflip_stall_check(structdrm_device *dev, struct intel_crtc *intel_crtc = to_intel_crtc(crtc);struct intel_unpin_work *work = intel_crtc->unpin_work;u32 addr; +u32 pending; -if (atomic_read (&work->pending) >=INTEL_FLIP_COMPLETE ) -return true; - -if (atomic_read (&work->pending) <INTEL_FLIP_PENDING ) -return false; - -if (!work->enable_stall_check) -return false; + pending =atomic_read (&work->pending); +if (pending !=INTEL_FLIP_PENDING ) +return pending ==INTEL_FLIP_COMPLETE ;if (work->flip_ready_vblank ==0 ) {drivers/gpu/drm/i915/intel_display.c +5
-0if (work->flip_queued_req &&@@ -11676,6 +11672,11 @@ static int intel_crtc_page_flip(struct drm_crtc*crtc, */ if (!mmio_flip) { ret =i915_gem_object_sync (obj, engine, &request); +if (!ret && !request) { + request =i915_gem_request_alloc (engine,NULL ); + ret =PTR_ERR_OR_ZERO (request); + } +if (ret) goto cleanup_pending;drivers/gpu/drm/i915/intel_display.c +1
-0}@@ -11687,6 +11688,7 @@ 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->flip_queued_vblank =drm_crtc_vblank_count (crtc);drivers/gpu/drm/i915/intel_display.c +0
-8if (mmio_flip) { ret =intel_queue_mmio_flip (dev, crtc, obj);@@ -11696,14 +11698,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,i915_gem_request_assign (&work->flip_queued_req, obj->last_write_req); }else { -if (!request) { - request =i915_gem_request_alloc (engine,NULL ); -if (IS_ERR (request)) { - ret =PTR_ERR (request); - goto cleanup_unpin; - } - } - ret = dev_priv->display.queue_flip(dev, crtc, fb, obj, request,drivers/gpu/drm/i915/intel_display.c +0
-0page_flip_flags);if (ret)@@ -11716,7 +11710,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,i915_add_request_no_flush (request);
Quoted 9 lines
Quoted 4 lines
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c static int intel_crtc_page_flip(struct drm_crtc *crtc, · line 11712
Quoted 1 line
drivers/gpu/drm/i915/intel_display.c +0
-0work->flip_queued_vblank =drm_crtc_vblank_count (crtc);Do we still need the assigment above?
It's used for rps boosting, so likely...
But you added the same assignment above, so removing it would only change the timing of the boost if the count were to flip while queuing but not prevent the boost from happening. It's no big deal, I just find it odd that we need to set that value twice.
I think I'm not paranoid enough here. I should probably stop touching work as soon as I call intel_mark_page_flip_active, so moving it from .queue_flip to after i915_gem_request_assign would be best.
This would allow us to ensure the work struct is completely filled in when mark_page_flip_active is called, with no intermediate states to worry about.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH v2 2/11 drm/i915: Remove stallcheck special handling, v2.
In reply to Ander Conselvan De OliveiraBoth intel_unpin_work.pending and intel_unpin_work.enable_stall_check were used to see if work should be enabled. By only using pending some special cases are gone, and access to unpin_work can be simplified.
Use this to only access work members untilintel_mark_page_flip_active is called, or intel_queue_mmio_flip is used. This will prevent use-after-free, and makes it easier to verify accesses.
Changes since v1:
- Reword commit message.
- Do not access unpin_work after intel_mark_page_flip_active.
- Add the right memory barriers.
---
drivers/gpu/drm/i915/i915_debugfs.c +6 -5
@@ -582,9 +582,14 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)seq_printf (m,"No flip due on pipe %c (plane %c)\n" , pipe, plane); }else { +u32 pending;u32 addr; -if (atomic_read (&work->pending) <INTEL_FLIP_COMPLETE ) { + pending =atomic_read (&work->pending); +if (pending ==INTEL_FLIP_INACTIVE ) { +seq_printf (m,"Flip ioctl preparing on pipe %c (plane %c)\n" , + pipe, plane); + }else if (pending >=INTEL_FLIP_COMPLETE ) {seq_printf (m,"Flip queued on pipe %c (plane %c)\n" , pipe, plane); }else {
@@ -606,10 +611,6 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) work->flip_queued_vblank, work->flip_ready_vblank, drm_crtc_vblank_count(&crtc->base)); -if (work->enable_stall_check) -seq_puts (m,"Stall check enabled, " ); -else -seq_puts (m,"Stall check waiting for page flip ioctl, " );seq_printf (m,"%d prepares\n" ,atomic_read (&work->pending));if (INTEL_INFO (dev)->gen >=4 )
drivers/gpu/drm/i915/intel_display.c +28 -43
168 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -952,7 +952,6 @@ struct intel_unpin_work {struct drm_i915_gem_request *flip_queued_req;u32 flip_queued_vblank;u32 flip_ready_vblank; -bool enable_stall_check; };struct intel_load_detect_pipe {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v2 3/11 drm/i915: Remove intel_prepare_page_flip.
In reply to Maarten LankhorstDo it in 1 step instead, use atomic_read since INTEL_FLIP_COMPLETE is no longer useful.
--- drivers/gpu/drm/i915/i915_debugfs.c | 3 -- drivers/gpu/drm/i915/i915_irq.c | 18 ++----- drivers/gpu/drm/i915/intel_display.c | 96 ++++++++++++++---------------------- drivers/gpu/drm/i915/intel_drv.h | 2 - 4 files changed, 40 insertions(+), 79 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +0 -3
@@ -589,9 +589,6 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)if (pending ==INTEL_FLIP_INACTIVE ) {seq_printf (m,"Flip ioctl preparing on pipe %c (plane %c)\n" , pipe, plane); - }else if (pending >=INTEL_FLIP_COMPLETE ) { -seq_printf (m,"Flip queued 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);
drivers/gpu/drm/i915/i915_irq.c +4 -14
@@ -1707,10 +1707,8 @@ static void valleyview_pipestat_irq_handler(struct drm_device *dev, u32 iir) intel_pipe_handle_vblank(dev, pipe))intel_check_page_flip (dev, pipe); -if (pipe_stats[pipe] &PLANE_FLIP_DONE_INT_STATUS_VLV ) { -intel_prepare_page_flip (dev, pipe); +if (pipe_stats[pipe] &PLANE_FLIP_DONE_INT_STATUS_VLV )intel_finish_page_flip (dev, pipe); - }if (pipe_stats[pipe] &PIPE_CRC_DONE_INTERRUPT_STATUS )i9xx_pipe_crc_irq_handler (dev, pipe);
@@ -2109,10 +2107,8 @@ static void ilk_display_irq_handler(struct drm_device *dev, u32 de_iir)i9xx_pipe_crc_irq_handler (dev, pipe);/* plane/pipes map 1:1 on ilk+ */ -if (de_iir &DE_PLANE_FLIP_DONE (pipe)) { -intel_prepare_page_flip (dev, pipe); +if (de_iir &DE_PLANE_FLIP_DONE (pipe))intel_finish_page_flip_plane (dev, pipe); - } }/* check event from PCH */
@@ -2156,10 +2152,8 @@ static void ivb_display_irq_handler(struct drm_device *dev, u32 de_iir)intel_check_page_flip (dev, pipe);/* plane/pipes map 1:1 on ilk+ */ -if (de_iir &DE_PLANE_FLIP_DONE_IVB (pipe)) { -intel_prepare_page_flip (dev, pipe); +if (de_iir &DE_PLANE_FLIP_DONE_IVB (pipe))intel_finish_page_flip_plane (dev, pipe); - } }/* check event from PCH */
@@ -2363,10 +2357,8 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)else flip_done &=GEN8_PIPE_PRIMARY_FLIP_DONE ; -if (flip_done) { -intel_prepare_page_flip (dev, pipe); +if (flip_done)intel_finish_page_flip_plane (dev, pipe); - }if (iir &GEN8_PIPE_CDCLK_CRC_DONE )hsw_pipe_crc_irq_handler (dev, pipe);
@@ -4024,7 +4016,6 @@ static bool i8xx_handle_vblank(struct drm_device *dev,if (I915_READ16 (ISR ) & flip_pending) goto check_page_flip; -intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;
@@ -4215,7 +4206,6 @@ static bool i915_handle_vblank(struct drm_device *dev,if (I915_READ (ISR ) & flip_pending) goto check_page_flip; -intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;
drivers/gpu/drm/i915/intel_display.c +36 -60
132 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +0 -2
@@ -946,7 +946,6 @@ struct intel_unpin_work {atomic_t pending;#define INTEL_FLIP_INACTIVE 0#define INTEL_FLIP_PENDING 1 -#define INTEL_FLIP_COMPLETE 2u32 flip_count;u32 gtt_offset;struct drm_i915_gem_request *flip_queued_req;
@@ -1159,7 +1158,6 @@ 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_prepare_page_flip (struct drm_device *dev,int plane);void intel_finish_page_flip (struct drm_device *dev,int pipe);void intel_finish_page_flip_plane (struct drm_device *dev,int plane);void intel_check_page_flip (struct drm_device *dev,int pipe);
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 03/11] drm/i915: Remove intel_prepare_page_flip.
Quoted 2 lines · Maarten Lankhorst
Do it in 1 step instead, use
atomic_readsinceINTEL_FLIP_COMPLETEis no longer useful.
What's the deal with "use atomic_read"? I couldn't find where that is different from the old code.
Quoted 134 lines
Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 3 -- drivers/gpu/drm/i915/i915_irq.c | 18 ++----- drivers/gpu/drm/i915/intel_display.c | 96 ++++++++++++++---------------------(quoted diff) +0
-1- drivers/gpu/drm/i915/intel_drv.h | 2 - 4 files changed, 40 insertions(+), 79 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-3@@ -589,9 +589,6 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)if (pending ==INTEL_FLIP_INACTIVE ) { seq_printf(m, "Flip ioctl preparing on pipe %c (plane %c)\n", pipe, plane); - }else if (pending >=INTEL_FLIP_COMPLETE ) { - seq_printf(m, "Flip queued on pipe %c (plane %c)\n", - pipe, plane);drivers/gpu/drm/i915/i915_debugfs.c +0
-0}else { seq_printf(m, "Flip pending (waiting forvsync) on pipe %c (plane %c)\n",
drivers/gpu/drm/i915/i915_debugfs.c +0
-0pipe, plane);drivers/gpu/drm/i915/i915_irq.c +1
-3@@ -1707,10 +1707,8 @@ static void valleyview_pipestat_irq_handler(struct drm_device *dev, u32 iir) intel_pipe_handle_vblank(dev, pipe)) intel_check_page_flip(dev, pipe); -if (pipe_stats[pipe] &PLANE_FLIP_DONE_INT_STATUS_VLV ) { -intel_prepare_page_flip (dev, pipe); +if (pipe_stats[pipe] &PLANE_FLIP_DONE_INT_STATUS_VLV )intel_finish_page_flip (dev, pipe); - }if (pipe_stats[pipe] &PIPE_CRC_DONE_INTERRUPT_STATUS )drivers/gpu/drm/i915/i915_irq.c +1
-3i9xx_pipe_crc_irq_handler (dev, pipe);@@ -2109,10 +2107,8 @@ static void ilk_display_irq_handler(struct drm_device *dev, u32 de_iir)i9xx_pipe_crc_irq_handler (dev, pipe);/* plane/pipes map 1:1 on ilk+ */ -if (de_iir &DE_PLANE_FLIP_DONE (pipe)) { -intel_prepare_page_flip (dev, pipe); +if (de_iir &DE_PLANE_FLIP_DONE (pipe))intel_finish_page_flip_plane (dev, pipe); - } }drivers/gpu/drm/i915/i915_irq.c +1
-3/* check event from PCH */ @@ -2156,10 +2152,8 @@ static void ivb_display_irq_handler(struct drm_device *dev, u32 de_iir)intel_check_page_flip (dev, pipe);/* plane/pipes map 1:1 on ilk+ */ -if (de_iir &DE_PLANE_FLIP_DONE_IVB (pipe)) { -intel_prepare_page_flip (dev, pipe); +if (de_iir &DE_PLANE_FLIP_DONE_IVB (pipe))intel_finish_page_flip_plane (dev, pipe); - } }drivers/gpu/drm/i915/i915_irq.c +1
-3/* check event from PCH */ @@ -2363,10 +2357,8 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) else flip_done &= GEN8_PIPE_PRIMARY_FLIP_DONE; -if (flip_done) { -intel_prepare_page_flip (dev, pipe); +if (flip_done)intel_finish_page_flip_plane (dev, pipe); - }if (iir &GEN8_PIPE_CDCLK_CRC_DONE )drivers/gpu/drm/i915/i915_irq.c +0
-2hsw_pipe_crc_irq_handler (dev, pipe);@@ -4024,7 +4016,6 @@ static bool i8xx_handle_vblank(struct drm_device *dev,if (I915_READ16 (ISR ) & flip_pending) goto check_page_flip; -intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;@@ -4215,7 +4206,6 @@ static bool i915_handle_vblank(struct drm_device *dev,if (I915_READ (ISR ) & flip_pending) goto check_page_flip; -intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;drivers/gpu/drm/i915/intel_display.c +0
-1@@ -3101,7 +3101,6 @@ static void intel_complete_page_flips(struct drm_device *dev)struct intel_crtc *intel_crtc =to_intel_crtc (crtc);enum plane plane = intel_crtc->plane; -intel_prepare_page_flip (dev, plane);intel_finish_page_flip_plane (dev, plane); }}
drivers/gpu/drm/i915/intel_display.c +0
-13@@ -10925,53 +10924,6 @@ static void intel_unpin_work_fn(struct work_struct *__work)kfree (work); } -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; -unsigned long flags; - -/* Ignore early vblank irqs */ -if (intel_crtc ==NULL ) -return ; - -/* -* This is called both by irq handlers and the reset code (to complete
drivers/gpu/drm/i915/intel_display.c static void intel_unpin_work_fn(struct work_struct *__work) · line 10947
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +0
-7-* lost pageflips) so needs the full irqsave spinlocks. -*/ -spin_lock_irqsave (&dev->event_lock, flags); - work = intel_crtc->unpin_work; - -/* Ensure we don't miss a work->pending update ... */ -smp_rmb ();
If this is not needed anymore, should the matching smp_wmb() from intel_mark_page_flip_active() be removed?
Quoted 58 lines
drivers/gpu/drm/i915/intel_display.c +0
-2- - if (work == NULL || atomic_read(&work->pending) <
INTEL_FLIP_COMPLETE) {drivers/gpu/drm/i915/intel_display.c +7
-29-spin_unlock_irqrestore (&dev->event_lock, flags); -return ; - } - -page_flip_completed (intel_crtc); - -spin_unlock_irqrestore (&dev->event_lock, flags); -} - -void intel_finish_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]; - -do_intel_finish_page_flip (dev, crtc); -} - -void intel_finish_page_flip_plane (struct drm_device *dev,int plane) -{ -struct drm_i915_private *dev_priv = dev->dev_private; -struct drm_crtc *crtc = dev_priv->plane_to_crtc_mapping[plane]; - -do_intel_finish_page_flip (dev, crtc); -} -/* Is 'a' after or equal to 'b'? */ static bool g4x_flip_count_after_eq (u32 a,u32 b) {@@ -11024,28 +10976,52 @@ static bool page_flip_finished(struct intel_crtc *crtc) crtc->unpin_work->flip_count); } -void intel_prepare_page_flip (struct drm_device *dev,int plane) +static void do_intel_finish_page_flip (struct drm_device *dev, +struct drm_crtc *crtc) { -struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_crtc *intel_crtc = -to_intel_crtc (dev_priv->plane_to_crtc_mapping[plane]); +struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +struct intel_unpin_work *work;unsigned long flags; +/* Ignore early vblank irqs */ +if (intel_crtc ==NULL ) +return ;/* * This is called both by irq handlers and the reset code (to complete
drivers/gpu/drm/i915/intel_display.c +0
-3* lost pageflips) so needs the full irqsave spinlocks. -* -* NB: An MMIO update of the plane base pointer will also -* generate a page-flip completion irq, i.e. every modeset
drivers/gpu/drm/i915/intel_display.c static bool page_flip_finished(struct intel_crtc *crtc) · line 10999
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +5
-3-* is also accompanied by a spurious intel_prepare_page_flip(). */ spin_lock_irqsave (&dev->event_lock, flags); -if (intel_crtc->unpin_work &&page_flip_finished (intel_crtc)) -atomic_inc_not_zero (&intel_crtc->unpin_work->pending); + work = intel_crtc->unpin_work; + +if (work ==NULL || +atomic_read (&work->pending) ==INTEL_FLIP_INACTIVE || + !page_flip_finished (intel_crtc)) {
This line is misaligned. Also, if the condition is was inverted you could save the extra unlock and return.
Ander
Quoted 54 lines
drivers/gpu/drm/i915/intel_display.c +24
-2+spin_unlock_irqrestore (&dev->event_lock, flags); +return ; + } + +page_flip_completed (intel_crtc); +spin_unlock_irqrestore (&dev->event_lock, flags); } +void intel_finish_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]; + +do_intel_finish_page_flip (dev, crtc); +} + +void intel_finish_page_flip_plane (struct drm_device *dev,int plane) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_crtc *crtc = dev_priv->plane_to_crtc_mapping[plane]; + +do_intel_finish_page_flip (dev, crtc); +} +static inline void intel_mark_page_flip_active (struct intel_unpin_work *work) {/* Ensure that the work item is consistent when activating it ... */ @@ -11495,8 +11471,8 @@ static bool __intel_pageflip_stall_check(structdrm_device *dev, u32 pending; pending =atomic_read (&work->pending); -if (pending !=INTEL_FLIP_PENDING ) -return pending ==INTEL_FLIP_COMPLETE ; +if (pending ==INTEL_FLIP_INACTIVE ) +return false;if (work->flip_ready_vblank ==0 ) {drivers/gpu/drm/i915/intel_display.c +0
-0if (work->flip_queued_req &&drivers/gpu/drm/i915/intel_drv.h +0
-1@@ -946,7 +946,6 @@ struct intel_unpin_work {atomic_t pending;#define INTEL_FLIP_INACTIVE 0#define INTEL_FLIP_PENDING 1 -#define INTEL_FLIP_COMPLETE 2u32 flip_count;u32 gtt_offset;struct drm_i915_gem_request *flip_queued_req;
drivers/gpu/drm/i915/intel_drv.h struct drm_framebuffer * · line 1163
Quoted 7 lines
drivers/gpu/drm/i915/intel_drv.h +0
-1@@ -1159,7 +1158,6 @@ 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_prepare_page_flip (struct drm_device *dev,int plane);void intel_finish_page_flip (struct drm_device *dev,int pipe);void intel_finish_page_flip_plane (struct drm_device *dev,int plane);void intel_check_page_flip (struct drm_device *dev,int pipe);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [PATCH v2 03/11] drm/i915: Remove intel_prepare_page_flip.
Op 15-04-16 om 14:21 schreef Ander Conselvan De Oliveira:
Quoted 5 lines · Maarten Lankhorst
Quoted 2 lines
Do it in 1 step instead, use
atomic_readsinceINTEL_FLIP_COMPLETEis no longer useful.What's the deal with "use
atomic_read"? I couldn't find where that is different from the old code.
This could probably use some rewording, what I believe was that with the removal of prepare_page_flip, do_intel_finish_page_flip only needs a single atomic_read to complete.
Quoted 271 lines
Quoted 133 lines
Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 3 -- drivers/gpu/drm/i915/i915_irq.c | 18 ++----- drivers/gpu/drm/i915/intel_display.c | 96 ++++++++++++++---------------------(quoted diff) +0
-1- drivers/gpu/drm/i915/intel_drv.h | 2 - 4 files changed, 40 insertions(+), 79 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-3@@ -589,9 +589,6 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)if (pending ==INTEL_FLIP_INACTIVE ) { seq_printf(m, "Flip ioctl preparing on pipe %c (plane %c)\n", pipe, plane); - }else if (pending >=INTEL_FLIP_COMPLETE ) { - seq_printf(m, "Flip queued on pipe %c (plane %c)\n", - pipe, plane);drivers/gpu/drm/i915/i915_debugfs.c +0
-0}else { seq_printf(m, "Flip pending (waiting forvsync) on pipe %c (plane %c)\n",
drivers/gpu/drm/i915/i915_debugfs.c +0
-0pipe, plane);drivers/gpu/drm/i915/i915_irq.c +1
-3@@ -1707,10 +1707,8 @@ static void valleyview_pipestat_irq_handler(struct drm_device *dev, u32 iir) intel_pipe_handle_vblank(dev, pipe)) intel_check_page_flip(dev, pipe); -if (pipe_stats[pipe] &PLANE_FLIP_DONE_INT_STATUS_VLV ) { -intel_prepare_page_flip (dev, pipe); +if (pipe_stats[pipe] &PLANE_FLIP_DONE_INT_STATUS_VLV )intel_finish_page_flip (dev, pipe); - }if (pipe_stats[pipe] &PIPE_CRC_DONE_INTERRUPT_STATUS )drivers/gpu/drm/i915/i915_irq.c +1
-3i9xx_pipe_crc_irq_handler (dev, pipe);@@ -2109,10 +2107,8 @@ static void ilk_display_irq_handler(struct drm_device *dev, u32 de_iir)i9xx_pipe_crc_irq_handler (dev, pipe);/* plane/pipes map 1:1 on ilk+ */ -if (de_iir &DE_PLANE_FLIP_DONE (pipe)) { -intel_prepare_page_flip (dev, pipe); +if (de_iir &DE_PLANE_FLIP_DONE (pipe))intel_finish_page_flip_plane (dev, pipe); - } }drivers/gpu/drm/i915/i915_irq.c +1
-3/* check event from PCH */ @@ -2156,10 +2152,8 @@ static void ivb_display_irq_handler(struct drm_device *dev, u32 de_iir)intel_check_page_flip (dev, pipe);/* plane/pipes map 1:1 on ilk+ */ -if (de_iir &DE_PLANE_FLIP_DONE_IVB (pipe)) { -intel_prepare_page_flip (dev, pipe); +if (de_iir &DE_PLANE_FLIP_DONE_IVB (pipe))intel_finish_page_flip_plane (dev, pipe); - } }drivers/gpu/drm/i915/i915_irq.c +1
-3/* check event from PCH */ @@ -2363,10 +2357,8 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) else flip_done &= GEN8_PIPE_PRIMARY_FLIP_DONE; -if (flip_done) { -intel_prepare_page_flip (dev, pipe); +if (flip_done)intel_finish_page_flip_plane (dev, pipe); - }if (iir &GEN8_PIPE_CDCLK_CRC_DONE )drivers/gpu/drm/i915/i915_irq.c +0
-2hsw_pipe_crc_irq_handler (dev, pipe);@@ -4024,7 +4016,6 @@ static bool i8xx_handle_vblank(struct drm_device *dev,if (I915_READ16 (ISR ) & flip_pending) goto check_page_flip; -intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;@@ -4215,7 +4206,6 @@ static bool i915_handle_vblank(struct drm_device *dev,if (I915_READ (ISR ) & flip_pending) goto check_page_flip; -intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;drivers/gpu/drm/i915/intel_display.c +0
-1@@ -3101,7 +3101,6 @@ static void intel_complete_page_flips(struct drm_device *dev)struct intel_crtc *intel_crtc =to_intel_crtc (crtc);enum plane plane = intel_crtc->plane; -intel_prepare_page_flip (dev, plane);intel_finish_page_flip_plane (dev, plane); }}
drivers/gpu/drm/i915/intel_display.c +0
-13@@ -10925,53 +10924,6 @@ static void intel_unpin_work_fn(struct work_struct *__work)kfree (work); } -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; -unsigned long flags; - -/* Ignore early vblank irqs */ -if (intel_crtc ==NULL ) -return ; - -/* -* This is called both by irq handlers and the reset code (to complete
drivers/gpu/drm/i915/intel_display.c static void intel_unpin_work_fn(struct work_struct *__work) · line 10947
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +0
-7-* lost pageflips) so needs the full irqsave spinlocks. -*/ -spin_lock_irqsave (&dev->event_lock, flags); - work = intel_crtc->unpin_work; - -/* Ensure we don't miss a work->pending update ... */ -smp_rmb ();If this is not needed anymore, should the matching
smp_wmb()fromintel_mark_page_flip_active()be removed?Quoted 58 lines
drivers/gpu/drm/i915/intel_display.c +0
-2- - if (work == NULL || atomic_read(&work->pending) <
INTEL_FLIP_COMPLETE) {drivers/gpu/drm/i915/intel_display.c +7
-29-spin_unlock_irqrestore (&dev->event_lock, flags); -return ; - } - -page_flip_completed (intel_crtc); - -spin_unlock_irqrestore (&dev->event_lock, flags); -} - -void intel_finish_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]; - -do_intel_finish_page_flip (dev, crtc); -} - -void intel_finish_page_flip_plane (struct drm_device *dev,int plane) -{ -struct drm_i915_private *dev_priv = dev->dev_private; -struct drm_crtc *crtc = dev_priv->plane_to_crtc_mapping[plane]; - -do_intel_finish_page_flip (dev, crtc); -} -/* Is 'a' after or equal to 'b'? */ static bool g4x_flip_count_after_eq (u32 a,u32 b) {@@ -11024,28 +10976,52 @@ static bool page_flip_finished(struct intel_crtc *crtc) crtc->unpin_work->flip_count); } -void intel_prepare_page_flip (struct drm_device *dev,int plane) +static void do_intel_finish_page_flip (struct drm_device *dev, +struct drm_crtc *crtc) { -struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_crtc *intel_crtc = -to_intel_crtc (dev_priv->plane_to_crtc_mapping[plane]); +struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +struct intel_unpin_work *work;unsigned long flags; +/* Ignore early vblank irqs */ +if (intel_crtc ==NULL ) +return ;/* * This is called both by irq handlers and the reset code (to complete
drivers/gpu/drm/i915/intel_display.c +0
-3* lost pageflips) so needs the full irqsave spinlocks. -* -* NB: An MMIO update of the plane base pointer will also -* generate a page-flip completion irq, i.e. every modeset drivers/gpu/drm/i915/intel_display.c static bool page_flip_finished(struct intel_crtc *crtc) · line 10999
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +5
-3-* is also accompanied by a spurious intel_prepare_page_flip(). */ spin_lock_irqsave (&dev->event_lock, flags); -if (intel_crtc->unpin_work &&page_flip_finished (intel_crtc)) -atomic_inc_not_zero (&intel_crtc->unpin_work->pending); + work = intel_crtc->unpin_work; + +if (work ==NULL || +atomic_read (&work->pending) ==INTEL_FLIP_INACTIVE || + !page_flip_finished (intel_crtc)) {This line is misaligned. Also, if the condition is was inverted you could save the extra unlock and return.
Ander
Quoted 53 lines
drivers/gpu/drm/i915/intel_display.c +24
-2+spin_unlock_irqrestore (&dev->event_lock, flags); +return ; + } + +page_flip_completed (intel_crtc); +spin_unlock_irqrestore (&dev->event_lock, flags); } +void intel_finish_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]; + +do_intel_finish_page_flip (dev, crtc); +} + +void intel_finish_page_flip_plane (struct drm_device *dev,int plane) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_crtc *crtc = dev_priv->plane_to_crtc_mapping[plane]; + +do_intel_finish_page_flip (dev, crtc); +} +static inline void intel_mark_page_flip_active (struct intel_unpin_work *work) {/* Ensure that the work item is consistent when activating it ... */ @@ -11495,8 +11471,8 @@ static bool __intel_pageflip_stall_check(structdrm_device *dev, u32 pending; pending =atomic_read (&work->pending); -if (pending !=INTEL_FLIP_PENDING ) -return pending ==INTEL_FLIP_COMPLETE ; +if (pending ==INTEL_FLIP_INACTIVE ) +return false;if (work->flip_ready_vblank ==0 ) {drivers/gpu/drm/i915/intel_display.c +0
-0if (work->flip_queued_req &&drivers/gpu/drm/i915/intel_drv.h +0
-1@@ -946,7 +946,6 @@ struct intel_unpin_work {atomic_t pending;#define INTEL_FLIP_INACTIVE 0#define INTEL_FLIP_PENDING 1 -#define INTEL_FLIP_COMPLETE 2u32 flip_count;u32 gtt_offset;struct drm_i915_gem_request *flip_queued_req;
Quoted 8 lines
drivers/gpu/drm/i915/intel_drv.h struct drm_framebuffer * · line 1163
Quoted 8 lines
drivers/gpu/drm/i915/intel_drv.h +0
-1@@ -1159,7 +1158,6 @@ 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_prepare_page_flip (struct drm_device *dev,int plane);void intel_finish_page_flip (struct drm_device *dev,int pipe);void intel_finish_page_flip_plane (struct drm_device *dev,int plane);void intel_check_page_flip (struct drm_device *dev,int pipe);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH v2 3/11 drm/i915: Remove intel_prepare_page_flip, v2.
In reply to Ander Conselvan De OliveiraInstead of calling prepare_flip right before calling finish_page_flip do everything from prepare_page_flip in finish_page_flip.
Putting prepare and finish page_flip in a single step removes the need for INTEL_FLIP_COMPLETE, so it can be removed. This simplifies the code slightly.
Changes since v1:
- Invert if case to simplify code.
- Add missing atomic barrier.
- Reword commit message.
---
drivers/gpu/drm/i915/i915_debugfs.c +0 -3
@@ -589,9 +589,6 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)if (pending ==INTEL_FLIP_INACTIVE ) {seq_printf (m,"Flip ioctl preparing on pipe %c (plane %c)\n" , pipe, plane); - }else if (pending >=INTEL_FLIP_COMPLETE ) { -seq_printf (m,"Flip queued 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);
drivers/gpu/drm/i915/i915_irq.c +4 -14
@@ -1707,10 +1707,8 @@ static void valleyview_pipestat_irq_handler(struct drm_device *dev, u32 iir) intel_pipe_handle_vblank(dev, pipe))intel_check_page_flip (dev, pipe); -if (pipe_stats[pipe] &PLANE_FLIP_DONE_INT_STATUS_VLV ) { -intel_prepare_page_flip (dev, pipe); +if (pipe_stats[pipe] &PLANE_FLIP_DONE_INT_STATUS_VLV )intel_finish_page_flip (dev, pipe); - }if (pipe_stats[pipe] &PIPE_CRC_DONE_INTERRUPT_STATUS )i9xx_pipe_crc_irq_handler (dev, pipe);
@@ -2109,10 +2107,8 @@ static void ilk_display_irq_handler(struct drm_device *dev, u32 de_iir)i9xx_pipe_crc_irq_handler (dev, pipe);/* plane/pipes map 1:1 on ilk+ */ -if (de_iir &DE_PLANE_FLIP_DONE (pipe)) { -intel_prepare_page_flip (dev, pipe); +if (de_iir &DE_PLANE_FLIP_DONE (pipe))intel_finish_page_flip_plane (dev, pipe); - } }/* check event from PCH */
@@ -2156,10 +2152,8 @@ static void ivb_display_irq_handler(struct drm_device *dev, u32 de_iir)intel_check_page_flip (dev, pipe);/* plane/pipes map 1:1 on ilk+ */ -if (de_iir &DE_PLANE_FLIP_DONE_IVB (pipe)) { -intel_prepare_page_flip (dev, pipe); +if (de_iir &DE_PLANE_FLIP_DONE_IVB (pipe))intel_finish_page_flip_plane (dev, pipe); - } }/* check event from PCH */
@@ -2363,10 +2357,8 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)else flip_done &=GEN8_PIPE_PRIMARY_FLIP_DONE ; -if (flip_done) { -intel_prepare_page_flip (dev, pipe); +if (flip_done)intel_finish_page_flip_plane (dev, pipe); - }if (iir &GEN8_PIPE_CDCLK_CRC_DONE )hsw_pipe_crc_irq_handler (dev, pipe);
@@ -3962,7 +3954,6 @@ static bool i8xx_handle_vblank(struct drm_device *dev,if (I915_READ16 (ISR ) & flip_pending) goto check_page_flip; -intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;
@@ -4153,7 +4144,6 @@ static bool i915_handle_vblank(struct drm_device *dev,if (I915_READ (ISR ) & flip_pending) goto check_page_flip; -intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;
drivers/gpu/drm/i915/intel_display.c +32 -57
125 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +0 -2
@@ -946,7 +946,6 @@ struct intel_unpin_work {atomic_t pending;#define INTEL_FLIP_INACTIVE 0#define INTEL_FLIP_PENDING 1 -#define INTEL_FLIP_COMPLETE 2u32 flip_count;u32 gtt_offset;struct drm_i915_gem_request *flip_queued_req;
@@ -1159,7 +1158,6 @@ 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_prepare_page_flip (struct drm_device *dev,int plane);void intel_finish_page_flip (struct drm_device *dev,int pipe);void intel_finish_page_flip_plane (struct drm_device *dev,int plane);void intel_check_page_flip (struct drm_device *dev,int pipe);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v2 3/11 drm/i915: Remove intel_prepare_page_flip, v2.
Instead of calling prepare_flip right before calling finish_page_flip do everything from prepare_page_flip in finish_page_flip.
Putting prepare and finish page_flip in a single step removes the need for INTEL_FLIP_COMPLETE, so it can be removed. This simplifies the code slightly.
Changes since v1:
- Invert if case to simplify code.
- Add missing barrier.
- Reword commit message.
---
Uh oh, forgot to refresh, this version has the missing memory barrier the commit says it has.
drivers/gpu/drm/i915/i915_debugfs.c +0 -3
@@ -589,9 +589,6 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)if (pending ==INTEL_FLIP_INACTIVE ) {seq_printf (m,"Flip ioctl preparing on pipe %c (plane %c)\n" , pipe, plane); - }else if (pending >=INTEL_FLIP_COMPLETE ) { -seq_printf (m,"Flip queued 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);
drivers/gpu/drm/i915/i915_irq.c +4 -14
@@ -1707,10 +1707,8 @@ static void valleyview_pipestat_irq_handler(struct drm_device *dev, u32 iir) intel_pipe_handle_vblank(dev, pipe))intel_check_page_flip (dev, pipe); -if (pipe_stats[pipe] &PLANE_FLIP_DONE_INT_STATUS_VLV ) { -intel_prepare_page_flip (dev, pipe); +if (pipe_stats[pipe] &PLANE_FLIP_DONE_INT_STATUS_VLV )intel_finish_page_flip (dev, pipe); - }if (pipe_stats[pipe] &PIPE_CRC_DONE_INTERRUPT_STATUS )i9xx_pipe_crc_irq_handler (dev, pipe);
@@ -2109,10 +2107,8 @@ static void ilk_display_irq_handler(struct drm_device *dev, u32 de_iir)i9xx_pipe_crc_irq_handler (dev, pipe);/* plane/pipes map 1:1 on ilk+ */ -if (de_iir &DE_PLANE_FLIP_DONE (pipe)) { -intel_prepare_page_flip (dev, pipe); +if (de_iir &DE_PLANE_FLIP_DONE (pipe))intel_finish_page_flip_plane (dev, pipe); - } }/* check event from PCH */
@@ -2156,10 +2152,8 @@ static void ivb_display_irq_handler(struct drm_device *dev, u32 de_iir)intel_check_page_flip (dev, pipe);/* plane/pipes map 1:1 on ilk+ */ -if (de_iir &DE_PLANE_FLIP_DONE_IVB (pipe)) { -intel_prepare_page_flip (dev, pipe); +if (de_iir &DE_PLANE_FLIP_DONE_IVB (pipe))intel_finish_page_flip_plane (dev, pipe); - } }/* check event from PCH */
@@ -2363,10 +2357,8 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)else flip_done &=GEN8_PIPE_PRIMARY_FLIP_DONE ; -if (flip_done) { -intel_prepare_page_flip (dev, pipe); +if (flip_done)intel_finish_page_flip_plane (dev, pipe); - }if (iir &GEN8_PIPE_CDCLK_CRC_DONE )hsw_pipe_crc_irq_handler (dev, pipe);
@@ -3962,7 +3954,6 @@ static bool i8xx_handle_vblank(struct drm_device *dev,if (I915_READ16 (ISR ) & flip_pending) goto check_page_flip; -intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;
@@ -4153,7 +4144,6 @@ static bool i915_handle_vblank(struct drm_device *dev,if (I915_READ (ISR ) & flip_pending) goto check_page_flip; -intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;
drivers/gpu/drm/i915/intel_display.c +35 -57
134 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +0 -2
@@ -946,7 +946,6 @@ struct intel_unpin_work {atomic_t pending;#define INTEL_FLIP_INACTIVE 0#define INTEL_FLIP_PENDING 1 -#define INTEL_FLIP_COMPLETE 2u32 flip_count;u32 gtt_offset;struct drm_i915_gem_request *flip_queued_req;
@@ -1159,7 +1158,6 @@ 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_prepare_page_flip (struct drm_device *dev,int plane);void intel_finish_page_flip (struct drm_device *dev,int pipe);void intel_finish_page_flip_plane (struct drm_device *dev,int plane);void intel_check_page_flip (struct drm_device *dev,int pipe);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH v2 4/11 drm/i915: Add support for detecting vblanks when hw frame counter is unavailable.
In reply to Maarten LankhorstThis uses the newly created drm_accurate_vblank_count_and_time to accurately get a vblank count when the hw counter is unavailable.
--- drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++ drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_sprite.c | 8 ++------ 3 files changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_display.c +10 -0
@@ -13498,6 +13498,16 @@ static int intel_atomic_prepare_commit(struct drm_device *dev,return ret; } +u32 intel_crtc_get_vblank_counter (struct intel_crtc *crtc) +{ +struct drm_device *dev = crtc->base.dev; + +if (!dev->max_vblank_count) +return drm_accurate_vblank_count (&crtc->base); + +return dev->driver->get_vblank_counter (dev, crtc->pipe); +} +static void intel_atomic_wait_for_vblanks (struct drm_device *dev,struct drm_i915_private *dev_priv,unsigned crtc_mask)
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -1141,6 +1141,9 @@ intel_wait_for_vblank_if_active(struct drm_device *dev, int pipe)if (crtc->active)intel_wait_for_vblank (dev, pipe); } + +u32 intel_crtc_get_vblank_counter (struct intel_crtc *crtc); +int ironlake_get_lanes_required (int target_clock,int link_bw,int bpp); void vlv_wait_port_ready(struct drm_i915_private *dev_priv, struct intel_digital_port *dport,
drivers/gpu/drm/i915/intel_sprite.c +2 -6
@@ -80,9 +80,7 @@ static int usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,*/ void intel_pipe_update_start (struct intel_crtc *crtc) { -struct drm_device *dev = crtc->base.dev;const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode; -enum pipe pipe = crtc->pipe;long timeout =msecs_to_jiffies_timeout (1 );int scanline, min, max, vblank_start;wait_queue_head_t *wq =drm_crtc_vblank_waitqueue (&crtc->base);
@@ -139,8 +137,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc) crtc->debug.scanline_start = scanline; crtc->debug.start_vbl_time =ktime_get (); - crtc->debug.start_vbl_count = - dev->driver->get_vblank_counter (dev, pipe); + crtc->debug.start_vbl_count =intel_crtc_get_vblank_counter (crtc);trace_i915_pipe_update_vblank_evaded (crtc); }
@@ -156,10 +153,9 @@ void intel_pipe_update_start(struct intel_crtc *crtc)*/ void intel_pipe_update_end (struct intel_crtc *crtc) { -struct drm_device *dev = crtc->base.dev;enum pipe pipe = crtc->pipe;int scanline_end =intel_get_crtc_scanline (crtc); -u32 end_vbl_count = dev->driver->get_vblank_counter (dev, pipe); +u32 end_vbl_count =intel_crtc_get_vblank_counter (crtc);ktime_t end_vbl_time =ktime_get ();trace_i915_pipe_update_end (crtc, end_vbl_count, scanline_end);
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH v2 5/11 drm/i915: Allow mmio updates on all platforms, v2.
In reply to Maarten LankhorstRename 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.
Changes since v1:
- Add smp_mb__after_atomic() to __intel_pageflip_stall_check, to match the smp_mb__before_atomic() in pipe_update_end().
- Check for cur != flip_queued_vblank in pageflip_stall_check.
--- drivers/gpu/drm/i915/i915_debugfs.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 271 +++++++++++------------------------ drivers/gpu/drm/i915/intel_drv.h | 18 +-- drivers/gpu/drm/i915/intel_sprite.c | 8 +- 4 files changed, 95 insertions(+), 206 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -2
@@ -574,10 +574,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);
drivers/gpu/drm/i915/intel_display.c +80 -191
517 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +6 -12
@@ -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;
@@ -937,8 +929,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;
@@ -1618,7 +1612,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);
drivers/gpu/drm/i915/intel_sprite.c +7 -1
@@ -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 ();
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 05/11] drm/i915: Allow mmio updates on all platforms, v2.
Quoted 2 lines · Maarten Lankhorst
Rename
intel_unpin_worktointel_flip_workand use it for mmio flips and unpinning.
I think the rename should be a separate patch.
Ander
Quoted 710 lines
Use
flip_queued_reqto 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.Changes since v1:
- Addsmp_mb__after_atomic()to__intel_pageflip_stall_check, to match thesmp_mb__before_atomic()inpipe_update_end().
- Check for cur !=flip_queued_vblankinpageflip_stall_check.Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 271 +++++++++++-----------------------(quoted diff) +0
-1- drivers/gpu/drm/i915/intel_drv.h | 18 +-- drivers/gpu/drm/i915/intel_sprite.c | 8 +- 4 files changed, 95 insertions(+), 206 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +2
-2@@ -574,10 +574,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",drivers/gpu/drm/i915/i915_debugfs.c +0
-0pipe, plane);drivers/gpu/drm/i915/intel_display.c +6
-1@@ -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 ,@@ -3285,7 +3290,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);drivers/gpu/drm/i915/intel_display.c +4
-4return pending;@@ -3864,7 +3869,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;@@ -3876,11 +3881,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)drivers/gpu/drm/i915/intel_display.c +1
-1drm_send_vblank_event(intel_crtc->base.dev,@@ -3890,7 +3895,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,drivers/gpu/drm/i915/intel_display.c +3
-1work->pending_flip_obj);@@ -3914,9 +3919,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);drivers/gpu/drm/i915/intel_display.c +11
-7}@@ -6308,7 +6315,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);@@ -10881,15 +10888,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); }@@ -10900,12 +10908,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);drivers/gpu/drm/i915/intel_display.c +5
-6drm_gem_object_unreference (&work->pending_flip_obj->base);@@ -10971,16 +10982,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 */ @@ -10992,11 +11003,11 @@ static void do_intel_finish_page_flip(structdrm_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 ;drivers/gpu/drm/i915/intel_display.c +1
-1}@@ -11022,7 +11033,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 ... */ drivers/gpu/drm/i915/intel_display.c +3
-5smp_wmb ();@@ -11059,10 +11070,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 ; }@@ -11091,10 +11101,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 ; }@@ -11122,7 +11131,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);drivers/gpu/drm/i915/intel_display.c +1
-2/* XXX Enabling the panel-fitter across page-flip is so far @@ -11133,7 +11142,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 ; }@@ -11157,7 +11165,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, drivers/gpu/drm/i915/intel_display.c +1
-6* "Enable Panel Fitter" does not seem to be required when page @@ -11169,7 +11177,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 ; }@@ -11261,10 +11268,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 ; }@@ -11282,9 +11288,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;drivers/gpu/drm/i915/intel_display.c +1
-30else if (i915.use_mmio_flip >0 )@@ -11299,126 +11302,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) +static void intel_mmio_flip_work_func (struct work_struct *w) { -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
drivers/gpu/drm/i915/intel_display.c +0
-5-* 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);
drivers/gpu/drm/i915/intel_display.c +15
-107- 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) -{ -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 ; +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 (reg, dspcntr); - -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)@@ -11426,29 +11324,11 @@ 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)); +intel_pipe_update_end (crtc, work); }static int intel_default_queue_flip(struct
drm_device*dev,drivers/gpu/drm/i915/intel_display.c +7
-1@@ -11466,7 +11346,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;@@ -11474,6 +11354,15 @@ static bool __intel_pageflip_stall_check(struct drm_device *dev, if (pending == INTEL_FLIP_INACTIVE)return false; +smp_mb__after_atomic (); + +if (is_mmio_work (work)) { +u32 cur =intel_crtc_get_vblank_counter (intel_crtc); + +/* MMIO work completes when vblank is different from
flip_queued_vblank. */drivers/gpu/drm/i915/intel_display.c +8
-4+return cur != work->flip_queued_vblank; + } +if (work->flip_ready_vblank ==0 ) {if (work->flip_queued_req && !i915_gem_request_completed (work->flip_queued_req, true))@@ -11504,7 +11393,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 ());@@ -11512,14 +11401,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) &&drivers/gpu/drm/i915/intel_display.c +4
-5drm_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);@@ -11537,7 +11427,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 ;@@ -11574,15 +11464,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. drivers/gpu/drm/i915/intel_display.c +7
-8*/ @@ -11598,7 +11488,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 )@@ -11667,23 +11557,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); + }drivers/gpu/drm/i915/intel_display.c +2
-2work->flip_queued_vblank =drm_crtc_vblank_count (crtc);@@ -11713,7 +11602,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);@@ -14018,7 +13907,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 ); }/**
drivers/gpu/drm/i915/intel_drv.h +5
-11@@ -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;@@ -937,8 +929,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;drivers/gpu/drm/i915/intel_drv.h +1
-1struct drm_i915_gem_object *pending_flip_obj;@@ -1618,7 +1612,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*/
voidintel_tv_init(struct drm_device *dev);drivers/gpu/drm/i915/intel_sprite.c +7
-1@@ -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);
Quoted 1 line
local_irq_enable();
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [PATCH v2 05/11] drm/i915: Allow mmio updates on all platforms, v2.
Op 15-04-16 om 14:31 schreef Ander Conselvan De Oliveira:
Quoted 5 lines · Maarten Lankhorst
Quoted 2 lines
Rename
intel_unpin_worktointel_flip_workand use it for mmio flips and unpinning.I think the rename should be a separate patch.
intel_unpin_work becomes used for mmio updates and unpinning, hence it's renamed to intel_flip_work. I don't think it makes much sense as a separate patch.
I could try though, see what happens. :)
~Maarten
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH v2 6/11 drm/i915: Convert flip_work to a list.
In reply to Maarten LankhorstThis will be required to allow more than 1 update in the future.
--- drivers/gpu/drm/i915/i915_debugfs.c | 90 ++++++++++++++++------------- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 107 +++++++++++++++++++---------------- drivers/gpu/drm/i915/intel_drv.h | 4 +- 4 files changed, 114 insertions(+), 89 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +51 -39
@@ -559,6 +559,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 ==INTEL_FLIP_INACTIVE ) { +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, +drm_crtc_vblank_count (&crtc->base)); +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;
@@ -577,48 +624,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 ==INTEL_FLIP_INACTIVE ) { -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, -drm_crtc_vblank_count (&crtc->base)); -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
@@ -605,7 +605,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_device *dev);/* clock updates for mode set */ /* cursor updates */
drivers/gpu/drm/i915/intel_display.c +59 -48
303 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +3 -1
@@ -606,7 +606,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;
@@ -930,6 +930,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.1.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v2 7/11 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.1.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v2 8/11 drm/i915: Rework intel_crtc_page_flip to be almost atomic, v3.
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.
--- drivers/gpu/drm/i915/i915_debugfs.c | 36 +- drivers/gpu/drm/i915/intel_display.c | 673 +++++++++++++++++++++-------------- drivers/gpu/drm/i915/intel_drv.h | 13 +- 3 files changed, 437 insertions(+), 285 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +25 -11
@@ -565,29 +565,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 ==INTEL_FLIP_INACTIVE ) {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,
@@ -600,7 +614,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 +402 -271
862 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +10 -3
@@ -935,9 +935,6 @@ 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;struct drm_pending_vblank_event *event;atomic_t pending;#define INTEL_FLIP_INACTIVE 0
@@ -947,6 +944,16 @@ 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; +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.1.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v2 9/11 drm/i915: Remove cs based page flip support.
In reply to Maarten LankhorstWith mmio flips now available on all platforms it's time to remove support for cs flips.
--- drivers/gpu/drm/i915/i915_debugfs.c | 21 +-- drivers/gpu/drm/i915/intel_display.c | 273 +---------------------------------- drivers/gpu/drm/i915/intel_drv.h | 6 +- 3 files changed, 12 insertions(+), 288 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +3 -18
@@ -566,7 +566,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);
@@ -578,7 +577,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;
@@ -602,22 +600,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, -drm_crtc_vblank_count (&crtc->base)); -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); - } +seq_printf (m,"Flip queued on frame %d, now %d\n" , + pending ? work->flip_queued_vblank :-1 , +intel_crtc_get_vblank_counter (crtc)); }static int i915_gem_pageflip_info (struct seq_file *m,void *data)
drivers/gpu/drm/i915/intel_display.c +8 -265
342 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +1 -5
@@ -939,16 +939,12 @@ struct intel_flip_work {atomic_t pending;#define INTEL_FLIP_INACTIVE 0#define INTEL_FLIP_PENDING 1 -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; +bool can_async_unpin;unsigned fb_bits;struct intel_crtc_state *old_crtc_state, *new_crtc_state;
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v2 10/11 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 | 3 +-- 3 files changed, 1 insertion(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_params.c +0 -5
@@ -50,7 +50,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,
@@ -179,10 +178,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
@@ -46,7 +46,6 @@ struct i915_params {int invert_brightness;int enable_cmd_parser;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 -2
@@ -259,8 +259,7 @@ int intel_sanitize_enable_execlists(struct drm_device *dev, int enable_execlistsif (enable_execlists ==0 )return 0 ; -if (HAS_LOGICAL_RING_CONTEXTS (dev) &&USES_PPGTT (dev) && - i915.use_mmio_flip >=0 ) +if (HAS_LOGICAL_RING_CONTEXTS (dev) &&USES_PPGTT (dev))return 1 ;return 0 ;
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v2 11/11 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
@@ -601,11 +601,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_device *dev);/* 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.1.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Rework page flip to be more atomic like, and remove cs flips.
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Rework page flip to be more atomic like, and remove cs flips.
URL : https://patchwork.freedesktop.org/series/5647/
State : failure
== Summary ==
Series 5647v1 drm/i915: Rework page flip to be more atomic like, and remove cs flips.
http://patchwork.freedesktop.org/api/1.0/series/5647/revisions/1/mbox/
Test gem_exec_suspend:
Subgroup basic-s3:
incomplete -> PASS (hsw-gt2)
Test kms_flip:
Subgroup basic-flip-vs-dpms:
pass -> DMESG-FAIL (skl-i7k-2)bdw-nuci7 total:203 pass:191 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:203 pass:180 dwarn:0 dfail:0 fail:0 skip:23 bsw-nuc-2 total:202 pass:163 dwarn:0 dfail:0 fail:0 skip:39 byt-nuc total:202 pass:164 dwarn:0 dfail:0 fail:0 skip:38 hsw-brixbox total:203 pass:179 dwarn:0 dfail:0 fail:0 skip:24 hsw-gt2 total:203 pass:184 dwarn:0 dfail:0 fail:0 skip:19 ilk-hp8440p total:203 pass:135 dwarn:0 dfail:0 fail:0 skip:68 ivb-t430s total:203 pass:175 dwarn:0 dfail:0 fail:0 skip:28 skl-i7k-2 total:203 pass:177 dwarn:0 dfail:1 fail:0 skip:25 skl-nuci5 total:203 pass:192 dwarn:0 dfail:0 fail:0 skip:11 snb-x220t total:203 pass:165 dwarn:0 dfail:0 fail:1 skip:37
BOOT FAILED for snb-dellxps
Results at /archive/results/CI_IGT_test/Patchwork_1885/
631ffd2f45bb43964f729e8661532fb115f5eeec drm-intel-nightly: 2016y-04m-13d-13h-00m-18s UTC integration manifest c6140c2 drm/i915: Remove queue_flip pointer.
99fa013 drm/i915: Remove use_mmio_flip kernel parameter.
5f9f5e1 drm/i915: Remove cs based page flip support.
3914993 drm/i915: Rework intel_crtc_page_flip to be almost atomic, v3.
5b90d28 drm/i915: Add the exclusive fence to plane_state.
cb36a16 drm/i915: Convert flip_work to a list.
f34a39b drm/i915: Allow mmio updates on all platforms, v2.
0f894e7 drm/i915: Add support for detecting vblanks when hw frame counter is unavailable. a794120 drm/i915: Remove intel_prepare_page_flip.
7df2297 drm/i915: Remove stallcheck special handling.
810b37f drm/core: Add drm_accurate_vblank_count, v4.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx