* [PATCH][next] drm/i915: remove redundant repeated checks on err @ 2025-08-01 15:17 Colin Ian King 2025-08-01 18:26 ` Cavitt, Jonathan 2025-08-02 0:14 ` ✗ i915.CI.BAT: failure for " Patchwork 0 siblings, 2 replies; 4+ messages in thread From: Colin Ian King @ 2025-08-01 15:17 UTC (permalink / raw) To: Jani Nikula, Rodrigo Vivi, Tvrtko Ursulin, David Airlie, Simona Vetter, intel-gfx, dri-devel Cc: kernel-janitors, linux-kernel There are a couple of redundant repeated checks on err being non-zero that are always true because they are inside a previous check on err being non-zero. Remove the duplicated checks. Signed-off-by: Colin Ian King <colin.i.king@gmail.com> --- drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c index d8f4a10d71de..3913b48cece7 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c @@ -142,8 +142,7 @@ static int lmem_pages_migrate_one(struct i915_gem_ww_ctx *ww, if (err) { if (!silent_migrate) pr_err("Object failed migration to smem\n"); - if (err) - return err; + return err; } if (i915_gem_object_is_lmem(obj)) { @@ -161,8 +160,7 @@ static int lmem_pages_migrate_one(struct i915_gem_ww_ctx *ww, if (err) { if (!silent_migrate) pr_err("Object failed migration to lmem\n"); - if (err) - return err; + return err; } if (i915_gem_object_has_struct_page(obj)) { -- 2.50.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH][next] drm/i915: remove redundant repeated checks on err 2025-08-01 15:17 [PATCH][next] drm/i915: remove redundant repeated checks on err Colin Ian King @ 2025-08-01 18:26 ` Cavitt, Jonathan 2025-08-01 20:32 ` Rodrigo Vivi 2025-08-02 0:14 ` ✗ i915.CI.BAT: failure for " Patchwork 1 sibling, 1 reply; 4+ messages in thread From: Cavitt, Jonathan @ 2025-08-01 18:26 UTC (permalink / raw) To: Colin Ian King, Jani Nikula, Vivi, Rodrigo, Tvrtko Ursulin, David Airlie, Simona Vetter, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Cavitt, Jonathan -----Original Message----- From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Colin Ian King Sent: Friday, August 1, 2025 8:17 AM To: Jani Nikula <jani.nikula@linux.intel.com>; Vivi, Rodrigo <rodrigo.vivi@intel.com>; Tvrtko Ursulin <tursulin@ursulin.net>; David Airlie <airlied@gmail.com>; Simona Vetter <simona@ffwll.ch>; intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org Subject: [PATCH][next] drm/i915: remove redundant repeated checks on err > > There are a couple of redundant repeated checks on err being non-zero that > are always true because they are inside a previous check on err being > non-zero. Remove the duplicated checks. > > Signed-off-by: Colin Ian King <colin.i.king@gmail.com> Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com> -Jonathan Cavitt > --- > drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c > index d8f4a10d71de..3913b48cece7 100644 > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c > @@ -142,8 +142,7 @@ static int lmem_pages_migrate_one(struct i915_gem_ww_ctx *ww, > if (err) { > if (!silent_migrate) > pr_err("Object failed migration to smem\n"); > - if (err) > - return err; > + return err; > } > > if (i915_gem_object_is_lmem(obj)) { > @@ -161,8 +160,7 @@ static int lmem_pages_migrate_one(struct i915_gem_ww_ctx *ww, > if (err) { > if (!silent_migrate) > pr_err("Object failed migration to lmem\n"); > - if (err) > - return err; > + return err; > } > > if (i915_gem_object_has_struct_page(obj)) { > -- > 2.50.0 > > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH][next] drm/i915: remove redundant repeated checks on err 2025-08-01 18:26 ` Cavitt, Jonathan @ 2025-08-01 20:32 ` Rodrigo Vivi 0 siblings, 0 replies; 4+ messages in thread From: Rodrigo Vivi @ 2025-08-01 20:32 UTC (permalink / raw) To: Cavitt, Jonathan Cc: Colin Ian King, Jani Nikula, Tvrtko Ursulin, David Airlie, Simona Vetter, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org On Fri, Aug 01, 2025 at 06:26:47PM +0000, Cavitt, Jonathan wrote: > -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Colin Ian King > Sent: Friday, August 1, 2025 8:17 AM > To: Jani Nikula <jani.nikula@linux.intel.com>; Vivi, Rodrigo <rodrigo.vivi@intel.com>; Tvrtko Ursulin <tursulin@ursulin.net>; David Airlie <airlied@gmail.com>; Simona Vetter <simona@ffwll.ch>; intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org > Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: [PATCH][next] drm/i915: remove redundant repeated checks on err > > > > There are a couple of redundant repeated checks on err being non-zero that > > are always true because they are inside a previous check on err being > > non-zero. Remove the duplicated checks. > > > > Signed-off-by: Colin Ian King <colin.i.king@gmail.com> > > Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com> pushed to drm-intel-gt-next > -Jonathan Cavitt > > > --- > > drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 6 ++---- > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c > > index d8f4a10d71de..3913b48cece7 100644 > > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c > > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c > > @@ -142,8 +142,7 @@ static int lmem_pages_migrate_one(struct i915_gem_ww_ctx *ww, > > if (err) { > > if (!silent_migrate) > > pr_err("Object failed migration to smem\n"); > > - if (err) > > - return err; > > + return err; > > } > > > > if (i915_gem_object_is_lmem(obj)) { > > @@ -161,8 +160,7 @@ static int lmem_pages_migrate_one(struct i915_gem_ww_ctx *ww, > > if (err) { > > if (!silent_migrate) > > pr_err("Object failed migration to lmem\n"); > > - if (err) > > - return err; > > + return err; > > } > > > > if (i915_gem_object_has_struct_page(obj)) { > > -- > > 2.50.0 > > > > ^ permalink raw reply [flat|nested] 4+ messages in thread
* ✗ i915.CI.BAT: failure for drm/i915: remove redundant repeated checks on err 2025-08-01 15:17 [PATCH][next] drm/i915: remove redundant repeated checks on err Colin Ian King 2025-08-01 18:26 ` Cavitt, Jonathan @ 2025-08-02 0:14 ` Patchwork 1 sibling, 0 replies; 4+ messages in thread From: Patchwork @ 2025-08-02 0:14 UTC (permalink / raw) To: Colin Ian King; +Cc: intel-gfx [-- Attachment #1: Type: text/plain, Size: 7736 bytes --] == Series Details == Series: drm/i915: remove redundant repeated checks on err URL : https://patchwork.freedesktop.org/series/152430/ State : failure == Summary == CI Bug Log - changes from CI_DRM_16950 -> Patchwork_152430v1 ==================================================== Summary ------- **FAILURE** Serious unknown changes coming with Patchwork_152430v1 absolutely need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in Patchwork_152430v1, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them to document this new failure mode, which will reduce false positives in CI. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/index.html Participating hosts (43 -> 44) ------------------------------ Additional (2): fi-glk-j4005 bat-jsl-1 Missing (1): fi-snb-2520m Possible new issues ------------------- Here are the unknown changes that may have been introduced in Patchwork_152430v1: ### IGT changes ### #### Possible regressions #### * igt@i915_module_load@load: - fi-bsw-nick: [PASS][1] -> [ABORT][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16950/fi-bsw-nick/igt@i915_module_load@load.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/fi-bsw-nick/igt@i915_module_load@load.html Known issues ------------ Here are the changes found in Patchwork_152430v1 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_huc_copy@huc-copy: - bat-jsl-1: NOTRUN -> [SKIP][3] ([i915#2190]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-jsl-1/igt@gem_huc_copy@huc-copy.html - fi-glk-j4005: NOTRUN -> [SKIP][4] ([i915#2190]) [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/fi-glk-j4005/igt@gem_huc_copy@huc-copy.html * igt@gem_lmem_swapping@parallel-random-engines: - bat-jsl-1: NOTRUN -> [SKIP][5] ([i915#4613]) +3 other tests skip [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-jsl-1/igt@gem_lmem_swapping@parallel-random-engines.html - fi-glk-j4005: NOTRUN -> [SKIP][6] ([i915#4613]) +3 other tests skip [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/fi-glk-j4005/igt@gem_lmem_swapping@parallel-random-engines.html * igt@i915_module_load@load: - bat-mtlp-9: [PASS][7] -> [DMESG-WARN][8] ([i915#13494]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16950/bat-mtlp-9/igt@i915_module_load@load.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-mtlp-9/igt@i915_module_load@load.html * igt@i915_selftest@live: - bat-jsl-1: NOTRUN -> [DMESG-WARN][9] ([i915#13827]) +1 other test dmesg-warn [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-jsl-1/igt@i915_selftest@live.html * igt@i915_selftest@live@workarounds: - bat-arls-5: [PASS][10] -> [DMESG-FAIL][11] ([i915#12061]) +1 other test dmesg-fail [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16950/bat-arls-5/igt@i915_selftest@live@workarounds.html [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-arls-5/igt@i915_selftest@live@workarounds.html * igt@intel_hwmon@hwmon-read: - bat-jsl-1: NOTRUN -> [SKIP][12] ([i915#7707]) +1 other test skip [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-jsl-1/igt@intel_hwmon@hwmon-read.html * igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy: - bat-jsl-1: NOTRUN -> [SKIP][13] ([i915#4103]) +1 other test skip [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-jsl-1/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html * igt@kms_dsc@dsc-basic: - bat-jsl-1: NOTRUN -> [SKIP][14] ([i915#3555] / [i915#9886]) [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-jsl-1/igt@kms_dsc@dsc-basic.html * igt@kms_force_connector_basic@force-load-detect: - bat-jsl-1: NOTRUN -> [SKIP][15] [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-jsl-1/igt@kms_force_connector_basic@force-load-detect.html * igt@kms_psr@psr-primary-page-flip: - fi-glk-j4005: NOTRUN -> [SKIP][16] +11 other tests skip [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/fi-glk-j4005/igt@kms_psr@psr-primary-page-flip.html * igt@kms_setmode@basic-clone-single-crtc: - bat-jsl-1: NOTRUN -> [SKIP][17] ([i915#3555]) [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-jsl-1/igt@kms_setmode@basic-clone-single-crtc.html #### Possible fixes #### * igt@i915_selftest@live@reset: - bat-atsm-1: [ABORT][18] ([i915#14201]) -> [PASS][19] [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16950/bat-atsm-1/igt@i915_selftest@live@reset.html [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-atsm-1/igt@i915_selftest@live@reset.html * igt@i915_selftest@live@workarounds: - bat-arlh-3: [DMESG-FAIL][20] ([i915#12061]) -> [PASS][21] +1 other test pass [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16950/bat-arlh-3/igt@i915_selftest@live@workarounds.html [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-arlh-3/igt@i915_selftest@live@workarounds.html - bat-mtlp-6: [DMESG-FAIL][22] ([i915#12061]) -> [PASS][23] +1 other test pass [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16950/bat-mtlp-6/igt@i915_selftest@live@workarounds.html [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-mtlp-6/igt@i915_selftest@live@workarounds.html - bat-dg2-11: [DMESG-FAIL][24] ([i915#12061]) -> [PASS][25] +1 other test pass [24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16950/bat-dg2-11/igt@i915_selftest@live@workarounds.html [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-dg2-11/igt@i915_selftest@live@workarounds.html #### Warnings #### * igt@i915_selftest@live: - bat-atsm-1: [ABORT][26] ([i915#14201]) -> [DMESG-FAIL][27] ([i915#12061] / [i915#13929]) [26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16950/bat-atsm-1/igt@i915_selftest@live.html [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/bat-atsm-1/igt@i915_selftest@live.html [i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061 [i915#13494]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13494 [i915#13827]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13827 [i915#13929]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13929 [i915#14201]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14201 [i915#2190]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2190 [i915#3555]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3555 [i915#4103]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4103 [i915#4613]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4613 [i915#7707]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7707 [i915#9886]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9886 Build changes ------------- * Linux: CI_DRM_16950 -> Patchwork_152430v1 CI-20190529: 20190529 CI_DRM_16950: acb5c859a41719652f1807b30240ca4ee82a473a @ git://anongit.freedesktop.org/gfx-ci/linux IGT_8482: 8482 Patchwork_152430v1: acb5c859a41719652f1807b30240ca4ee82a473a @ git://anongit.freedesktop.org/gfx-ci/linux == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152430v1/index.html [-- Attachment #2: Type: text/html, Size: 9336 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-08-02 0:14 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-08-01 15:17 [PATCH][next] drm/i915: remove redundant repeated checks on err Colin Ian King 2025-08-01 18:26 ` Cavitt, Jonathan 2025-08-01 20:32 ` Rodrigo Vivi 2025-08-02 0:14 ` ✗ i915.CI.BAT: failure for " 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.