drm/i915: Remove superfluous i915_add_request_no_flush() helper
The only time we need to emit a flush inside request emission is after an execbuffer, for which we can use the full __i915_add_request(). All other instances want the simpler i915_add_request() without flushing, so remove the useless helper.
--- drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- drivers/gpu/drm/i915/i915_gem_context.c | 2 +- drivers/gpu/drm/i915/i915_gem_request.h | 2 -- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_overlay.c | 8 ++++---- drivers/gpu/drm/i915/intel_pm.c | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/gvt/scheduler.c +1 -1
@@ -224,7 +224,7 @@ static int dispatch_workload(struct intel_vgpu_workload *workload) workload->status = ret;if (!IS_ERR_OR_NULL (rq)) -i915_add_request_no_flush (rq); +i915_add_request (rq);mutex_unlock (&dev_priv->drm.struct_mutex);return ret; }
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
@@ -933,7 +933,7 @@ int i915_gem_switch_to_kernel_context(struct drm_i915_private *dev_priv) } ret =i915_switch_context (req); -i915_add_request_no_flush (req); +i915_add_request (req);if (ret)return ret; }
drivers/gpu/drm/i915/i915_gem_request.h +0 -2
@@ -267,8 +267,6 @@ int i915_gem_request_await_dma_fence(struct drm_i915_gem_request *req,void __i915_add_request (struct drm_i915_gem_request *req,bool flush_caches);#define i915_add_request (req) \ - __i915_add_request(req, true) -#define i915_add_request_no_flush (req) \ __i915_add_request(req, false)void __i915_gem_request_submit (struct drm_i915_gem_request *request);
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -10668,7 +10668,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,intel_mark_page_flip_active (intel_crtc, work); work->flip_queued_req =i915_gem_request_get (request); -i915_add_request_no_flush (request); +i915_add_request (request); }i915_gem_object_wait_priority (obj,0 ,I915_PRIORITY_DISPLAY );
@@ -10684,7 +10684,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,return 0 ; cleanup_request: -i915_add_request_no_flush (request); +i915_add_request (request); cleanup_unpin:to_intel_plane_state (primary->state)->vma = work->old_vma;intel_unpin_fb_vma (vma);
drivers/gpu/drm/i915/intel_overlay.c +4 -4
@@ -278,7 +278,7 @@ static int intel_overlay_on(struct intel_overlay *overlay) cs =intel_ring_begin (req,4 );if (IS_ERR (cs)) { -i915_add_request_no_flush (req); +i915_add_request (req);return PTR_ERR (cs); }
@@ -343,7 +343,7 @@ static int intel_overlay_continue(struct intel_overlay *overlay, cs =intel_ring_begin (req,2 );if (IS_ERR (cs)) { -i915_add_request_no_flush (req); +i915_add_request (req);return PTR_ERR (cs); }
@@ -419,7 +419,7 @@ static int intel_overlay_off(struct intel_overlay *overlay) cs =intel_ring_begin (req,6 );if (IS_ERR (cs)) { -i915_add_request_no_flush (req); +i915_add_request (req);return PTR_ERR (cs); }
@@ -477,7 +477,7 @@ static int intel_overlay_release_old_vid(struct intel_overlay *overlay) cs =intel_ring_begin (req,2 );if (IS_ERR (cs)) { -i915_add_request_no_flush (req); +i915_add_request (req);return PTR_ERR (cs); }
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -7086,7 +7086,7 @@ static void __intel_autoenable_gt_powersave(struct work_struct *work) rcs->init_context (req);/* Mark the device busy, calling intel_enable_gt_powersave() */ -i915_add_request_no_flush (req); +i915_add_request (req); unlock:mutex_unlock (&dev_priv->drm.struct_mutex);
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Remove superfluous i915_add_request_no_flush() helper
== Series Details ==
== Series Details ==
Series: drm/i915: Remove superfluous i915_add_request_no_flush() helper
URL : https://patchwork.freedesktop.org/series/21442/
State : success
== Summary ==
Series 21442v1 drm/i915: Remove superfluous i915_add_request_no_flush() helper
https://patchwork.freedesktop.org/api/1.0/series/21442/revisions/1/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (fi-snb-2600) fdo#100007fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 463s fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 578s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 537s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 560s fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 502s fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 498s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 438s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 436s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 439s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 518s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 494s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 484s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 475s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 605s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 487s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 528s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 552s fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time: 412s
5fef332e008b4531d1d3dfd6ff16308a56fc26ce drm-tip: 2017y-03m-17d-11h-21m-37s UTC integration manifest 0e96779 drm/i915: Remove superfluous i915_add_request_no_flush() helper
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4215/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx