* [Intel-gfx] [PATCH] drm/i915/gem: Suppress some random warnings @ 2020-05-19 18:22 Chris Wilson 2020-05-19 22:07 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork ` (2 more replies) 0 siblings, 3 replies; 4+ messages in thread From: Chris Wilson @ 2020-05-19 18:22 UTC (permalink / raw) To: intel-gfx; +Cc: Chris Wilson Leave the error propagation in place, but limit the warnings to only show up in CI if the unlikely errors are hit. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index e4fb6c372537..219a36995b96 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1626,8 +1626,7 @@ eb_relocate_entry(struct i915_execbuffer *eb, err = i915_vma_bind(target->vma, target->vma->obj->cache_level, PIN_GLOBAL, NULL); - if (drm_WARN_ONCE(&i915->drm, err, - "Unexpected failure to bind target VMA!")) + if (err) return err; } } diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/i915_gem_phys.c index 4c1c7232b024..12245a47e5fb 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c @@ -27,8 +27,7 @@ static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj) void *dst; int i; - if (drm_WARN_ON(obj->base.dev, - i915_gem_object_needs_bit17_swizzle(obj))) + if (GEM_WARN_ON(i915_gem_object_needs_bit17_swizzle(obj))) return -EINVAL; /* diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c index 5d5d7eef3f43..19dd21a95c47 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c @@ -148,8 +148,7 @@ static int shmem_get_pages(struct drm_i915_gem_object *obj) last_pfn = page_to_pfn(page); /* Check that the i965g/gm workaround works. */ - drm_WARN_ON(&i915->drm, - (gfp & __GFP_DMA32) && (last_pfn >= 0x00100000UL)); + GEM_BUG_ON(gfp & __GFP_DMA32 && last_pfn >= 0x00100000UL); } if (sg) { /* loop terminated early; short sg table */ sg_page_sizes |= sg->length; diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c index 8b0708708671..ec9d25680b41 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c @@ -235,7 +235,7 @@ i915_gem_userptr_init__mmu_notifier(struct drm_i915_gem_object *obj, if (flags & I915_USERPTR_UNSYNCHRONIZED) return capable(CAP_SYS_ADMIN) ? 0 : -EPERM; - if (drm_WARN_ON(obj->base.dev, obj->userptr.mm == NULL)) + if (GEM_WARN_ON(obj->userptr.mm == NULL)) return -EINVAL; mn = i915_mmu_notifier_find(obj->userptr.mm); -- 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] 4+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gem: Suppress some random warnings 2020-05-19 18:22 [Intel-gfx] [PATCH] drm/i915/gem: Suppress some random warnings Chris Wilson @ 2020-05-19 22:07 ` Patchwork 2020-05-19 22:36 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-05-20 10:58 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2 siblings, 0 replies; 4+ messages in thread From: Patchwork @ 2020-05-19 22:07 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915/gem: Suppress some random warnings URL : https://patchwork.freedesktop.org/series/77431/ State : warning == Summary == $ dim checkpatch origin/drm-tip c47e2d0db533 drm/i915/gem: Suppress some random warnings -:62: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!obj->userptr.mm" #62: FILE: drivers/gpu/drm/i915/gem/i915_gem_userptr.c:238: + if (GEM_WARN_ON(obj->userptr.mm == NULL)) total: 0 errors, 0 warnings, 1 checks, 35 lines checked _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gem: Suppress some random warnings 2020-05-19 18:22 [Intel-gfx] [PATCH] drm/i915/gem: Suppress some random warnings Chris Wilson 2020-05-19 22:07 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork @ 2020-05-19 22:36 ` Patchwork 2020-05-20 10:58 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2 siblings, 0 replies; 4+ messages in thread From: Patchwork @ 2020-05-19 22:36 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915/gem: Suppress some random warnings URL : https://patchwork.freedesktop.org/series/77431/ State : success == Summary == CI Bug Log - changes from CI_DRM_8506 -> Patchwork_17715 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/index.html Known issues ------------ Here are the changes found in Patchwork_17715 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@kms_chamelium@dp-crc-fast: - fi-icl-u2: [PASS][1] -> [FAIL][2] ([i915#262]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/fi-icl-u2/igt@kms_chamelium@dp-crc-fast.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/fi-icl-u2/igt@kms_chamelium@dp-crc-fast.html * igt@kms_chamelium@dp-edid-read: - fi-icl-u2: [PASS][3] -> [FAIL][4] ([i915#976]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/fi-icl-u2/igt@kms_chamelium@dp-edid-read.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/fi-icl-u2/igt@kms_chamelium@dp-edid-read.html #### Possible fixes #### * igt@i915_selftest@live@execlists: - fi-kbl-8809g: [INCOMPLETE][5] ([i915#1874]) -> [PASS][6] [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/fi-kbl-8809g/igt@i915_selftest@live@execlists.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/fi-kbl-8809g/igt@i915_selftest@live@execlists.html [i915#1874]: https://gitlab.freedesktop.org/drm/intel/issues/1874 [i915#262]: https://gitlab.freedesktop.org/drm/intel/issues/262 [i915#976]: https://gitlab.freedesktop.org/drm/intel/issues/976 Participating hosts (49 -> 43) ------------------------------ Additional (1): fi-kbl-7560u Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-tgl-y fi-byt-clapper fi-bdw-samus Build changes ------------- * Linux: CI_DRM_8506 -> Patchwork_17715 CI-20190529: 20190529 CI_DRM_8506: d6a73e9084ff6adfabbad014bc294d254484f304 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5661: a772a7c7a761c6125bc0af5284ad603478107737 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_17715: c47e2d0db5333eee93263b6a8fdd110fa51c8bb7 @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == c47e2d0db533 drm/i915/gem: Suppress some random warnings == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/gem: Suppress some random warnings 2020-05-19 18:22 [Intel-gfx] [PATCH] drm/i915/gem: Suppress some random warnings Chris Wilson 2020-05-19 22:07 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2020-05-19 22:36 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork @ 2020-05-20 10:58 ` Patchwork 2 siblings, 0 replies; 4+ messages in thread From: Patchwork @ 2020-05-20 10:58 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915/gem: Suppress some random warnings URL : https://patchwork.freedesktop.org/series/77431/ State : success == Summary == CI Bug Log - changes from CI_DRM_8506_full -> Patchwork_17715_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_17715_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@i915_suspend@debugfs-reader: - shard-skl: [PASS][1] -> [INCOMPLETE][2] ([i915#69]) +1 similar issue [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-skl6/igt@i915_suspend@debugfs-reader.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-skl4/igt@i915_suspend@debugfs-reader.html * igt@kms_cursor_legacy@flip-vs-cursor-legacy: - shard-tglb: [PASS][3] -> [FAIL][4] ([IGT#5]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-tglb2/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-tglb8/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html * igt@kms_hdr@bpc-switch-dpms: - shard-skl: [PASS][5] -> [FAIL][6] ([i915#1188]) +1 similar issue [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-skl3/igt@kms_hdr@bpc-switch-dpms.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-skl5/igt@kms_hdr@bpc-switch-dpms.html * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes: - shard-apl: [PASS][7] -> [DMESG-WARN][8] ([i915#180]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-apl2/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-apl6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html * igt@kms_psr@psr2_primary_page_flip: - shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#109441]) +2 similar issues [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-iclb1/igt@kms_psr@psr2_primary_page_flip.html * igt@kms_vblank@pipe-a-ts-continuation-suspend: - shard-kbl: [PASS][11] -> [DMESG-WARN][12] ([i915#180]) +3 similar issues [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-kbl6/igt@kms_vblank@pipe-a-ts-continuation-suspend.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-kbl6/igt@kms_vblank@pipe-a-ts-continuation-suspend.html #### Possible fixes #### * igt@gen9_exec_parse@allowed-all: - shard-apl: [DMESG-WARN][13] ([i915#1436] / [i915#716]) -> [PASS][14] [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-apl6/igt@gen9_exec_parse@allowed-all.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-apl7/igt@gen9_exec_parse@allowed-all.html * igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen: - shard-skl: [FAIL][15] ([i915#54]) -> [PASS][16] +1 similar issue [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-skl4/igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-skl1/igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen.html * igt@kms_dp_dsc@basic-dsc-enable-edp: - shard-iclb: [SKIP][17] ([fdo#109349]) -> [PASS][18] [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-iclb6/igt@kms_dp_dsc@basic-dsc-enable-edp.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html * {igt@kms_flip@flip-vs-suspend-interruptible@b-edp1}: - shard-skl: [INCOMPLETE][19] ([i915#198]) -> [PASS][20] [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-skl5/igt@kms_flip@flip-vs-suspend-interruptible@b-edp1.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-skl10/igt@kms_flip@flip-vs-suspend-interruptible@b-edp1.html * {igt@kms_flip@flip-vs-suspend-interruptible@c-dp1}: - shard-apl: [DMESG-WARN][21] ([i915#180]) -> [PASS][22] +1 similar issue [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-apl4/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-apl7/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html * {igt@kms_flip@flip-vs-suspend@a-dp1}: - shard-kbl: [DMESG-WARN][23] ([i915#180]) -> [PASS][24] +2 similar issues [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-kbl1/igt@kms_flip@flip-vs-suspend@a-dp1.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-kbl2/igt@kms_flip@flip-vs-suspend@a-dp1.html * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-cpu: - shard-snb: [SKIP][25] ([fdo#109271]) -> [PASS][26] [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-snb1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-cpu.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-snb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-cpu.html * igt@kms_psr@psr2_cursor_mmap_cpu: - shard-iclb: [SKIP][27] ([fdo#109441]) -> [PASS][28] +1 similar issue [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-iclb5/igt@kms_psr@psr2_cursor_mmap_cpu.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html * igt@kms_setmode@basic: - shard-kbl: [FAIL][29] ([i915#31]) -> [PASS][30] [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-kbl6/igt@kms_setmode@basic.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-kbl6/igt@kms_setmode@basic.html * {igt@prime_vgem@sync@rcs0}: - shard-iclb: [INCOMPLETE][31] ([i915#409]) -> [PASS][32] [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-iclb8/igt@prime_vgem@sync@rcs0.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-iclb8/igt@prime_vgem@sync@rcs0.html #### Warnings #### * igt@kms_content_protection@atomic: - shard-apl: [TIMEOUT][33] ([i915#1319]) -> [FAIL][34] ([fdo#110321] / [fdo#110336]) +1 similar issue [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-apl1/igt@kms_content_protection@atomic.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-apl6/igt@kms_content_protection@atomic.html * igt@kms_content_protection@lic: - shard-apl: [FAIL][35] ([fdo#110321]) -> [DMESG-FAIL][36] ([fdo#110321]) [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-apl6/igt@kms_content_protection@lic.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-apl8/igt@kms_content_protection@lic.html * igt@kms_fbcon_fbt@fbc-suspend: - shard-kbl: [DMESG-FAIL][37] ([i915#180] / [i915#95]) -> [FAIL][38] ([i915#1121] / [i915#93] / [i915#95]) [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8506/shard-kbl1/igt@kms_fbcon_fbt@fbc-suspend.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17715/shard-kbl2/igt@kms_fbcon_fbt@fbc-suspend.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [IGT#5]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/5 [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#1121]: https://gitlab.freedesktop.org/drm/intel/issues/1121 [i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188 [i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319 [i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436 [i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180 [i915#1883]: https://gitlab.freedesktop.org/drm/intel/issues/1883 [i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198 [i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31 [i915#409]: https://gitlab.freedesktop.org/drm/intel/issues/409 [i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54 [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 ------------- * Linux: CI_DRM_8506 -> Patchwork_17715 CI-20190529: 20190529 CI_DRM_8506: d6a73e9084ff6adfabbad014bc294d254484f304 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5661: a772a7c7a761c6125bc0af5284ad603478107737 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_17715: c47e2d0db5333eee93263b6a8fdd110fa51c8bb7 @ 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_17715/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-20 10:58 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-05-19 18:22 [Intel-gfx] [PATCH] drm/i915/gem: Suppress some random warnings Chris Wilson 2020-05-19 22:07 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2020-05-19 22:36 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-05-20 10:58 ` [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.