* [Intel-gfx] [CI] drm/i915/gem: Remove redundant exec_fence @ 2020-05-13 18:09 Chris Wilson 2020-05-13 19:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2020-05-14 0:01 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 0 siblings, 2 replies; 3+ messages in thread From: Chris Wilson @ 2020-05-13 18:09 UTC (permalink / raw) To: intel-gfx Since there can only be one of in_fence/exec_fence, just use the single in_fence local. v2: Consolidate lookup Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> --- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 40 +++++++------------ 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index d54a4933cc05..3c98aaaa8d11 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -2622,7 +2622,6 @@ i915_gem_do_execbuffer(struct drm_device *dev, struct drm_i915_private *i915 = to_i915(dev); struct i915_execbuffer eb; struct dma_fence *in_fence = NULL; - struct dma_fence *exec_fence = NULL; struct sync_file *out_fence = NULL; struct i915_vma *batch; int out_fence_fd = -1; @@ -2665,30 +2664,22 @@ i915_gem_do_execbuffer(struct drm_device *dev, if (args->flags & I915_EXEC_IS_PINNED) eb.batch_flags |= I915_DISPATCH_PINNED; - if (args->flags & I915_EXEC_FENCE_IN) { +#define IN_FENCES (I915_EXEC_FENCE_IN | I915_EXEC_FENCE_SUBMIT) + if (args->flags & IN_FENCES) { + if ((args->flags & IN_FENCES) == IN_FENCES) + return -EINVAL; + in_fence = sync_file_get_fence(lower_32_bits(args->rsvd2)); if (!in_fence) return -EINVAL; } - - if (args->flags & I915_EXEC_FENCE_SUBMIT) { - if (in_fence) { - err = -EINVAL; - goto err_in_fence; - } - - exec_fence = sync_file_get_fence(lower_32_bits(args->rsvd2)); - if (!exec_fence) { - err = -EINVAL; - goto err_in_fence; - } - } +#undef IN_FENCES if (args->flags & I915_EXEC_FENCE_OUT) { out_fence_fd = get_unused_fd_flags(O_CLOEXEC); if (out_fence_fd < 0) { err = out_fence_fd; - goto err_exec_fence; + goto err_in_fence; } } @@ -2779,14 +2770,13 @@ i915_gem_do_execbuffer(struct drm_device *dev, } if (in_fence) { - err = i915_request_await_dma_fence(eb.request, in_fence); - if (err < 0) - goto err_request; - } - - if (exec_fence) { - err = i915_request_await_execution(eb.request, exec_fence, - eb.engine->bond_execute); + if (args->flags & I915_EXEC_FENCE_SUBMIT) + err = i915_request_await_execution(eb.request, + in_fence, + eb.engine->bond_execute); + else + err = i915_request_await_dma_fence(eb.request, + in_fence); if (err < 0) goto err_request; } @@ -2855,8 +2845,6 @@ i915_gem_do_execbuffer(struct drm_device *dev, err_out_fence: if (out_fence_fd != -1) put_unused_fd(out_fence_fd); -err_exec_fence: - dma_fence_put(exec_fence); err_in_fence: dma_fence_put(in_fence); return err; -- 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gem: Remove redundant exec_fence 2020-05-13 18:09 [Intel-gfx] [CI] drm/i915/gem: Remove redundant exec_fence Chris Wilson @ 2020-05-13 19:40 ` Patchwork 2020-05-14 0:01 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 1 sibling, 0 replies; 3+ messages in thread From: Patchwork @ 2020-05-13 19:40 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915/gem: Remove redundant exec_fence URL : https://patchwork.freedesktop.org/series/77239/ State : success == Summary == CI Bug Log - changes from CI_DRM_8475 -> Patchwork_17651 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/index.html Known issues ------------ Here are the changes found in Patchwork_17651 that come from known issues: ### IGT changes ### {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [i915#1803]: https://gitlab.freedesktop.org/drm/intel/issues/1803 Participating hosts (48 -> 44) ------------------------------ Additional (1): fi-tgl-u Missing (5): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus Build changes ------------- * CI: CI-20190529 -> None * Linux: CI_DRM_8475 -> Patchwork_17651 CI-20190529: 20190529 CI_DRM_8475: fdb67b76a2d3b315585813539269dac22e2305f4 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5651: e54e2642f1967ca3c488db32264607df670d1dfb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_17651: c55552dd3756c71e5346071c705d135c0343338c @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == c55552dd3756 drm/i915/gem: Remove redundant exec_fence == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 3+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/gem: Remove redundant exec_fence 2020-05-13 18:09 [Intel-gfx] [CI] drm/i915/gem: Remove redundant exec_fence Chris Wilson 2020-05-13 19:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork @ 2020-05-14 0:01 ` Patchwork 1 sibling, 0 replies; 3+ messages in thread From: Patchwork @ 2020-05-14 0:01 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915/gem: Remove redundant exec_fence URL : https://patchwork.freedesktop.org/series/77239/ State : success == Summary == CI Bug Log - changes from CI_DRM_8475_full -> Patchwork_17651_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_17651_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_eio@in-flight-suspend: - shard-apl: [PASS][1] -> [DMESG-WARN][2] ([i915#180]) +1 similar issue [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-apl7/igt@gem_eio@in-flight-suspend.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-apl4/igt@gem_eio@in-flight-suspend.html * igt@gem_exec_suspend@basic-s3: - shard-skl: [PASS][3] -> [INCOMPLETE][4] ([i915#69]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-skl9/igt@gem_exec_suspend@basic-s3.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-skl7/igt@gem_exec_suspend@basic-s3.html * igt@gen9_exec_parse@allowed-all: - shard-apl: [PASS][5] -> [DMESG-WARN][6] ([i915#1436] / [i915#716]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-apl8/igt@gen9_exec_parse@allowed-all.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-apl3/igt@gen9_exec_parse@allowed-all.html * igt@gen9_exec_parse@allowed-single: - shard-skl: [PASS][7] -> [DMESG-WARN][8] ([i915#1436] / [i915#716]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-skl10/igt@gen9_exec_parse@allowed-single.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-skl4/igt@gen9_exec_parse@allowed-single.html * igt@kms_dp_dsc@basic-dsc-enable-edp: - shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#109349]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-iclb8/igt@kms_dp_dsc@basic-dsc-enable-edp.html * igt@kms_frontbuffer_tracking@fbc-suspend: - shard-apl: [PASS][11] -> [DMESG-WARN][12] ([i915#180] / [i915#95]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-apl2/igt@kms_frontbuffer_tracking@fbc-suspend.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-apl4/igt@kms_frontbuffer_tracking@fbc-suspend.html * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes: - shard-kbl: [PASS][13] -> [DMESG-WARN][14] ([i915#180]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-kbl7/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-kbl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html * igt@kms_psr@psr2_sprite_render: - shard-iclb: [PASS][15] -> [SKIP][16] ([fdo#109441]) +1 similar issue [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-iclb2/igt@kms_psr@psr2_sprite_render.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-iclb8/igt@kms_psr@psr2_sprite_render.html * igt@kms_setmode@basic: - shard-hsw: [PASS][17] -> [FAIL][18] ([i915#31]) [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-hsw4/igt@kms_setmode@basic.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-hsw4/igt@kms_setmode@basic.html #### Possible fixes #### * igt@kms_cursor_crc@pipe-c-cursor-128x128-random: - shard-skl: [FAIL][19] ([i915#54]) -> [PASS][20] +1 similar issue [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-skl10/igt@kms_cursor_crc@pipe-c-cursor-128x128-random.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-skl2/igt@kms_cursor_crc@pipe-c-cursor-128x128-random.html * igt@kms_cursor_crc@pipe-c-cursor-suspend: - shard-apl: [DMESG-WARN][21] ([i915#180]) -> [PASS][22] +1 similar issue [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-apl1/igt@kms_cursor_crc@pipe-c-cursor-suspend.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-apl8/igt@kms_cursor_crc@pipe-c-cursor-suspend.html * igt@kms_cursor_legacy@cursora-vs-flipa-atomic-transitions: - shard-snb: [SKIP][23] ([fdo#109271]) -> [PASS][24] [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-snb2/igt@kms_cursor_legacy@cursora-vs-flipa-atomic-transitions.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-snb6/igt@kms_cursor_legacy@cursora-vs-flipa-atomic-transitions.html * igt@kms_cursor_legacy@pipe-d-torture-move: - shard-tglb: [DMESG-WARN][25] ([i915#128]) -> [PASS][26] [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-tglb2/igt@kms_cursor_legacy@pipe-d-torture-move.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-tglb3/igt@kms_cursor_legacy@pipe-d-torture-move.html * {igt@kms_flip@2x-flip-vs-expired-vblank@bc-hdmi-a1-hdmi-a2}: - shard-glk: [FAIL][27] ([i915#79]) -> [PASS][28] [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-glk1/igt@kms_flip@2x-flip-vs-expired-vblank@bc-hdmi-a1-hdmi-a2.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-glk8/igt@kms_flip@2x-flip-vs-expired-vblank@bc-hdmi-a1-hdmi-a2.html * {igt@kms_flip@flip-vs-suspend-interruptible@c-dp1}: - shard-kbl: [DMESG-WARN][29] ([i915#180]) -> [PASS][30] +1 similar issue [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-kbl4/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-kbl2/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html * igt@kms_hdr@bpc-switch-dpms: - shard-skl: [FAIL][31] ([i915#1188]) -> [PASS][32] [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-skl6/igt@kms_hdr@bpc-switch-dpms.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-skl6/igt@kms_hdr@bpc-switch-dpms.html * igt@kms_plane_alpha_blend@pipe-b-coverage-7efc: - shard-skl: [FAIL][33] ([fdo#108145] / [i915#265]) -> [PASS][34] +2 similar issues [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-skl9/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-skl5/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html * igt@kms_psr@no_drrs: - shard-iclb: [FAIL][35] ([i915#173]) -> [PASS][36] [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-iclb1/igt@kms_psr@no_drrs.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-iclb5/igt@kms_psr@no_drrs.html * igt@kms_psr@psr2_primary_page_flip: - shard-iclb: [SKIP][37] ([fdo#109441]) -> [PASS][38] +1 similar issue [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-iclb7/igt@kms_psr@psr2_primary_page_flip.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html * igt@kms_vblank@pipe-c-ts-continuation-suspend: - shard-skl: [INCOMPLETE][39] ([i915#69]) -> [PASS][40] [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-skl6/igt@kms_vblank@pipe-c-ts-continuation-suspend.html [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-skl6/igt@kms_vblank@pipe-c-ts-continuation-suspend.html * {igt@perf@polling-parameterized}: - shard-hsw: [FAIL][41] ([i915#1542]) -> [PASS][42] [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-hsw6/igt@perf@polling-parameterized.html [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-hsw1/igt@perf@polling-parameterized.html #### Warnings #### * igt@i915_pm_dc@dc3co-vpb-simulation: - shard-iclb: [SKIP][43] ([i915#658]) -> [SKIP][44] ([i915#588]) [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-iclb7/igt@i915_pm_dc@dc3co-vpb-simulation.html [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html * igt@kms_content_protection@atomic-dpms: - shard-apl: [DMESG-FAIL][45] ([fdo#110321] / [i915#95]) -> [TIMEOUT][46] ([i915#1319]) [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-apl8/igt@kms_content_protection@atomic-dpms.html [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-apl7/igt@kms_content_protection@atomic-dpms.html - shard-kbl: [TIMEOUT][47] ([i915#1319]) -> [FAIL][48] ([fdo#110321] / [fdo#110336] / [i915#93] / [i915#95]) [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-kbl4/igt@kms_content_protection@atomic-dpms.html [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-kbl2/igt@kms_content_protection@atomic-dpms.html * igt@kms_content_protection@srm: - shard-apl: [FAIL][49] ([fdo#110321]) -> [TIMEOUT][50] ([i915#1319]) [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8475/shard-apl4/igt@kms_content_protection@srm.html [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/shard-apl6/igt@kms_content_protection@srm.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349 [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 [fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321 [fdo#110336]: https://bugs.freedesktop.org/show_bug.cgi?id=110336 [i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188 [i915#128]: https://gitlab.freedesktop.org/drm/intel/issues/128 [i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319 [i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436 [i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542 [i915#173]: https://gitlab.freedesktop.org/drm/intel/issues/173 [i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180 [i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265 [i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31 [i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54 [i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588 [i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658 [i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69 [i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716 [i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79 [i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93 [i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95 Participating hosts (11 -> 11) ------------------------------ No changes in participating hosts Build changes ------------- * CI: CI-20190529 -> None * Linux: CI_DRM_8475 -> Patchwork_17651 CI-20190529: 20190529 CI_DRM_8475: fdb67b76a2d3b315585813539269dac22e2305f4 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5651: e54e2642f1967ca3c488db32264607df670d1dfb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_17651: c55552dd3756c71e5346071c705d135c0343338c @ git://anongit.freedesktop.org/gfx-ci/linux piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17651/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-14 0:01 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-05-13 18:09 [Intel-gfx] [CI] drm/i915/gem: Remove redundant exec_fence Chris Wilson 2020-05-13 19:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2020-05-14 0:01 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.